From a5bd7c879e62db45f04823e0faf2ac882552a67c Mon Sep 17 00:00:00 2001 From: liuyp Date: Thu, 30 May 2024 16:24:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=8C=85=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=EF=BC=9B=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=AF=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=92=8C=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E8=BF=90=E5=8D=95=E5=8F=B7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisTmsPack/packageManagement.vue | 159 +++++++++++++++--- ...loadThePictureOfTheSendWaybillShipment.vue | 27 ++- .../uploadThePictureOfTheWaybillSigning.vue | 30 ++-- 3 files changed, 157 insertions(+), 59 deletions(-) diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue index 5d721c29..67dca799 100644 --- a/src/views/emis/emisTmsPack/packageManagement.vue +++ b/src/views/emis/emisTmsPack/packageManagement.vue @@ -62,7 +62,7 @@ v-hasPermi="['emis:emisTmsPack:add']" >新增合包 - + 删除 @@ -164,7 +164,7 @@ size="mini" type="text" icon="el-icon-delete" - @click="handleDelete(scope.row)" + @click="CoPack(scope.row)" v-hasPermi="['emis:emisTmsPack:remove']" >删除 --> @@ -532,6 +532,12 @@ export default { tempCoPackList:[], coSelection:[], + //区分当前是新增还是修改 + coPackType:'', + + // 临时存储已有合包的运单号 + tempExistCoPackWayBillList:[], + tempCoPackInfo:{}, // 弹出展示层 id:null, @@ -574,6 +580,7 @@ export default { getList() { this.loading = true; // this.queryParams.params = {}; + this.emisTmsPackList = []; if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) { this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0]; this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1]; @@ -632,6 +639,7 @@ export default { packName: this.coData.packName || '', packDate: this.coData.createTime, destCountry: this.coData.destCountry, + nextSiteCode: this.coData.nextSiteCode, // destCountryName: this.coData., blUnpack: this.coData.blUnpack, sendStiteCode: this.coData.sendStiteCode, @@ -642,34 +650,126 @@ export default { // packStatus: this.coData., opMan: this.$store.getters.empCode } - addEmisTmsPack(coPackItem).then(response => { - if(!response || response.code != 200){ - this.$modal.msgError(response && response.msg || '新增合包失败') - return; - } - }) - for(let i = 0; i< this.emisCoPackDetail.length;i++){ - let packDetail = { - packNo:this.coData.packNo, - billCode: this.emisCoPackDetail[i].billCode, - scanDate: this.emisCoPackDetail[i].scanDate, - scanStatus: this.emisCoPackDetail[i].scanStatus, - packStatus: null, - scanMan: this.emisCoPackDetail[i].scanMan, - createBy: this.$store.getters.empCode, - createTime: parseTime(new Date()) - }; - addEmisTmsPackDtl(packDetail).then(response => { + if(this.coPackType == "add"){// 新增 + addEmisTmsPack(coPackItem).then(response => { if(!response || response.code != 200){ - this.$modal.msgError(response && response.msg || '合包明细新增失败') + this.$modal.msgError(response && response.msg || '新增合包失败') return; } }) + for(let i = 0; i< this.emisCoPackDetail.length;i++){ + let packDetail = { + packNo:this.coData.packNo, + billCode: this.emisCoPackDetail[i].billCode, + scanDate: this.emisCoPackDetail[i].scanDate, + scanStatus: this.emisCoPackDetail[i].scanStatus, + packStatus: null, + scanMan: this.emisCoPackDetail[i].scanMan, + createBy: this.$store.getters.empCode, + createTime: parseTime(new Date()) + }; + addEmisTmsPackDtl(packDetail).then(response => { + if(!response || response.code != 200){ + this.$modal.msgError(response && response.msg || '合包明细新增失败') + return; + } + }) + } + }else if(this.coPackType == "edit"){// 修改 + //第一步：处理合包信息的更新； + if(this.tempCoPackInfo.destCountry != this.coData.destCountry + || this.tempCoPackInfo.sendStiteCode != this.coData.sendStiteCode + || this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode + || this.tempCoPackInfo.blUnpack != this.blUnpack + || this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty + || this.tempCoPackInfo.parcelQty != this.coData.parcelQty + || this.tempCoPackInfo.totalWeight != this.coData.totalWeight + || this.tempCoPackInfo.totalVolume != this.coData.totalVolume + ){ + this.tempCoPackInfo.destCountry = this.coData.destCountry; + this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode; + this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; + this.tempCoPackInfo.blUnpack = this.blUnpack; + this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty; + this.tempCoPackInfo.parcelQty = this.coData.parcelQty; + this.tempCoPackInfo.totalWeight = this.coData.totalWeight; + this.tempCoPackInfo.totalVolume = this.coData.totalVolume; + updateEmisTmsPack(this.tempCoPackInfo).then(res => { + if(!res || res.code != 200){ + this.$modal.msgError(res && res.msg || '未知错误') + return; + } + }); + } + //第二步：处理运单列表的数据 + let tempDelList = []; + let tempAddList=[]; + //2.1：计算要删除的运单 + tempDelList = this.tempExistCoPackWayBillList.filter(item => { + let ls = this.emisCoPackDetail.filter(cd => { + return cd.billCode == item.billCode + }) + if(ls.length > 0){ + return false; + }else{ + return true; + } + }) + tempDelList.forEach(item =>{ + delEmisTmsPackDtl(item.id).then(res => { + if(!res || res.code != 200){ + this.$modal.msgError(res && res.msg || '未知错误') + return; + } + }) + }) + //2.2：计算要新增的运单 + tempAddList = this.emisCoPackDetail.filter(item => { + let ls = this.tempExistCoPackWayBillList.filter(cd => { + return cd.billCode == item.billCode + }) + if(ls.length > 0){ + return false; + }else{ + return true; + } + }) + tempAddList.forEach(item =>{ + let packDetail = { + packNo:this.coData.packNo, + billCode: item.billCode, + scanDate: item.scanDate, + scanStatus: item.scanStatus, + packStatus: null, + scanMan: item.scanMan, + createBy: this.$store.getters.empCode, + createTime: parseTime(new Date()) + }; + addEmisTmsPackDtl(packDetail).then(response => { + if(!response || response.code != 200){ + this.$modal.msgError(response && response.msg || '合包明细新增失败') + return; + } + }) + }) } this.openForm= false; this.titleForm = ""; - this.$modal.msgSuccess('操作成功！'); + this.getList(); + }, + async handleDeleteCoPack(){ + let that =this; + for(let i = 0; i< this.ids.length;i++){ + let res = await delEmisTmsPack(this.ids[i]); + if(!res || res.code != 200){ + that.$modal.msgError(res && res.msg || '合包删除失败') + that.getList(); + return; + } + } + this.$modal.msgSuccess('操作成功'); + this.getList(); }, handleCancelCo(){ this.titleForm=''; @@ -733,6 +833,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selection = selection; this.single = selection.length!==1 this.multiple = !selection.length }, @@ -768,7 +869,10 @@ export default { }, /** 新增按钮操作 */ async handleAdd() { + this.coPackType="add"; this.coData = {}; + this.tempExistCoPackWayBillList = [];//情况临时保存的已有运单号 + this.tempCoPackInfo={}; let response = await getPackNo(); if(!response || response.code != 200){ this.$message.error(response && response.msg || "未知错误"); @@ -796,12 +900,12 @@ export default { }, /** 修改按钮操作 */ async handleUpdate(row) { + this.coPackType="edit"; let response = await getEmisTmsPack(row.id); if(!response || response.code != 200){ this.$message.error(response && response.msg || "未知错误"); return; } - debugger; let resData = response.data; this.coData.packNo = resData.packNo; this.coData.createTime = resData.createTime; @@ -818,7 +922,8 @@ export default { this.$message.error(resList && resList.msg || "未知错误"); return; } - debugger; + 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){ @@ -846,7 +951,7 @@ export default { this.openForm = false; }, /** 删除按钮操作 */ - handleDelete(row) { + CoPack(row) { const ids = row.id || this.ids; this.$modal.confirm('是否确认删除').then(function() { return delEmisTmsPack(ids); diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue index a28f36f8..a7702240 100644 --- a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue +++ b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue @@ -62,6 +62,7 @@