From 9eb0daadd93ca808c464b7ae015da9aadf2de93a Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 30 Aug 2023 17:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E9=99=90=E5=88=B6=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/delivery/distributionStockArticle.vue | 10 +++++----- .../delivery/distributionStockArticleDiscuss.vue | 7 ++++++- .../delivery/distributionStockArticleMarket.vue | 9 +++++++-- .../delivery/distributionStockArticleSelf.vue | 9 +++++++-- .../inventory/distributionStockArticleDetails.vue | 10 ++++++++++ 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index 7371f51c..70963514 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -1052,7 +1052,7 @@ export default { let st = false; this.selectionList.forEach( i =>{ console.log("yuyuyuuyu",i); - if(i.reservationStatusName === "已预约"){ + if(i.reservationStatus === "30"){ st = true; this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！"); } @@ -1096,7 +1096,7 @@ export default { let lost = false; for (const i of this.selectionList) { console.log("yuyuyuuyu",i); - if(i.reservationStatusName == "已预约"){ + if(i.reservationStatus == "30"){ st = true; this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！"); } @@ -1249,12 +1249,12 @@ export default { //通知提货 handleCallDelivery(ind){ if (this.selectionList.length === 0) { - this.$message.warning("请选择至少一条数据"); + this.$message.warning("请选择至少一条数据!!!"); return; } - let a = this.selectionList.find( i => i.reservationStatusName == '已预约'); + let a = this.selectionList.find( i => i.reservationStatus == '30'); if(!!a){ - this.$message.warning("有已预约的数据，不能修改服务类型"); + this.$message.warning("有已预约的数据，不能修改！！！"); return ; } switch (ind) { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index ba5e46db..f89357cd 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -1033,7 +1033,7 @@ export default { } let st = false; this.selectionList.some( i =>{ - if(i.stateName === "已预约"){ + if(i.reservationStatus === "30"){ st = true; this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！"); } @@ -1194,6 +1194,11 @@ export default { this.$message.warning("请选择至少一条数据"); return; } + let a = this.selectionList.find( i => i.reservationStatus == '30'); + if(!!a){ + this.$message.warning("有已预约的数据，不能修改！！！"); + return ; + } switch (ind) { case '1': let ids = []; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue index 0ef8f1a4..eeb19f2c 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue @@ -1017,7 +1017,7 @@ export default { } let st = false; this.selectionList.some( i =>{ - if(i.reservationStatusName === "已预约"){ + if(i.reservationStatus === "30"){ st = true; this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！"); } @@ -1061,7 +1061,7 @@ export default { let st = false; let lost = false; for (const i of this.selectionList) { - if(i.reservationStatusName == "已预约"){ + if(i.reservationStatus == "30"){ st = true; this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！"); } @@ -1215,6 +1215,11 @@ export default { this.$message.warning("请选择至少一条数据"); return; } + let a = this.selectionList.find( i => i.reservationStatus == '30'); + if(!!a){ + this.$message.warning("有已预约的数据，不能修改！！！"); + return ; + } switch (ind) { case '1': let ids = []; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index 5b2dfd03..7e37cdd9 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -1266,7 +1266,7 @@ export default { let st = false; let lost = false; for (const i of this.selectionList) { - if(i.reservationStatusName == "已预约"){ + if(i.reservationStatus == "30"){ st = true; this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！"); return; @@ -1399,7 +1399,7 @@ export default { let consigneePerson = ''; let consigneeMobile = ''; this.selectionList.some( i =>{ - if(i.reservationStatusName === "已预约"){ + if(i.reservationStatus === "30"){ st = true; this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！"); } @@ -1432,6 +1432,11 @@ export default { this.$message.warning("请选择至少一条数据"); return; } + let a = this.selectionList.find( i => i.reservationStatus == '30'); + if(!!a){ + this.$message.warning("有已预约的数据，不能修改！！！"); + return ; + } switch (ind) { case '1': let ids = []; diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index 1b4527db..10711dd3 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -621,6 +621,16 @@ export default { fixed: false, sortable: true, }, + { + prop: 'sendWarehouseName', + label: '发站仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: '', label: '操作',