From 4b6ba32e9e0d70e8b59572d607f07a0658c07a1b Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 10 Apr 2026 09:46:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signAndAbPanel/SignAndAbComparison.vue | 90 +++++-------------- 1 file changed, 22 insertions(+), 68 deletions(-) diff --git a/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue b/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue index b586ce86..71b4c952 100644 --- a/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue +++ b/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue @@ -78,7 +78,7 @@ type="primary" plain size="mini" - @click="getList" + @click="handleExport" >导出 @@ -87,12 +87,12 @@ - + - + @@ -216,16 +216,7 @@ export default { /** 查询统计信息 */ getList() { this.loading = true; - console.log("---->this.queryParams,", this.dateTimeRange); - - if (null != this.dateTimeRange && '' != this.dateTimeRange) { - this.queryParams.params.beginScanDate = dateToStr(this.dateTimeRange[0]); - this.queryParams.params.endScanDate = dateToStr(this.dateTimeRange[1]); - }else{ - this.queryParams.params.beginScanDate = null; - this.queryParams.params.endScanDate = null; - } - this.tempQueryParams = {...this.queryParams}; + this.tempQueryParams = this.initQueryParams(this.queryParams); queryStatList(this.tempQueryParams).then(response => { if(!response ||response.code != 200){ this.$modal.msgError(response && response.msg || "未知错误") @@ -288,7 +279,18 @@ export default { this.queryParams.isAsc = column.order; this.getList(); }, - + initQueryParams(){ + let qParam=null; + if (null != this.dateTimeRange && '' != this.dateTimeRange) { + this.queryParams.params.beginScanDate = dateToStr(this.dateTimeRange[0]); + this.queryParams.params.endScanDate = dateToStr(this.dateTimeRange[1]); + }else{ + this.queryParams.params.beginScanDate = null; + this.queryParams.params.endScanDate = null; + } + qParam={...this.queryParams}; + return qParam; + }, /** 导出按钮操作 */ handleExport() { const loadingInstance = this.$loading({ @@ -304,7 +306,7 @@ export default { qExportParam.pageNum=1; qExportParam.pageSize=5000; - listEmisWaybill(qExportParam).then(response => { + queryStatList(qExportParam).then(response => { if (response.code === 200) { this.exportData(response.rows,loadingInstance); } @@ -321,7 +323,7 @@ export default { excel.export_json_to_excel({ header: tHeader, data, - filename: '统计', + filename: '签收异常对比统计', autoWidth: true }) loadingInstance.close() @@ -337,59 +339,11 @@ export default { if (j === 'kjlx') { return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName']; } - if (j === 'fjr') { - return v['sendName']+'--'+v['receiveName']; + if(j==='unSignCount'){ + return v['scanCount']-v['signCount']; } - if (j === 'sendMobile') { - return ""; - } - if (j === 'paymentStatus') { - return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]); - } - - if (j === 'pickupMethod') { - return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]); - } - if (j === 'customsEclaration') { - return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]); - } - if (j === 'customsClear') { - return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]); - } - if (j === 'packType') { - return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]); - } - - if (j === 'dispatchMethod') { - if(v[j] == 1){ - return '派送'; - }else{ - return '自提'; - } - } - if (j === 'blMessage') { - if(v[j] == 1){ - return '发送'; - }else{ - return '不发送'; - } - } - if (j === 'blAcceptMessage') { - if(v[j] == 1){ - return '发送'; - }else{ - return '不发送'; - } - } - if (j === 'blSign') { - if(v[j] == 1){ - return '已签收'; - }else{ - return '未签收'; - } - } - if (j === 'paymentType') { - return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); + if(j==='signRate'){ + return ((v['signCount'] / v['scanCount']) * 100).toFixed(2) + '%'; } return v[j] })) From 9ef0863d2489efd33edc456e82d6b2af32b9accb Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 10 Apr 2026 15:37:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=B8=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/sendWaybillList.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index d1df6f19..441e9256 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -955,6 +955,7 @@ export default { } }, created() { + this.queryParams.billCode = this.$route.query.billCode; if(this.$route.query.action=='queryByCredit'){ if(this.$route.query.custNo!=null){ @@ -992,7 +993,7 @@ export default { this.queryOrderType="1"; this.queryOrderDateType="1"; // this.queryExpireNotSign="1" - + this.getList(); } }, From a249d7933032fe4e7a8d5c5ec5070bf6cf83953a Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 10 Apr 2026 16:12:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uploadThePictureOfTheWaybillSigning.vue | 89 +++++++++++-------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue index 275355ed..ac24bb16 100644 --- a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue +++ b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue @@ -1,11 +1,21 @@