From 6d02b4af17a79f7d23aa6e87158d0b1041c7aaa8 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 26 Jul 2024 15:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arteryDistrilbutionBillLadingList.js | 7 ++ .../artery/VehicleArrivalManagement.vue | 3 +- .../arteryDistrilbutionBillLadingList.vue | 5 ++ ...teryDistrilbutionBillLadingListDetails.vue | 2 +- .../delivery/distributionStockArticle.vue | 87 ++++++++++--------- .../distributionStockArticleDiscuss.vue | 3 +- .../distributionStockArticleMarket.vue | 84 +++++++++--------- .../delivery/distributionStockArticleSelf.vue | 3 +- 8 files changed, 105 insertions(+), 89 deletions(-) diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js index ff98602c..7b4d6c4e 100644 --- a/src/option/distribution/arteryDistrilbutionBillLadingList.js +++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js @@ -181,6 +181,7 @@ export const columnList = [ checkarr: [], fixed: false, sortable: true, + isshowSummary: true, }, { prop: 'remark', @@ -211,6 +212,7 @@ export const columnList = [ checkarr: [], fixed: false, sortable: true, + isshowSummary: true, }, { prop: 'totalNum', @@ -221,6 +223,7 @@ export const columnList = [ checkarr: [], fixed: false, sortable: true, + isshowSummary: true, }, { prop: 'planNum', @@ -231,6 +234,7 @@ export const columnList = [ checkarr: [], fixed: false, sortable: true, + isshowSummary: true, }, { prop: 'totalWeight', @@ -241,6 +245,7 @@ export const columnList = [ checkarr: [], fixed: false, sortable: true, + isshowSummary: true, }, { prop: 'planWeight', @@ -262,6 +267,7 @@ export const columnList = [ checkarr: [], fixed: false, sortable: false, + isshowSummary: true, }, { prop: 'planVolume', @@ -273,6 +279,7 @@ export const columnList = [ fixed: false, sortable: true, isshowSummary: true, + isshowSummary: true, }, { prop: 'createUserName', diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index 00d3a8c7..35843139 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -284,7 +284,8 @@ v-if=" permissionObj.VehicleArrivalManagement_edit && Mydata.id === slotProps.scope.row.nowWarehouseId && - Number(slotProps.scope.row.loadStatus) === 20 + (Number(slotProps.scope.row.loadStatus) === 20 || + Number(slotProps.scope.row.loadStatus) === 40) " @click="handleEditStowage(slotProps.scope)" >编辑 diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue index e41f1ac2..ca2cc50e 100644 --- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue @@ -677,6 +677,11 @@ export default { if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作'); + const _data = this.selectionList[0]; + + if (Number(_data.billladingStatus) !== 1) + return this.$message.warning('提货任务状态不是未开始，无法编辑'); + this.$router.push({ path: '/distribution/inventory/addArteryDistrilbutionBillLadingList', query: { diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue index 680b51b8..af40b644 100644 --- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue +++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue @@ -76,7 +76,7 @@ v-if="permissionObj.arteryDistrilbutionBillLadingListDetails_confirmEdit" icon="CircleCheckFilled" type="primary" - @click="handleEditSubmit()" + @click="() => handleEditSubmit()" > 确认修改 diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index 2bf150e0..7b984e62 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -398,7 +398,8 @@ - + + { - console.log(value,'填写的参数'); - let data={ - entityList:[] - } - console.log(this.selectionList,'this.selectionList'); - // this.selectionList.forEach(item,index=>{ - // console.log(item,'item'); - // data['entityList'].push({ - // id:item.id, - // consigneeUnit:value, - // mallName:value, - // }) - // }) - data['entityList']= this.selectionList.map(item=>{ - return{ - id:item.id, - consigneeUnit:value, - mallName:value, - } - }) - $_updateBatchClient(data).then(res=>{ - console.log(res,'修改成功'); - if(res.data.code ==200){ - ElMessage({ - message: res.data.msg, - type: 'success', - }) - this.onLoad(this.page); - } + ElMessageBox.prompt('请输入要修改的收货单位', '修改收货单位', { + confirmButtonText: '确定', + cancelButtonText: '取消', + inputPattern: /^\S+$/, + inputErrorMessage: '收货单位不能为空', }) - }) - .catch(() => {}) + .then(({ value }) => { + console.log(value, '填写的参数'); + let data = { + entityList: [], + }; + console.log(this.selectionList, 'this.selectionList'); + // this.selectionList.forEach(item,index=>{ + // console.log(item,'item'); + // data['entityList'].push({ + // id:item.id, + // consigneeUnit:value, + // mallName:value, + // }) + // }) + data['entityList'] = this.selectionList.map(item => { + return { + id: item.id, + consigneeUnit: value, + mallName: value, + }; + }); + $_updateBatchClient(data).then(res => { + console.log(res, '修改成功'); + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + this.onLoad(this.page); + } + }); + }) + .catch(() => {}); }, //确定通知提货按钮 callFordelivery(inde) { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index d0b92723..e1b39e51 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -400,7 +400,8 @@ - + + - + { - console.log(value,'填写的参数'); - let data={ - entityList:[] - } - console.log(this.selectionList,'this.selectionList'); - // this.selectionList.forEach(item,index=>{ - // console.log(item,'item'); - // data['entityList'].push({ - // id:item.id, - // consigneeUnit:value, - // mallName:value, - // }) - // }) - data['entityList']= this.selectionList.map(item=>{ - return{ - id:item.id, - consigneeUnit:value, - mallName:value, - } - }) - $_updateBatchClient(data).then(res=>{ - console.log(res,'修改成功'); - if(res.data.code ==200){ - ElMessage({ - message: res.data.msg, - type: 'success', - }) - this.onLoad(this.page); - } + ElMessageBox.prompt('请输入要修改的收货单位', '修改收货单位', { + confirmButtonText: '确定', + cancelButtonText: '取消', + inputPattern: /^\S+$/, + inputErrorMessage: '收货单位不能为空', }) - }) - .catch(() => {}) + .then(({ value }) => { + console.log(value, '填写的参数'); + let data = { + entityList: [], + }; + console.log(this.selectionList, 'this.selectionList'); + // this.selectionList.forEach(item,index=>{ + // console.log(item,'item'); + // data['entityList'].push({ + // id:item.id, + // consigneeUnit:value, + // mallName:value, + // }) + // }) + data['entityList'] = this.selectionList.map(item => { + return { + id: item.id, + consigneeUnit: value, + mallName: value, + }; + }); + $_updateBatchClient(data).then(res => { + console.log(res, '修改成功'); + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + this.onLoad(this.page); + } + }); + }) + .catch(() => {}); }, handleMoke() { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index 514729ec..c9d52c2e 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -529,7 +529,8 @@ --> - + +