From 87440a1b8c1fddd4fe07a6cecf9518d147247f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Mon, 28 Oct 2024 15:50:41 +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=202024/8/7?=
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, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/show-modal/show-modal.vue b/src/components/show-modal/show-modal.vue
index 510d2ebe..1864dd97 100644
--- a/src/components/show-modal/show-modal.vue
+++ b/src/components/show-modal/show-modal.vue
@@ -78,7 +78,9 @@ export default {
 
     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 99326381..7a0213dc 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -57,6 +57,7 @@ const isDisabled = ref(true) // 为 true 时，表示用户可以点击，反之
 const seconds = ref(0)
 const success = ref(() => {})
 const version = ref('')
+const modal = ref(null)
 // onMounted(() => {
 //   const systemInfo = uni.getSystemInfoSync()
 //   // #ifdef H5
@@ -95,6 +96,9 @@ const confirmClose = () => {
   if (show.value) {
     show.value = false
     clearInterval(timer.value) // 清空timer
+    if(modal.value){
+      modal.value.popupClose()
+    }
     success.value({
       // cancel: false,
       confirm: true
diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
index e31feda5..3d44fd7e 100644
--- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -296,6 +296,8 @@
     if(valiDate){
       if (!this.checkLocation()) {
         return
+      }else{
+        this.toLocationCode = this.jobToLocationCode
       }
     }