From cb90ccf060802ff909293f8ecd02a9ae37df6ae4 Mon Sep 17 00:00:00 2001 From: liuyp Date: Tue, 4 Jun 2024 18:59:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=20&&=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisTmsPack/packageManagement.vue | 40 +++++++++---------- .../arrivalAndDispathScan.vue | 3 -- .../emis/emisTmsScanRecord/arrivalScan.vue | 3 -- .../clearanceScanUnderDevelopment.vue | 3 -- .../emisTmsScanRecord/coPackageScanning.vue | 3 -- .../customsClearanceScanning.vue | 3 -- .../emis/emisTmsScanRecord/deliveryScan.vue | 3 -- .../emis/emisTmsScanRecord/loadingScan.vue | 3 -- .../emis/emisTmsScanRecord/outgoingScan.vue | 16 ++++++-- .../emisTmsScanRecord/positionScanning.vue | 3 -- .../emis/emisTmsScanRecord/scanRecord.vue | 3 -- .../emis/emisTmsScanRecord/signAndRecord.vue | 3 -- .../signatureAbnormalComparison.vue | 9 ++--- .../transmitReceiveScanning.vue | 3 -- .../emis/emisTmsScanRecord/unloadingScan.vue | 3 -- .../emis/emisTmsScanRecord/unpackScan.vue | 3 -- .../emisWaybillProblemInfo/problemEntry.vue | 3 -- 17 files changed, 36 insertions(+), 71 deletions(-) diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue index 2ecfb1df..a7af07da 100644 --- a/src/views/emis/emisTmsPack/packageManagement.vue +++ b/src/views/emis/emisTmsPack/packageManagement.vue @@ -203,11 +203,12 @@ - + {{ $t('生成网点') }} - + + @@ -361,7 +362,7 @@ - + @@ -484,7 +485,7 @@ - + @@ -595,7 +596,7 @@ export default { destCountry: null, destCountryName: null, blUnpack: null, - sendStiteCode: null, + sendSiteCode: null, totalParcelQty: null, totalWaybillQty: null, totalVolume: null, @@ -611,6 +612,7 @@ export default { }; }, created() { + }, mounted() { @@ -672,7 +674,7 @@ export default { this.wayBillData.dateTimeRange=value; }, async handleAddCoPack(){ - if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){ + if(!this.coData.destCountry || !this.coData.sendSiteCode || !this.coData.nextSiteCode || !this.blUnpack){ this.$modal.msgError("请先选择必填项") return; } @@ -688,7 +690,8 @@ export default { nextSiteCode: this.coData.nextSiteCode, // destCountryName: this.coData., blUnpack: this.coData.blUnpack, - sendStiteCode: this.coData.sendStiteCode, + sendSiteCode: this.coData.sendSiteCode, + sendSiteName: this.coData.sendSiteName, totalParcelQty: this.coData.totalParcelQty, totalWaybillQty: this.coData.totalWaybillQty, totalVolume: this.coData.totalVolume, @@ -726,7 +729,7 @@ export default { }else if(this.coPackType == "edit"){// 修改 //第一步:处理合包信息的更新; if(this.tempCoPackInfo.destCountry != this.coData.destCountry - || this.tempCoPackInfo.sendStiteCode != this.coData.sendStiteCode + || this.tempCoPackInfo.sendSiteCode != this.coData.sendSiteCode || this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode || this.tempCoPackInfo.blUnpack != this.blUnpack || this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty @@ -735,7 +738,7 @@ export default { || this.tempCoPackInfo.totalVolume != this.coData.totalVolume ){ this.tempCoPackInfo.destCountry = this.coData.destCountry; - this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode; + this.tempCoPackInfo.sendSiteCode = this.coData.sendSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.blUnpack = this.blUnpack; this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty; @@ -909,7 +912,7 @@ export default { totalWeight +=item.billWeight; totalVolume +=item.totalVolume; item.destCountry = this.coData.destCountry; - item.sendStiteCode = this.coData.sendStiteCode; + item.sendSiteCode = this.coData.sendSiteCode; item.nextSiteCode = this.coData.nextSiteCode; item.blUnpack = this.blUnpack; }) @@ -939,10 +942,13 @@ export default { this.coData.createTime = parseTime(new Date()); this.coData.destCountry = null; this.coData.destCountryName = null; - this.coData.sendStiteCode = null; + // this.coData.sendSiteCode = null; this.coData.nextSiteCode = null; this.coData.nextStation = null; this.blUnpack = "1"; + + this.coData.sendSiteCode = this.$store.getters.ownerSiteCode; + this.coData.sendSiteName=this.$store.getters.ownerSiteName; this.currentId=null; this.openForm= true; @@ -968,7 +974,8 @@ export default { this.coData.createTime = resData.createTime; this.coData.destCountry = resData.destCountry; // this.coData.destCountryName = null; - this.coData.sendStiteCode = resData.sendStiteCode; + this.coData.sendSiteCode = resData.sendSiteCode; + this.coData.sendSiteCode = resData.sendSiteName; this.coData.nextSiteCode = resData.nextSiteCode; // this.coData.nextStation = null; this.blUnpack = resData.blUnpack; @@ -982,13 +989,6 @@ export default { this.tempExistCoPackWayBillList = resList.rows;//临时存储,用于运单号校验 this.tempCoPackInfo = resData; for(let p = 0; p < resList.rows.length;p++){ - // let resd = await getWaybillDetail(resList.rows[p].billCode); - // if(!resd || resd.code != 200){ - // this.$message.error(resd && resd.msg || "未知错误"); - // return; - // } - // this.emisCoPackDetail.push(resd.data); - ; this.emisCoPackDetail.push(resList.rows[p].waybillDetail); } this.coData.packStatus = this.tempCoPackInfo.packStatus; @@ -1039,7 +1039,7 @@ export default { const curList = response.rows import('@/vendor/Export2Excel').then(excel => { const tHeader = ['id','合包号','合包名称','合包时间','目的国家','目的国家名称','是否可拆','发出网点','下一网点','下一站','总件数','总运单数','总体积','总重量','合包状态','扩展数据','操作员','ext1','ext2','ext3','ext4','备注','租户ID','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',]; - const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendStiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',]; + const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendSiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',]; const data = this.formatJson(filterVal, curList, response.rows) excel.export_json_to_excel({ header: tHeader, diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index 7e3a2c54..6dbb56d1 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -109,9 +109,6 @@ - -
T0123219321 有问题
-