|
|
@@ -370,7 +370,7 @@ export default {
|
|
|
label: "已完成",
|
|
|
prop: "cashierStatus",
|
|
|
search: true,
|
|
|
- hide:true,
|
|
|
+ hide: true,
|
|
|
overHidden: true
|
|
|
}
|
|
|
]
|
|
|
@@ -507,7 +507,7 @@ export default {
|
|
|
this.amountSubUsdSum = 0;
|
|
|
// this.query = {};
|
|
|
this.page.currentPage = 1;
|
|
|
- this.query.cashierStatus=1;
|
|
|
+ this.query.cashierStatus = 1;
|
|
|
this.selectionList = [];
|
|
|
this.$set(this.query, "billNo", "");
|
|
|
this.$set(this.query, "corpCnName", "");
|
|
|
@@ -535,8 +535,18 @@ export default {
|
|
|
this.amountSubUsdSum = 0;
|
|
|
if (list.length) {
|
|
|
list.forEach(e => {
|
|
|
- this.amountSubSum += Number(e.amountSub);
|
|
|
- this.amountSubUsdSum += Number(e.amountSubUsd);
|
|
|
+ if (this.tabsValue == "对账收费") {
|
|
|
+ this.amountSubSum += Number(e.amountDr);
|
|
|
+ this.amountSubUsdSum += Number(e.amountDrUsd);
|
|
|
+ }
|
|
|
+ if (this.tabsValue == "对账付费") {
|
|
|
+ this.amountSubSum += Number(e.amountCr);
|
|
|
+ this.amountSubUsdSum += Number(e.amountCrUsd);
|
|
|
+ }
|
|
|
+ if (this.tabsValue == "付费申请" || this.tabsValue == "销项发票") {
|
|
|
+ this.amountSubSum += Number(e.amountSub);
|
|
|
+ this.amountSubUsdSum += Number(e.amountSubUsd);
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
this.selectionList = list;
|
|
|
@@ -545,7 +555,7 @@ export default {
|
|
|
searchReset() {
|
|
|
console.log("清空回调");
|
|
|
this.query = {};
|
|
|
- this.query.cashierStatus=1;
|
|
|
+ this.query.cashierStatus = 1;
|
|
|
this.onLoad(this.page);
|
|
|
},
|
|
|
// 搜索回调
|
|
|
@@ -637,7 +647,7 @@ export default {
|
|
|
},
|
|
|
// 列表获取数据
|
|
|
async onLoad(page, params = {}) {
|
|
|
- console.log(this.query.cashierStatus)
|
|
|
+ console.log(this.query.cashierStatus);
|
|
|
this.loading = true;
|
|
|
let res = {};
|
|
|
if (this.tabsValue == "对账收费") {
|
|
|
@@ -646,7 +656,7 @@ export default {
|
|
|
...Object.assign(params, this.query),
|
|
|
businessType: "CHK",
|
|
|
dc: "D",
|
|
|
- cashierStatus:this.query.cashierStatus?this.query.cashierStatus:1
|
|
|
+ cashierStatus: this.query.cashierStatus ? this.query.cashierStatus : 1
|
|
|
});
|
|
|
} else if (this.tabsValue == "对账付费") {
|
|
|
// 调用 付费申请数据
|
|
|
@@ -654,14 +664,14 @@ export default {
|
|
|
...Object.assign(params, this.query),
|
|
|
businessType: "CHK",
|
|
|
dc: "C",
|
|
|
- cashierStatus:this.query.cashierStatus?this.query.cashierStatus:1
|
|
|
+ cashierStatus: this.query.cashierStatus ? this.query.cashierStatus : 1
|
|
|
});
|
|
|
} else if (this.tabsValue == "付费申请") {
|
|
|
// 调用 销项发票业务数据
|
|
|
res = await finstlbillsList(page.currentPage, page.pageSize, {
|
|
|
...Object.assign(params, this.query),
|
|
|
businessType: "FFSQ",
|
|
|
- cashierStatus: this.query.cashierStatus?this.query.cashierStatus:1
|
|
|
+ cashierStatus: this.query.cashierStatus ? this.query.cashierStatus : 1
|
|
|
});
|
|
|
} else if (this.tabsValue == "销项发票") {
|
|
|
// 应收应付 业务数据
|
|
|
@@ -670,7 +680,7 @@ export default {
|
|
|
type: "销项",
|
|
|
billNoFormat: "XXFP",
|
|
|
businessTypeCode: "XXFP",
|
|
|
- cashierStatus: this.query.cashierStatus?this.query.cashierStatus:1
|
|
|
+ cashierStatus: this.query.cashierStatus ? this.query.cashierStatus : 1
|
|
|
});
|
|
|
}
|
|
|
const data = res.data.data;
|