From 3d6f99cf5971f639baf19f995e9e53eb386078e2 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Mon, 7 Apr 2025 17:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E7=B3=BB=E7=BB=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecss/ecss.js | 2 + src/views/modules/ecss/codelnotify.vue | 4 +- src/views/modules/ecss/codelnotifyConfirm.vue | 73 ++++++++++++++++++- src/views/modules/ecss/package.vue | 2 +- src/views/modules/ecss/pallet.vue | 2 +- src/views/modules/ecss/partHsCode.vue | 8 +- 6 files changed, 76 insertions(+), 15 deletions(-) diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js index d46439f..b61dca4 100644 --- a/src/api/ecss/ecss.js +++ b/src/api/ecss/ecss.js @@ -19,6 +19,8 @@ export const deleteEcssDelDetail= data => createAPI(`/ecss/coDel/deleteEcssDelDe export const confirmEcssDel= data => createAPI(`/ecss/coDel/confirmEcssDel`,'post',data) + +export const updateEcssDel= data => createAPI(`/ecss/coDel/updateEcssDel`,'post',data) export const cancerConfirmEcssDel= data => createAPI(`/ecss/coDel/cancerConfirmEcssDel`,'post',data) export const searchEcssCoDelNotifyHeaderForCK = data => createAPI(`/ecss/coDel/searchEcssCoDelNotifyHeaderForCK`,'post',data) diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue index cd695d5..fd14d84 100644 --- a/src/views/modules/ecss/codelnotify.vue +++ b/src/views/modules/ecss/codelnotify.vue @@ -189,7 +189,7 @@ - + @@ -226,7 +226,7 @@ - + diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue index ae773cf..ab5c84c 100644 --- a/src/views/modules/ecss/codelnotifyConfirm.vue +++ b/src/views/modules/ecss/codelnotifyConfirm.vue @@ -67,7 +67,7 @@ fixed="left" label="操作"> @@ -293,7 +293,30 @@ 保存 - 关闭 + 关闭 + + + + + + + + + + + + + + + + 保存 + 关闭 @@ -373,7 +396,7 @@ 物料编码 - + @@ -447,7 +470,7 @@ @row-dblclick="partRowDblclick" style="width: 100%;"> @@ -538,6 +561,7 @@ searchEcssCoDelNotifyHeaderForCK, searchEcssCoDelNotifyDetail, confirmEcssDel, + updateEcssDel, cancerConfirmEcssDel, searchCoDelPalletData, searchEcssCoDelPalletHeaderData, @@ -627,6 +651,7 @@ seqNo:'', itemNo:'', partNo:'', + pn:'', qty:'', poNo:'', boxQty:'', @@ -637,6 +662,7 @@ search:'查询', }, confirmModelFlag:false, + updateModelFlag:false, confirmModel:{ site:'', buDesc:'', @@ -1840,6 +1866,7 @@ }, partRowDblclick (row) { this.boxModelData.partNo = row.partNo + this.boxModelData.pn = row.pn this.partFlag = false }, // 获取基础数据列表S @@ -1941,6 +1968,12 @@ }, confirmDo(){ + if (!this.confirmModel.notifyDate) { + this.$alert('请选择预计发货日期！', '错误', { + confirmButtonText: '确定' + }) + return false + } confirmEcssDel(this.confirmModel).then(({data}) => { if (data && data.code === 0) { this.searchTable() @@ -1991,6 +2024,34 @@ this.confirmModel=JSON.parse(JSON.stringify(row)); this.confirmModelFlag=true }, + updateModelOpen(row){ + this.confirmModel=JSON.parse(JSON.stringify(row)); + this.updateModelFlag=true + }, + updateDo(){ + if (!this.confirmModel.readyDate) { + this.$alert('请选择ReadyDate！', '错误', { + confirmButtonText: '确定' + }) + return false + } + updateEcssDel(this.confirmModel).then(({data}) => { + if (data && data.code === 0) { + this.searchTable() + this.updateModelFlag=false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, upLoadPallet(){ if(this.dataList3.length>0){ this.$alert('已经有明细无法再次导入请去手工装箱全部删除！', '错误', { @@ -2034,6 +2095,8 @@ }, updatePalletModel(row){ this.palletModelData=JSON.parse(JSON.stringify(row)) + this.palletModelData.pallet=row.palletNo + this.palletModelData.palletRemark=row.palletRemark this.palletModelData.addFlag=1 this.palletModelFlag=true }, @@ -2059,6 +2122,7 @@ volume:'', grossWeight:'', netWeight:'', + pallet:'', palletRemark:'', } searchEcssCoDelNotifyDetail(this.currentRow).then(({data}) => { @@ -2152,6 +2216,7 @@ seqNo:this.boxDetailData.seqNo, itemNo:'', partNo:'', + pn:'', qty:'', poNo:'', boxQty:'', diff --git a/src/views/modules/ecss/package.vue b/src/views/modules/ecss/package.vue index 3c86430..b0b0bba 100644 --- a/src/views/modules/ecss/package.vue +++ b/src/views/modules/ecss/package.vue @@ -430,7 +430,7 @@ }, mounted() { this.$nextTick(() => { - this.height = (window.innerHeight - 240)/2; + this.height = (window.innerHeight - 200); }) }, methods: { diff --git a/src/views/modules/ecss/pallet.vue b/src/views/modules/ecss/pallet.vue index 4a6afbf..ccf5be6 100644 --- a/src/views/modules/ecss/pallet.vue +++ b/src/views/modules/ecss/pallet.vue @@ -417,7 +417,7 @@ }, mounted() { this.$nextTick(() => { - this.height = (window.innerHeight - 240)/2; + this.height = (window.innerHeight - 200); }) }, methods: { diff --git a/src/views/modules/ecss/partHsCode.vue b/src/views/modules/ecss/partHsCode.vue index 85d859e..50b1e3f 100644 --- a/src/views/modules/ecss/partHsCode.vue +++ b/src/views/modules/ecss/partHsCode.vue @@ -900,7 +900,7 @@ }, saveHSCode(){ if(this.hsCodeModelData.hsCode===''||this.hsCodeModelData.hsCode==null){ - this.$alert('请输入HSCODE！', '错误', { + this.$alert('请输入HS Code！', '错误', { confirmButtonText: '确定' }) return false @@ -911,12 +911,6 @@ }) return false } - if(this.hsCodeModelData.packageNo===''||this.hsCodeModelData.packageNo==null){ - this.$alert('请选择包装箱！', '错误', { - confirmButtonText: '确定' - }) - return false - } savePartHSCode(this.hsCodeModelData).then(({data}) => { if (data && data.code === 0) { this.searchTable()