Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
This commit is contained in:
@ -45,7 +45,7 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
value(val) {
|
||||
console.log(val);
|
||||
// console.log(val);
|
||||
this.nData = val;
|
||||
},
|
||||
nData(val) {
|
||||
|
@ -194,7 +194,7 @@ export default {
|
||||
}
|
||||
if (idx === res.rows.length - 1) {
|
||||
arr.forEach((obj) => {
|
||||
console.log({ obj });
|
||||
// console.log({ obj });
|
||||
if (obj.children) {
|
||||
obj.amount = obj.children.reduce(
|
||||
(a, c) => a + (c.afterSaleCommissOrder === 0 ? c.amount : 0),
|
||||
@ -205,7 +205,7 @@ export default {
|
||||
}
|
||||
return arr;
|
||||
}, []);
|
||||
console.log(this.orderList);
|
||||
// console.log(this.orderList);
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
|
@ -52,7 +52,7 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
showDialog(data, healthy, type) {
|
||||
console.log(healthy)
|
||||
// console.log(healthy)
|
||||
this.data = data;
|
||||
this.type = type;
|
||||
this.title = "修改" + `「${data.name}」` + "备注";
|
||||
|
@ -75,7 +75,7 @@
|
||||
{{ `${scope.row.startDate} 至 ${scope.row.endDate}` }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发送" align="center">
|
||||
<el-table-column label="发送" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="!!scope.row.sendFlag"
|
||||
|
Reference in New Issue
Block a user