From 51dfc46bd43f54c848969da3123c2dc35e0bb510 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 7 Aug 2024 21:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=8F=90=E4=BA=A4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/show-modal/show-modal.vue                | 4 +++-
 src/mycomponents/common/comMessage.vue                  | 4 +++-
 src/pages/productReceipt/job/ccProductReceiptDetail.vue | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/show-modal/show-modal.vue b/src/components/show-modal/show-modal.vue
index b9dd4784..38d55460 100644
--- a/src/components/show-modal/show-modal.vue
+++ b/src/components/show-modal/show-modal.vue
@@ -82,7 +82,9 @@
 
 			cancelClose() {
 				clearInterval(this.timer) //清空timer
-				this.$refs.modal.popupClose();
+				if(this.$refs.modal){
+					this.$refs.modal.popupClose();
+				}
 				this.success({
 					// cancel: true,
 					confirm: false,
diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
index e9beb857..bc82cdc0 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -109,7 +109,9 @@
 				if (this.show) {
 					this.show = false;
 					clearInterval(this.timer) //清空timer
-					this.$refs.modal.popupClose();
+					if(this.$refs.modal){
+						this.$refs.modal.popupClose();
+					}
 					this.success({
 						// cancel: false,
 						confirm: true,
diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
index 08738d74..e69f7fb3 100644
--- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -346,6 +346,8 @@
 					if (!this.checkLocation()) {
 						return
 					}
+				}else{
+					this.toLocationCode = this.jobToLocationCode
 				}