From 91242bfd610cacbe31f9fe586727430813cb383c Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Wed, 16 Apr 2025 14:05:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=B8=8A=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryMove/job/inventoryMoveDetail.vue | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 21eff8f9..8ebdd3e5 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -593,36 +593,31 @@
 					this.$refs.comMessage.showConfirmWarningModal(str1)
 					return
 				}
-				console.log(3444,this.businessTypeCode)
 				if (str) {
 					str = '任务明细未全部完成,是否提交?\n' + str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
-							// 2025-04-16号修改物料隔离去掉明细弹窗
-							// // 物料隔离
-							// if(this.businessTypeCode == "OkToHold"){
-							// 	this.$refs.deptPopup.deptShow = true
-							// 	this.$refs.deptPopup.chooseDutyItem={}
-							// 	this.$refs.deptPopup.chooseDeptItem={}
-							// 	this.$refs.deptPopup.chooseDetailItem={}
-							// }else{
-							// 	this.submitJob()
-							// }
-							this.submitJob()
+							// 物料隔离
+							if(this.businessTypeCode == "OkToHold"){
+								this.$refs.deptPopup.deptShow = true
+								this.$refs.deptPopup.chooseDutyItem={}
+								this.$refs.deptPopup.chooseDeptItem={}
+								this.$refs.deptPopup.chooseDetailItem={}
+							}else{
+								this.submitJob()
+							}
 						}
 					});
 				} else {
-					// 2025-04-16号修改物料隔离去掉明细弹窗
-					//// 物料隔离
-					// if(this.businessTypeCode == "OkToHold"){
-					// 	this.$refs.deptPopup.deptShow = true
-					// 	this.$refs.deptPopup.chooseDutyItem={}
-					// 	this.$refs.deptPopup.chooseDeptItem={}
-					// 	this.$refs.deptPopup.chooseDetailItem={}
-					// }else{
-					// 	this.submitJob()
-					// }
-					this.submitJob()
+					// 物料隔离
+					if(this.businessTypeCode == "OkToHold"){
+						this.$refs.deptPopup.deptShow = true
+						this.$refs.deptPopup.chooseDutyItem={}
+						this.$refs.deptPopup.chooseDeptItem={}
+						this.$refs.deptPopup.chooseDetailItem={}
+					}else{
+						this.submitJob()
+					}
 				}
 			},
 			submitJob() {