diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue index b1e0c54a..ef8c9426 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue @@ -98,7 +98,7 @@ min-width="170"> + + + +
diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue index 9ba00188..d331c27a 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue @@ -9,6 +9,7 @@ 运单号 账单号 + 发票号
@@ -43,6 +44,14 @@ + + + + + + + @@ -107,6 +116,8 @@ {{ unrecedMoney(scope.row) }} --> + + @@ -146,7 +157,7 @@ export default { components: { elDateAdvPicker, PayeePicker, SalemanPicker, EmpNamePicker, CancelAccountApplicationFormPanel }, - dicts: ['emis_payment_type', 'center_confirme_status'], + dicts: ['emis_payment_type', 'center_confirme_status','emis_settlebill_pay_type'], data() { return { @@ -203,19 +214,19 @@ export default { getList() { this.loading = true; - let rqParams = { ...this.queryParams }; + let rqParams = this.initQueryParams(); - if (this.queryParams.queryKey) { - rqParams.params.queryParams = this.queryParams.queryKey; - }else{ - rqParams.params.queryParams = null; - } - if (this.dateTimeRange) { - rqParams = this.addDateRange(rqParams, this.dateTimeRange, "applyDate"); - rqParams.applyDateStart = this.dateTimeRange[0]; - rqParams.applyDateEnd = this.dateTimeRange[1]; - this.removeDateRange(rqParams, "etd"); - } + // if (this.queryParams.queryKey) { + // rqParams.params.queryParams = this.queryParams.queryKey; + // }else{ + // rqParams.params.queryParams = null; + // } + // if (this.dateTimeRange) { + // rqParams = this.addDateRange(rqParams, this.dateTimeRange, "applyDate"); + // rqParams.applyDateStart = this.dateTimeRange[0]; + // rqParams.applyDateEnd = this.dateTimeRange[1]; + // this.removeDateRange(rqParams, "etd"); + // } getWriteoffApplyList(rqParams).then(response => { this.emisTmsBatchList = response.rows; @@ -225,22 +236,19 @@ export default { }, initQueryParams() { - - if (this.queryOrderType == '1') { - this.queryParams.params.billCode = this.queryParams.queryKey; - this.queryParams.batchNo = null; - } else { - this.queryParams.batchNo = this.queryParams.queryKey; - this.queryParams.params.billCode = null; + if (this.queryParams.queryKey) { + this.queryParams.params.queryParams = this.queryParams.queryKey; + }else{ + this.queryParams.params.queryParams = null; } - - - if (this.queryETDType == '2') { - this.removeDateRange(this.queryParams, "createTime"); - this.queryParams = this.addDateRange(this.queryParams, this.dateTimeRange, "etd"); - } else { - this.removeDateRange(this.queryParams, "etd"); - this.queryParams = this.addDateRange(this.queryParams, this.dateTimeRange, "createTime"); + if (this.dateTimeRange) { + this.queryParams = this.addDateRange(this.queryParams, this.dateTimeRange, "applyDate"); + this.queryParams.applyDateStart = this.dateTimeRange[0]; + this.queryParams.applyDateEnd = this.dateTimeRange[1]; + this.removeDateRange(this.queryParams, "applyDate"); + }else{ + this.queryParams.applyDateStart =null; + this.queryParams.applyDateEnd = null; } return this.queryParams; }, diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue index 23009014..f108c1c4 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue @@ -40,15 +40,21 @@ - + + + + + --> + + + + + + + + + + + + + + + + @@ -133,7 +160,7 @@ export default { name: "CancelAccountCheckListPanel", components: { elDateAdvPicker, PayeePicker, SalemanPicker, EmpNamePicker, CancelAccountApplicationFormPanel }, - dicts: [ 'center_confirme_status'], + dicts: [ 'center_confirme_status','emis_settlebill_pay_type'], data() { return { @@ -244,6 +271,7 @@ export default { salesmen: null, applyDateStart: null, applyDateEnd: null, + payType: null, params: { queryParams: null, } @@ -258,20 +286,22 @@ export default { getList() { this.loading = true; - let rqParams = { ...this.queryParams }; - - if (this.queryParams.queryKey) { - rqParams.params.queryParams = this.queryParams.queryKey; - }else{ - rqParams.params.queryParams = null; - } - if (this.dateTimeRange) { - rqParams = this.addDateRange(rqParams, this.dateTimeRange, "applyDate"); - rqParams.applyDateStart = this.dateTimeRange[0]; - rqParams.applyDateEnd = this.dateTimeRange[1]; - this.removeDateRange(rqParams, "etd"); - } + let rqParams = this.initQueryParams(); + // if (this.queryParams.queryKey) { + // rqParams.params.queryParams = this.queryParams.queryKey; + // }else{ + // rqParams.params.queryParams = null; + // } + // if (this.dateTimeRange) { + // rqParams = this.addDateRange(rqParams, this.dateTimeRange, "applyDate"); + // rqParams.applyDateStart = this.dateTimeRange[0]; + // rqParams.applyDateEnd = this.dateTimeRange[1]; + // this.removeDateRange(rqParams, "etd"); + // }else{ + // rqParams.applyDateStart = null; + // rqParams.applyDateEnd = null; + // } getWriteoffApplyList(rqParams).then(response => { this.emisTmsBatchList = response.rows; this.total = response.total; @@ -289,7 +319,10 @@ export default { this.queryParams = this.addDateRange(this.queryParams, this.dateTimeRange, "applyDate"); this.queryParams.applyDateStart = this.dateTimeRange[0]; this.queryParams.applyDateEnd = this.dateTimeRange[1]; - this.removeDateRange(this.queryParams, "etd"); + this.removeDateRange(this.queryParams, "applyDate"); + }else{ + this.queryParams.applyDateStart = null; + this.queryParams.applyDateEnd = null; } return this.queryParams; }, @@ -450,6 +483,19 @@ export default { if (j === 'blCenterConfirmed') { return this.selectDictLabel(this.dict.type.center_confirme_status, v[j]); } + if(j === 'blHeadquartersConfirmed'){ + return this.selectDictLabel(this.dict.type.center_confirme_status, v[j]); + } + if(j=== 'payType' ){ + return this.selectDictLabel(this.dict.type.emis_settlebill_pay_type, v[j]); + } + if(j === 'emisWaybill.freight'){ // 账单金额 + return v['detailList']?.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0) + } + if(j=== 'emisSettleSubBill.recedMoney'){ // 已收金额 + return v['detailList']?.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0) + } + return v[j] })) }, diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue b/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue index ef91cc8e..0f86e8bf 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue @@ -7,7 +7,7 @@ ￥{{ settleBillItem.writeoffAmount }} - {{ settleBillItem.recipient }} + {{ settleBillItem.recipient }} {{ settleBillItem.tradeDate }} @@ -19,7 +19,7 @@
- +