From cc1840e9135e8ebc8ce3a439b6589fdfb4a4ba77 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 9 Aug 2024 15:05:57 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E9=83=A8=E5=88=86=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=E4=B8=8E?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
=?UTF-8?q?=E7=9A=84=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/common/comMessage.vue | 19 ++++--
src/pages/customerReturn/job/returnDetail.vue | 54 +++++++++++------
.../inventoryMove/job/inventoryMoveDetail.vue | 58 ++++++++++++-------
.../package/job/overPackageJobDetail.vue | 6 +-
.../productReceipt/job/scrapReceiptDetail.vue | 48 ++++++++++-----
.../job/productRecycleJobDetail.vue | 57 ++++++++++++------
src/pages/purchaseReturn/job/returnDetail.vue | 55 ++++++++++++------
src/pages/scrap/job/scrapJobDetail.vue | 55 ++++++++++++------
src/pages/unPlanned/job/issueJobDetail.vue | 55 ++++++++++++------
9 files changed, 273 insertions(+), 134 deletions(-)
diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
index bc82cdc0..603977b7 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -13,7 +13,7 @@
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this.subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
- }
+ // 提交的数量和任务数量不一致提示
+ let str = ''
+ this.detailSource.forEach((item) => {
+ item.subList.forEach(cur => {
+ if (cur.qty != cur.handleQty) {
+ str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+ }
+ })
+ })
+ if (str) {
+ str += ',是否确认提交?'
+ this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+ if (res) {
+ this.submitJob()
+ }
+ });
+ } else {
+ this.submitJob()
}
+ // //扫描数量和任务数量相等,直接提交
+ // if (this.scanCount == this.subList.length) {
+ // this.submitJob();
+ // } else if (this.scanCount < this.subList.length) {
+ // //扫描数量小于任务数量,判断是否允许部分提交
+ // if (this.jobContent.allowPartialComplete == "TRUE") {
+ // //提交
+ // this.submitJob();
+ // } else {
+ // //不允许部分提交,提示
+ // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ // "]箱总共[" + this.subList.length + "]箱", res => {
+ // if (res) {
+ // this.openScanPopup();
+ // }
+ // });
+ // }
+ // }
},
submitJob() {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 7419a85e..1ca2b273 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -354,27 +354,45 @@
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
-
- //允许部分提交
- //扫描数量和任务数量相等,直接提交
- if (this.scanCount == this.subList.length) {
- this.submitJob();
- } else if (this.scanCount < this.subList.length) {
- //扫描数量小于任务数量,判断是否允许部分提交
- if (this.jobContent.allowPartialComplete == "TRUE") {
- //提交
- this.submitJob();
- } else {
- //不允许部分提交,提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this
- .subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
- }
+ // 提交的数量和任务数量不一致提示
+ let str = ''
+ this.detailSource.forEach((item) => {
+ item.subList.forEach(cur => {
+ if (cur.qty != cur.handleQty) {
+ str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+ }
+ })
+ })
+ if (str) {
+ str += ',是否确认提交?'
+ this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+ if (res) {
+ this.submitJob()
+ }
+ });
+ } else {
+ this.submitJob()
}
+ // //允许部分提交
+ // //扫描数量和任务数量相等,直接提交
+ // if (this.scanCount == this.subList.length) {
+ // this.submitJob();
+ // } else if (this.scanCount < this.subList.length) {
+ // //扫描数量小于任务数量,判断是否允许部分提交
+ // if (this.jobContent.allowPartialComplete == "TRUE") {
+ // //提交
+ // this.submitJob();
+ // } else {
+ // //不允许部分提交,提示
+ // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ // "]箱总共[" + this
+ // .subList.length + "]箱", res => {
+ // if (res) {
+ // this.openScanPopup();
+ // }
+ // });
+ // }
+ // }
},
submitJob() {
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 433b0635..c243f0e1 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -35,16 +35,16 @@