From e11e5e00ab281837d5f2cc2f689f7d8584400877 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 9 Jul 2024 07:26:57 +0800 Subject: [PATCH] md --- .../traceWaybillDetailView.vue | 2 +- .../SubBillConfirmByMoneyList.vue | 414 +++++++----------- .../SubBillConfirmByMonthList.vue | 2 +- .../SubBillConfirmBySiteList.vue | 2 +- .../emisSettleSubBill/subBillMergeMgnt.vue | 183 ++++---- .../emisWaybill/waybillDetailReadOnly.vue | 11 +- 6 files changed, 251 insertions(+), 363 deletions(-) diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue index db7d5bc4..09a0f557 100644 --- a/src/views/emis/customerService/traceWaybillDetailView.vue +++ b/src/views/emis/customerService/traceWaybillDetailView.vue @@ -14,7 +14,7 @@ diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue index 73330993..06ed1231 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue @@ -15,19 +15,19 @@ :rows="2" /> - + - - + + - + - + - + - + - + - + - - - -
@@ -182,7 +176,7 @@
总票数:{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}, - 总运费:{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}} + 总运费:{{queryStatInfoMap?queryStatInfoMap.totalBillFee.toFixed(2):0}}
@@ -190,7 +184,7 @@ @@ -829,6 +651,98 @@ export default { }); }, + //指定列求和 + getSummaries(param) { + const { columns, data } = param; + console.log("===>getSummaries==>",param) + const sums = []; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计'; + return; + } + + + if ( + column.property === 'waybillDetail.billWeight' + ) { + const values = data.map(item => Number(item.waybillDetail.billWeight)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(2); //保留2位小数 + } + + else if ( + column.property === 'waybillDetail.volumeWeight' + + ) { + const values = data.map(item => Number(item.waybillDetail.volumeWeight)); + + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(2); //保留2位小数 + } + else if ( + column.property === 'waybillDetail.freight' + + ) { + const values = data.map(item => Number(item.waybillDetail.freight)); + + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(2); //保留2位小数 + } + + else if ( + column.property === 'waybillDetail.totalVolume' + ) { + const values = data.map(item => Number(item.waybillDetail.totalVolume)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(5); //保留2位小数 + } + else if( + column.property === 'waybillDetail.parcelQty' + ){ + const values = data.map(item => Number(item.waybillDetail.parcelQty)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index]; + } + }); + console.log(sums); + return sums + }, handleShowTraceInfo(row){ this.openTraceInfoTitle="运单详情【"+row.billCode+"】"; @@ -994,7 +908,7 @@ export default { .feeItem{ - border: 1px solid #d4d4d4; + border: 1px solid #dfe6ec; ul{ list-style: none; @@ -1003,7 +917,7 @@ export default { width: 590px; height: 32px; line-height: 32px; - border: 1px solid #ffffff; + border: 1px solid #dfe6ec; border-top: 0px; font-size: 12px; @@ -1012,7 +926,7 @@ export default { display:block; width:33%; float:left;text-indent:2em } .th{ - background:#F1FADE; font-weight:bold; border-top:1px + background:#FFF; font-weight:bold; border-top:1px } } diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue index 73330993..5e922a26 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue @@ -97,7 +97,7 @@ ref="refTable" row-key="id" - storageName="settleSubBillConfirmList_main" + storageName="SubBillConfirmByMonthList_main" :data="emisSettleSubBillList" :showSearch.sync="showSearch" diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue index bae67e4f..894037af 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue @@ -97,7 +97,7 @@ ref="refTable" row-key="id" - storageName="settleSubBillConfirmList_main" + storageName="SubBillConfirmBySiteList_main" :data="emisSettleSubBillList" :showSearch.sync="showSearch" diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue index 3abdae7b..1843419a 100644 --- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue +++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue @@ -1,5 +1,6 @@ @@ -514,8 +482,11 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; +// import MergeBillForm from '@/views/emis/emisSettleSubBill/mergeBillForm.vue'; + + export default { - name: "SubBillConfirmByMoneyList", + name: "SubBillMergeMgnt", // name: "SubBillConfirmByMonthList", components: { elDateSimplePicker,emisSettleSubBillForm, @@ -534,7 +505,7 @@ export default { EmisSiteSimplePicker2, ProblemTypePicker, - TraceWaybillDetailView + TraceWaybillDetailView, }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', @@ -561,6 +532,11 @@ export default { // 结算子账单表格数据 emisSettleSubBillList: [], + + titleMergeForm:null, + openMergeForm:false, + selectBillList:[], + settleType:null, queryStatInfoMap:null, @@ -753,6 +729,7 @@ export default { delFlag: null, remark: null, blSign:null, + mergeStatus:null, } }, }; @@ -767,26 +744,18 @@ export default { handleClick(tab, event) { // console.log(tab, event); if (tab.name == 'all') { - this.queryParams.blConfirm=null; + this.queryParams.mergeStatus=null; } - else if (tab.name == 'waitConfirm') { - this.queryParams.blConfirm='0'; + else if (tab.name == 'waitMerge') { + this.queryParams.mergeStatus='1'; } - else if (tab.name == 'hasConfirm') { - this.queryParams.blConfirm='1'; - } - else if (tab.name == 'confirmNotBill') { - this.queryParams.blConfirm='2'; - } - else if (tab.name == 'billError') { - this.queryParams.blConfirm='3'; - } - else if (tab.name == 'siteBillError') { - this.queryParams.blSiteConfirm='3'; + else if (tab.name == 'hasMerge') { + this.queryParams.mergeStatus='2'; } + this.getList(); }, @@ -830,6 +799,14 @@ export default { }, + handleMergeBill(){ + this.titleMergeForm="合并账单"; + this.openMergeForm=true; + + // titleMergeForm:null, + // openMergeForm:false, + // selectBillList:[], + }, handleShowTraceInfo(row){ this.openTraceInfoTitle="运单详情【"+row.billCode+"】"; this.currentTraceBillCode=row.billCode; diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue index 2e9efc84..e720bc7f 100644 --- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue +++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue @@ -40,16 +40,13 @@ {{ form.sender.name }} {{ form.sender.phone }} {{ form.sender.company }} - - - - - + {{ form.sender.countryName }} {{ form.sender.provinceName }} {{ form.sender.cityName }} {{ form.sender.countyName }} {{ form.sender.address }} {{ form.reciever.name }} {{ form.reciever.phone }} {{ form.reciever.company }} + {{ form.reciever.countryName }} {{ form.reciever.provinceName }} {{ form.reciever.cityName }} {{ form.reciever.countyName }} {{ form.reciever.address }} @@ -151,7 +148,7 @@ - {{ form.customerName }} + {{ form.customerName }} {{ form.payee }} {{ form.salesmen }} @@ -201,7 +198,7 @@
{{scope.row.realFee}}
- +