|
|
@@ -366,6 +366,7 @@ export default {
|
|
|
label: "最新提醒",
|
|
|
prop: "lastTime",
|
|
|
hidden: true,
|
|
|
+ scope: "aTimeList",
|
|
|
},
|
|
|
],
|
|
|
tableSet1: [
|
|
|
@@ -430,10 +431,12 @@ export default {
|
|
|
label: "预付时间",
|
|
|
prop: "predictPayTime",
|
|
|
hidden: true,
|
|
|
+ scope: "aTimeList",
|
|
|
+ hidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "剩余天数",
|
|
|
- prop: "predictReceiveDay",
|
|
|
+ prop: "predictPayDay",
|
|
|
hidden: true,
|
|
|
},
|
|
|
{
|
|
|
@@ -568,7 +571,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "待付佣金(元)",
|
|
|
- prop: "deductMoney",
|
|
|
+ prop: "payMoney",
|
|
|
hidden: true,
|
|
|
scope: "solt",
|
|
|
soltName: "status",
|
|
|
@@ -598,7 +601,7 @@ export default {
|
|
|
remarkDialogVisible: false,
|
|
|
examineDialogVisible: false,
|
|
|
badBillDialogVisible: false,
|
|
|
- type: 0,
|
|
|
+ type: 3,
|
|
|
activeOrderInfo: {},
|
|
|
roleList: [],
|
|
|
countInfo: {},
|
|
|
@@ -717,7 +720,7 @@ export default {
|
|
|
e.oId = e.id;
|
|
|
e.id = e.id + 100086;
|
|
|
e.billType = e.orderType + 5;
|
|
|
- e.monthTime = this.parseTime(e.monthTime, "{y}-{m}-{d}");
|
|
|
+ e.monthTime = this.parseTime(e.orderTime, "{y}-{m}-{d}");
|
|
|
});
|
|
|
resolve(res.data);
|
|
|
})
|
|
|
@@ -727,9 +730,17 @@ export default {
|
|
|
},
|
|
|
// 切换已付待付
|
|
|
backStatus({ row, column }) {
|
|
|
+ let { payStatus, oId } = row;
|
|
|
let { label, property } = column;
|
|
|
+ if (oId) {
|
|
|
+ property =
|
|
|
+ property == "payMoney" ? "divideCompanyMoney" : "divideMoney";
|
|
|
+ payStatus = payStatus != 3 ? 0 : 1;
|
|
|
+ } else {
|
|
|
+ payStatus = payStatus != 1 ? 0 : 1;
|
|
|
+ }
|
|
|
return ["0.00", row[property]][
|
|
|
- (label.indexOf("已") != -1 ? 0 : 1) ^ row.payStatus
|
|
|
+ (label.indexOf("已") != -1 ? 0 : 1) ^ payStatus
|
|
|
];
|
|
|
},
|
|
|
changeData(data) {
|
