|
@@ -221,8 +221,9 @@
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
{{
|
|
{{
|
|
- (scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) /
|
|
|
|
- 100
|
|
|
|
|
|
+ ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) /
|
|
|
|
+ 100)||0
|
|
|
|
+
|
|
}}
|
|
}}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -433,6 +434,9 @@
|
|
label-width="120px"
|
|
label-width="120px"
|
|
size="small"
|
|
size="small"
|
|
>
|
|
>
|
|
|
|
+ <el-row v-if="factor.length" style="margin:0 0 20px 0">
|
|
|
|
+ 引用销售政策说明:{{ factor.length ? factor[0].name : "" }}
|
|
|
|
+ </el-row>
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
<el-col :xs="24" :sm="6" :lg="6">
|
|
<el-col :xs="24" :sm="6" :lg="6">
|
|
<el-form-item label="销售政策">
|
|
<el-form-item label="销售政策">
|
|
@@ -444,6 +448,8 @@
|
|
:disabled="disabled"
|
|
:disabled="disabled"
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
>
|
|
>
|
|
|
|
+ <el-option label="默认" :value="''"></el-option>
|
|
|
|
+
|
|
<el-option
|
|
<el-option
|
|
v-for="(item, index) in policyList"
|
|
v-for="(item, index) in policyList"
|
|
:key="index"
|
|
:key="index"
|
|
@@ -513,6 +519,9 @@
|
|
@select-all="handleSelectionChange($event, 1, index)"
|
|
@select-all="handleSelectionChange($event, 1, index)"
|
|
@selection-change="handleSelectionChange($event, 1, index)"
|
|
@selection-change="handleSelectionChange($event, 1, index)"
|
|
stripe
|
|
stripe
|
|
|
|
+ show-summary
|
|
|
|
+ :summary-method="$getSummaries"
|
|
|
|
+
|
|
>
|
|
>
|
|
<el-table-column
|
|
<el-table-column
|
|
align="center"
|
|
align="center"
|
|
@@ -593,6 +602,8 @@
|
|
@select-all="handleSelectionChange"
|
|
@select-all="handleSelectionChange"
|
|
@selection-change="handleSelectionChange"
|
|
@selection-change="handleSelectionChange"
|
|
stripe
|
|
stripe
|
|
|
|
+ show-summary
|
|
|
|
+ :summary-method="$getSummaries"
|
|
>
|
|
>
|
|
<el-table-column
|
|
<el-table-column
|
|
align="center"
|
|
align="center"
|
|
@@ -1001,6 +1012,9 @@ export default {
|
|
}
|
|
}
|
|
for (let i = 0; i < data.records.length; i++) {
|
|
for (let i = 0; i < data.records.length; i++) {
|
|
data.records[i].qty = 1;
|
|
data.records[i].qty = 1;
|
|
|
|
+
|
|
|
|
+ this.$set(data.records[i],'zong',data.records[i].qty * data.records[i].price)
|
|
|
|
+ data.records[i].sums1 = ['price', 'qty', 'zong'];
|
|
// this.$set(data.records[i],'userList',this.userList)
|
|
// this.$set(data.records[i],'userList',this.userList)
|
|
}
|
|
}
|
|
if (fang) {
|
|
if (fang) {
|
|
@@ -1008,7 +1022,6 @@ export default {
|
|
} else {
|
|
} else {
|
|
this.popDataArr.push(datas);
|
|
this.popDataArr.push(datas);
|
|
}
|
|
}
|
|
-
|
|
|
|
// consloe(this.popDataArr);
|
|
// consloe(this.popDataArr);
|
|
},
|
|
},
|
|
// 下一步获取某个政策条件比例数据
|
|
// 下一步获取某个政策条件比例数据
|
|
@@ -1099,11 +1112,10 @@ export default {
|
|
this.$set(item, "userList", this.userList);
|
|
this.$set(item, "userList", this.userList);
|
|
});
|
|
});
|
|
|
|
|
|
- if (this.goodsList.length && this.goodsList[0].wallets.length) {
|
|
|
|
- this.mainForm.k3ServiceName = this.goodsList[0].wallets[0].serviceId;
|
|
|
|
- this.mainForm.k3ServiceId = this.goodsList[0].wallets[0].serviceId;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ if (this.goodsList.length && this.goodsList[0].wallets.length ) {
|
|
|
|
+ this.mainForm.k3ServiceName = this.goodsList[0].wallets[0].serviceId || '';
|
|
|
|
+ this.mainForm.k3ServiceId = this.goodsList[0].wallets[0].serviceId || '';
|
|
|
|
+ }
|
|
this.cusIndex = 0;
|
|
this.cusIndex = 0;
|
|
this.total = 0;
|
|
this.total = 0;
|
|
this.popDataArr = [];
|
|
this.popDataArr = [];
|
|
@@ -1126,10 +1138,10 @@ export default {
|
|
} else {
|
|
} else {
|
|
this.goodsList = arrData;
|
|
this.goodsList = arrData;
|
|
}
|
|
}
|
|
- if (this.goodsList.length && this.goodsList[0].wallets.length) {
|
|
|
|
- this.mainForm.k3ServiceName = this.goodsList[0].wallets[0].serviceId;
|
|
|
|
- this.mainForm.k3ServiceId = this.goodsList[0].wallets[0].serviceId;
|
|
|
|
- }
|
|
|
|
|
|
+ if (this.goodsList.length && this.goodsList[0].wallets.length ) {
|
|
|
|
+ this.mainForm.k3ServiceName = this.goodsList[0].wallets[0].serviceId || '';
|
|
|
|
+ this.mainForm.k3ServiceId = this.goodsList[0].wallets[0].serviceId || '';
|
|
|
|
+ }
|
|
|
|
|
|
this.goodsList.forEach((item) => {
|
|
this.goodsList.forEach((item) => {
|
|
this.$set(item, "status1", "");
|
|
this.$set(item, "status1", "");
|
|
@@ -1504,7 +1516,8 @@ export default {
|
|
// ].dictValue;
|
|
// ].dictValue;
|
|
let params = {
|
|
let params = {
|
|
theTime: this.mainForm.date,
|
|
theTime: this.mainForm.date,
|
|
-
|
|
|
|
|
|
+ k3ServiceId:this.mainForm.k3ServiceId,
|
|
|
|
+ k3ServiceName:this.mainForm.k3ServiceName,
|
|
remark: this.mainForm.remark,
|
|
remark: this.mainForm.remark,
|
|
type: 2, // 1:普通零售单,2:政策零售单
|
|
type: 2, // 1:普通零售单,2:政策零售单
|
|
retailOrderItemList: this.goodsList,
|
|
retailOrderItemList: this.goodsList,
|
|
@@ -1519,7 +1532,6 @@ export default {
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
addData(params).then((res) => {
|
|
addData(params).then((res) => {
|
|
- console.log(5585);
|
|
|
|
this.$successMsg("添加成功");
|
|
this.$successMsg("添加成功");
|
|
this.goBack();
|
|
this.goBack();
|
|
this.$parent.getList();
|
|
this.$parent.getList();
|