From 483f1320253b8fc79470034748dfd5920fa5c5aa Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 16 May 2024 09:26:54 +0800
Subject: [PATCH] =?UTF-8?q?PDA=20=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=88=91=E5=8F=AA=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA=EF=BC=8C=E5=8F=A6=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=B2=A1=E6=89=AB=E6=8F=8F=EF=BC=8C=E6=8F=90=E4=BA=A4=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E4=B8=8D=E6=8F=90=E7=A4=BA=E8=BF=98=E6=9C=89?=
 =?UTF-8?q?=E6=9C=AA=E6=89=AB=E6=8F=8F=E7=9A=84=E8=B4=A7=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.hella16                                    | 2 +-
 src/pages/purchaseReceipt/job/receiptDetail.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env.hella16 b/.env.hella16
index 0f02f522..aab54cc5 100644
--- a/.env.hella16
+++ b/.env.hella16
@@ -2,4 +2,4 @@ VITE_BASE_URL=http://172.21.32.16:81/api/admin-api
 VITE_BASE_URL_IMAGE=http://172.21.32.16:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春","value":1}]'
\ No newline at end of file
+VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 375ee95d..996e189d 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -391,8 +391,12 @@
 				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
-						//提交
-						this.submitJob();
+						//提交
+						this.$refs.comMessage.showQuestionMessage('还有未扫描的物料，是否继续提交?', res => {
+							if (res) {
+								this.submitJob();
+							}
+						});
 					} else {
 						//不允许部分提交，提示
 						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +