|
@@ -347,8 +347,8 @@ export default {
|
|
{
|
|
{
|
|
label: "预收时间",
|
|
label: "预收时间",
|
|
hidden: true,
|
|
hidden: true,
|
|
- scope: "solt",
|
|
|
|
- soltName: "predictPayTime",
|
|
|
|
|
|
+ prop: "predictReceiveTime",
|
|
|
|
+ scope: "aTimeList",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
label: "剩余天数",
|
|
label: "剩余天数",
|
|
@@ -604,7 +604,7 @@ export default {
|
|
remarkDialogVisible: false,
|
|
remarkDialogVisible: false,
|
|
examineDialogVisible: false,
|
|
examineDialogVisible: false,
|
|
badBillDialogVisible: false,
|
|
badBillDialogVisible: false,
|
|
- type: 3,
|
|
|
|
|
|
+ type: 0,
|
|
activeOrderInfo: {},
|
|
activeOrderInfo: {},
|
|
roleList: [],
|
|
roleList: [],
|
|
countInfo: {},
|
|
countInfo: {},
|
|
@@ -723,6 +723,10 @@ export default {
|
|
e.id = e.id + 100086;
|
|
e.id = e.id + 100086;
|
|
e.billType = e.orderType + 5;
|
|
e.billType = e.orderType + 5;
|
|
e.monthTime = this.parseTime(e.orderTime, "{y}-{m}-{d}");
|
|
e.monthTime = this.parseTime(e.orderTime, "{y}-{m}-{d}");
|
|
|
|
+ if (this.type == 3 || this.type == 2) {
|
|
|
|
+ e.divideCompanyMoney =
|
|
|
|
+ this.type == 2 ? e.divideSellerMoney : e.brokerage;
|
|
|
|
+ }
|
|
});
|
|
});
|
|
resolve(res.data);
|
|
resolve(res.data);
|
|
})
|
|
})
|
|
@@ -735,11 +739,8 @@ export default {
|
|
let { payStatus, oId } = row;
|
|
let { payStatus, oId } = row;
|
|
let { label, property } = column;
|
|
let { label, property } = column;
|
|
if (oId) {
|
|
if (oId) {
|
|
- if (property == "payMoney") {
|
|
|
|
- property = this.type == 3 ? "brokerage" : "divideCompanyMoney";
|
|
|
|
- } else {
|
|
|
|
- property = this.type == 2 ? "divideSellerMoney" : "divideMoney";
|
|
|
|
- }
|
|
|
|
|
|
+ property =
|
|
|
|
+ property == "payMoney" ? "divideCompanyMoney" : "divideMoney";
|
|
payStatus = payStatus != 3 ? 0 : 1;
|
|
payStatus = payStatus != 3 ? 0 : 1;
|
|
} else {
|
|
} else {
|
|
payStatus = payStatus != 1 ? 0 : 1;
|
|
payStatus = payStatus != 1 ? 0 : 1;
|