|
|
@@ -80,11 +80,10 @@
|
|
|
v-for="ele in labelForm.labelArr"
|
|
|
:key="ele.id"
|
|
|
>
|
|
|
- <el-table
|
|
|
- :data="ele.labelRuleDetailList"
|
|
|
- :border="false"
|
|
|
- :stripe="false"
|
|
|
- >
|
|
|
+ <div style="margin-left: 200px; float: right" @click="addRule($event, ele)">
|
|
|
+ <i class="header-icon el-icon-plus"></i>添加规则
|
|
|
+ </div>
|
|
|
+ <el-table :data="ele.labelRuleDetailList">
|
|
|
<af-table-column label="油品名称" align="center" prop="oilName" />
|
|
|
<af-table-column label="优惠条件" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -129,7 +128,11 @@
|
|
|
confirm-button-text="删除"
|
|
|
@onConfirm="handleDelete(scope.row)"
|
|
|
>
|
|
|
- <el-button slot="reference" size="mini" type="text" icon="el-icon-delete"
|
|
|
+ <el-button
|
|
|
+ slot="reference"
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
>删除</el-button
|
|
|
>
|
|
|
</el-popconfirm>
|
|
|
@@ -144,80 +147,55 @@
|
|
|
append-to-body
|
|
|
title="满减"
|
|
|
>
|
|
|
- <el-form ref="updateForm" :model="updateForm" label-width="140px">
|
|
|
- <el-form-item label="方案名称" prop="grade">
|
|
|
- <el-input v-model="updateForm.grade" placeholder="请输入方案名称" />
|
|
|
- </el-form-item>
|
|
|
+ <el-form ref="addRulesForm" :model="addRulesForm" label-width="140px">
|
|
|
<el-form-item label="油品名称" prop="oilName">
|
|
|
<el-select
|
|
|
- v-model="updateForm.oilName"
|
|
|
+ v-model="addRulesForm.oilName"
|
|
|
placeholder="油品名称"
|
|
|
clearable
|
|
|
>
|
|
|
- <!--
|
|
|
<el-option
|
|
|
v-for="dict in filterOilNameOptions"
|
|
|
:key="dict.oilName"
|
|
|
:label="dict.oilName"
|
|
|
:value="dict.oilName"
|
|
|
/>
|
|
|
- -->
|
|
|
+
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <!--
|
|
|
- <el-form-item label="优惠条件" prop="discountLitersAmt" required>
|
|
|
+ <el-form-item label="优惠条件" prop="discountLitersAmt" :rules="{
|
|
|
+ required: true,
|
|
|
+ message: '优惠条件不能为空',
|
|
|
+ trigger: 'blur',
|
|
|
+ }">
|
|
|
<el-radio-group
|
|
|
- v-model="updateForm.discountTerm"
|
|
|
- v-if="discountSetting == 3"
|
|
|
+ v-model="addRulesForm.discountTerm"
|
|
|
>
|
|
|
<el-radio :label="2">按加油金额优惠</el-radio>
|
|
|
<el-radio :label="1">按加油升数优惠</el-radio>
|
|
|
</el-radio-group>
|
|
|
<div
|
|
|
- v-show="
|
|
|
- updateForm.discountTerm == 2 ||
|
|
|
- updateForm.discountTerm == 1 ||
|
|
|
- discountSetting == 1 ||
|
|
|
- discountSetting == 2
|
|
|
- "
|
|
|
+ v-show="addRulesForm.discountTerm == 2 ||
|
|
|
+ addRulesForm.discountTerm == 1"
|
|
|
>
|
|
|
- {{ ["", "每满", "满", "满"][discountSetting] }}
|
|
|
+ 满
|
|
|
<el-input-number
|
|
|
- v-model="updateForm.discountAmt"
|
|
|
+ v-model="addRulesForm.discountAmt"
|
|
|
size="mini"
|
|
|
:min="0"
|
|
|
/>
|
|
|
|
|
|
<span>{{
|
|
|
- updateForm.discountTerm == 1 && discountSetting == 3 ? "L" : "元"
|
|
|
+ addRulesForm.discountTerm == 1 ? "L" : "元"
|
|
|
}}</span>
|
|
|
- ，{{ ["", "减", "减", "每升优惠"][discountSetting] }}
|
|
|
+ ，每升优惠
|
|
|
<el-input-number
|
|
|
- v-model="updateForm.discountLitersAmt"
|
|
|
+ v-model="addRulesForm.discountLitersAmt"
|
|
|
size="mini"
|
|
|
:min="0"
|
|
|
/>元
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="叠加等级优惠" prop="vipDiscountyPlus">
|
|
|
- <el-radio-group v-model="updateForm.vipDiscountyPlus">
|
|
|
- <el-radio label="1">是</el-radio>
|
|
|
- <el-radio label="0">否</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- <div style="margin-left: 20px; color: red">
|
|
|
- 注："否" 客户只享受 {{ discountName }} 优惠
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="可否叠加劵" prop="couponPlus">
|
|
|
- <el-radio-group v-model="updateForm.couponPlus">
|
|
|
- <el-radio label="1">是</el-radio>
|
|
|
- <el-radio label="0">否</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- <div style="margin-left: 20px; color: red">
|
|
|
- 注："否" 客户只享受 {{ discountName }} 优惠
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- -->
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="handleSubmit">确 定</el-button>
|
|
|
@@ -310,9 +288,11 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
openDialog: false,
|
|
|
- updateForm: {},
|
|
|
+ addRulesForm: {},
|
|
|
labelForm: {},
|
|
|
oilNameOptions: [],
|
|
|
+ filterOilNameOptions:[],
|
|
|
+
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -343,13 +323,24 @@ export default {
|
|
|
handleChange(val) {
|
|
|
console.log(val);
|
|
|
},
|
|
|
- addRule(e) {
|
|
|
+ addRule(e, ele) {
|
|
|
+ console.log(ele)
|
|
|
e.stopPropagation();
|
|
|
- console.log(1);
|
|
|
+ this.addRulesForm.parentid = ele.id
|
|
|
+ this.filterOilNameOptions = this.filterOilNameOptionsMethod(ele.labelRuleDetailList)
|
|
|
this.openDialog = true;
|
|
|
},
|
|
|
- handleSubmit() {},
|
|
|
- cancelSubmit() {},
|
|
|
+ handleSubmit() {
|
|
|
+ this.$refs["addRulesForm"].validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ console.log(this.addRulesForm);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ cancelSubmit() {
|
|
|
+ this.openDialog = false;
|
|
|
+ this.addRulesForm = {}
|
|
|
+ },
|
|
|
getList() {
|
|
|
return selectLabelList().then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -361,14 +352,14 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
handleDelete(ele) {
|
|
|
- console.log(1222222222);
|
|
|
deleteLabelRuleDetail({
|
|
|
id: ele.id,
|
|
|
}).then((res) => {
|
|
|
console.log(res);
|
|
|
});
|
|
|
},
|
|
|
- filterOilNameOptions(arr) {
|
|
|
+ filterOilNameOptionsMethod(arr) {
|
|
|
+ console.log("123", arr);
|
|
|
return this.oilNameOptions.filter((ele) => {
|
|
|
let flag = true;
|
|
|
arr.forEach((item) => {
|
Joe