From 2fe5f5352472e3e372aa21e467297e8323365c0e Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 12 Aug 2025 17:56:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=85=88=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue index 5ade27d5..bec0e6fb 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue @@ -667,6 +667,7 @@ export default { this.initBatchBillRel(this.form.batchNo); if(this.isCopy){ + this.form.batchNo = null; getTmsGroupBatchNo().then(resPack=>{ this.form.batchNo = resPack.data; }); From b666a66a95f669a94ee0d6af28beabd0696bccd9 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 12 Aug 2025 17:57:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7,=E6=96=B0=E5=A2=9E=E5=92=8C=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E7=94=B3=E8=AF=B7=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emisWaybillAjustApplyForm.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue index a9a81390..79dad601 100644 --- a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue +++ b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue @@ -263,8 +263,16 @@ export default { if (valid) { let jsonData=this.$refs.refAdjustDetail.getJsonData(); console.log("====>jsonData==>",jsonData); - this.form.jsonData=JSON.stringify(jsonData); - addEmisWaybillAjustApply(this.form).then(response => { + const params={ + "applyManCode":this.form.applyManCode, + "applyMemo":this.form.applyMemo, + "applySiteCode":this.form.applySiteCode, + "applyType":this.form.applyType, + "billCode":this.form.billCode, + "destConfirmSiteCode":this.form.destConfirmSiteCode, + "jsonData":JSON.stringify(jsonData), + } + addEmisWaybillAjustApply(params).then(response => { this.$modal.msgSuccess("申请成功"); this.$emit("on-changed"); }); From 3c513f2c910803536b3dc559e28102238692889d Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 12 Aug 2025 19:06:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1-=E6=9F=A5=E7=9C=8B-=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/BigBatchEditForm.vue | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue index bec0e6fb..e7640977 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue @@ -228,7 +228,7 @@ 导出 + @click="handleExport">导出 @@ -1307,6 +1307,43 @@ export default { dateTimeChange(value){ this.dateTimeRange=value; }, + /** 导出按钮操作 */ + handleExport() { + const loadingInstance = this.$loading({ + text: '正在导出...' + }) + var qParam = {...this.queryParams}; + qParam.pageNum=1; + qParam.pageSize=5000; + + listEmisTmsSiteBatchDtl({batchNo: this.form.batchNo}).then(response => { + this.downloadLoading = false + if (response.code === 200) { + const curList = response.rows.map(item=>{ + return { + "billCode":item.billCode, + ...item.waybillDetail, + } + }) + console.log(curList) + setTimeout(()=>{ + import('@/vendor/Export2Excel').then(excel => { + const tHeader = ['运单号','寄件网点','寄件国家','目的国家','线路','产品类型','寄件日期','预计到达时间','总件数','实际重量','总体积','体积重量','结算重量','收件人','收件公司','报关方式','清关方式','取件方式','付款方式','运费','寄件人','寄件公司','录单备注']; + const filterVal = ['billCode','sendSiteName','sendCountryName','receiveCountryName','transLineTypeName','productTypeName','sendDate','estimateDate','parcelQty','billWeight','totalVolume','volumeWeight','settlementWeight','receiveName','receiveCompany','customsEclaration','customsClear','pickupMethod','paymentType','freight','sendName','sendCompany','remark']; + const data = this.formatJson(filterVal, curList, response.rows) + excel.export_json_to_excel({ + header: tHeader, + data, + filename: '批次明细导出', + autoWidth: true + }) + loadingInstance.close() + }) + + },500 ) + } + }); + }, } }; From cee3faed3f84d8a8445539407b88b8e00e3e1293 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Wed, 13 Aug 2025 10:18:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmisBaseTools/TanexPrinterBatchPanel.vue | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/views/emis/EmisBaseTools/TanexPrinterBatchPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterBatchPanel.vue index 273149b2..642f3d58 100644 --- a/src/views/emis/EmisBaseTools/TanexPrinterBatchPanel.vue +++ b/src/views/emis/EmisBaseTools/TanexPrinterBatchPanel.vue @@ -402,15 +402,22 @@ } } - }else{ - newOrderList=[...orderList]; } + // else{ + // newOrderList=[...orderList]; + // } // console.log("tnprint===>",newOrderList); // console.log("tnprint===>",that.selTplCode); - this.printOrderList=newOrderList; + // this.printOrderList=newOrderList; this.selTplCode.forEach(item=>{ - that.tanexPrinter.batchPrint(item,that.selPrinterName,newOrderList,this.printManCode) + let paramsOrderList = []; + if(item=="TAN-GC-130" || item=="TAN-ENGC-130" || item=="VT-ENNOLOGO"){ + paramsOrderList = newOrderList; + }else{ + paramsOrderList = [...orderList] + } + that.tanexPrinter.batchPrint(item,that.selPrinterName,paramsOrderList,this.printManCode) }) }, @@ -548,15 +555,16 @@ } } - }else{ - newOrderList=[...orderList]; } + // else{ + // newOrderList=[...orderList]; + // } const loadingInstance = this.$loading({ text: '正在生成预览...' }) - this.printOrderList=newOrderList; + // this.printOrderList=newOrderList; let orderSeqMap = new Map(); for(let i=0; i { - this.tanexPrinter.batchGetPDF(element,this.selPrinterName,newOrderList,this.printManCode,async function(code,msg,data){ + let paramsOrderList=[]; + if(element=="TAN-GC-130"|| element=='TAN-ENGC-130' || element=='VT-ENNOLOGO' ){ + paramsOrderList = newOrderList // 子单号 + }else{ + paramsOrderList = [...orderList] // 主单号 + } + this.tanexPrinter.batchGetPDF(element,this.selPrinterName,paramsOrderList,this.printManCode,async function(code,msg,data){ loadingInstance.close(); if(code == 500){