From fa4db3facecfcca2b0e61f8ed1334abbcaa97586 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 8 Aug 2024 18:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E6=8B=89=E4=B8=8D=E5=88=B7=E6=96=B0=E5=92=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E4=B8=8D=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryMove/job/holdToOkMoveJob.vue     | 20 +++++++++++++++----
 .../inventoryMove/job/holdToScrapMoveJob.vue  | 19 ++++++++++++++----
 .../inventoryMove/job/nokToHoldMoveJob.vue    | 15 ++++++++++++--
 .../inventoryMove/job/okToHoldMoveJob.vue     | 15 ++++++++++++--
 .../inventoryMove/job/okToScrapMoveJob.vue    | 15 ++++++++++++--
 .../inventoryMove/job/scrapToHoldMoveJob.vue  | 17 +++++++++++++---
 6 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/src/pages/inventoryMove/job/holdToOkMoveJob.vue b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
index 03b6c82d..1393b3ea 100644
--- a/src/pages/inventoryMove/job/holdToOkMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
@@ -16,15 +16,27 @@
 				title:''
 			}
 		},
-		onReachBottom() {
-			this.$refs.comMoveJob.onReach();
-		},
+		
 		
 		onLoad(option){
 			this.title = option.title
 		},
+		onShow() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
 		onPullDownRefresh() {
-			this.$refs.comMoveJob.refresh();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
+		onReachBottom() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.onReach();
+			}
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
diff --git a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
index 3955adef..47037a99 100644
--- a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
@@ -16,14 +16,25 @@
 				title:''
 			}
 		},
-		onReachBottom() {
-			this.$refs.comMoveJob.onReach();
-		},
 		onLoad(option){
 			this.title = option.title
 		},
+		onShow() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
 		onPullDownRefresh() {
-			this.$refs.comMoveJob.refresh();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
+		onReachBottom() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.onReach();
+			}
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
diff --git a/src/pages/inventoryMove/job/nokToHoldMoveJob.vue b/src/pages/inventoryMove/job/nokToHoldMoveJob.vue
index 9c653725..2a9876c3 100644
--- a/src/pages/inventoryMove/job/nokToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/nokToHoldMoveJob.vue
@@ -18,11 +18,22 @@
 		onLoad(option){
 			this.title = option.title
 		},
+		onShow() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
 		onPullDownRefresh() {
-			this.$refs.comMoveJob.refresh();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
 		},
+		
 		onReachBottom() {
-			this.$refs.comMoveJob.onReach();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.onReach();
+			}
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
diff --git a/src/pages/inventoryMove/job/okToHoldMoveJob.vue b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
index 5b330d85..bded74f7 100644
--- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
@@ -18,11 +18,22 @@
 		onLoad(option){
 			this.title = option.title
 		},
+		onShow() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
 		onPullDownRefresh() {
-			this.$refs.comMoveJob.refresh();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
 		},
+		
 		onReachBottom() {
-			this.$refs.comMoveJob.onReach();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.onReach();
+			}
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
diff --git a/src/pages/inventoryMove/job/okToScrapMoveJob.vue b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
index f413c740..aea20f26 100644
--- a/src/pages/inventoryMove/job/okToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
@@ -19,11 +19,22 @@
 		onLoad(option){
 			this.title = option.title
 		},
+		onShow() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
 		onPullDownRefresh() {
-			this.$refs.comMoveJob.refresh();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
 		},
+		
 		onReachBottom() {
-			this.$refs.comMoveJob.onReach();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.onReach();
+			}
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
diff --git a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
index 987af962..65fbfd97 100644
--- a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
@@ -19,11 +19,22 @@
 		onLoad(option){
 			this.title = option.title
 		},
-		onReachBottom() {
-			this.$refs.comMoveJob.onReach();
+		onShow() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
 		},
+		
 		onPullDownRefresh() {
-			this.$refs.comMoveJob.refresh();
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.refresh();
+			}
+		},
+		
+		onReachBottom() {
+			if(this.$refs.comMoveJob){
+				this.$refs.comMoveJob.onReach();
+			}
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {