From 686d24393e2fafadb34716fb9d91de16b07ba785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Tue, 29 Oct 2024 09:11:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8B=89=E5=8A=A0=E8=BD=BD=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=202024/8/8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/coms/comMoveJob.vue        | 8 +++++++-
 src/pages/inventoryMove/job/holdToOkMoveJob.vue    | 2 +-
 src/pages/inventoryMove/job/holdToScrapMoveJob.vue | 2 +-
 src/pages/inventoryMove/job/moveJob.vue            | 2 +-
 src/pages/inventoryMove/job/nokToHoldMoveJob.vue   | 7 ++++++-
 src/pages/inventoryMove/job/okToHoldMoveJob.vue    | 2 +-
 src/pages/inventoryMove/job/okToScrapMoveJob.vue   | 2 +-
 src/pages/inventoryMove/job/scrapToHoldMoveJob.vue | 2 +-
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index 149a6ffc..ab73e708 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -66,7 +66,13 @@ onMounted(() => {
     // refresh()
   })
 })
-
+const onReach = ()=> {
+  //避免多次触发
+  if (loadingType.value == 'loading' || loadingType.value == 'nomore') {
+    return;
+  }
+  getList("more");
+}
 const updateTitle = () => {
   let title = ''
   const name = props.title
diff --git a/src/pages/inventoryMove/job/holdToOkMoveJob.vue b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
index f2d07d06..80bf9d71 100644
--- a/src/pages/inventoryMove/job/holdToOkMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh ,onLoad} from '@dcloudio/uni-app'
 import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 
 const receiptjob = ref()
diff --git a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
index a7b4beb6..f48cfc79 100644
--- a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh ,onLoad} from '@dcloudio/uni-app'
 import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 
 const receiptjob = ref()
diff --git a/src/pages/inventoryMove/job/moveJob.vue b/src/pages/inventoryMove/job/moveJob.vue
index 9b7530ac..1ea558b4 100644
--- a/src/pages/inventoryMove/job/moveJob.vue
+++ b/src/pages/inventoryMove/job/moveJob.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh ,onLoad} from '@dcloudio/uni-app'
 import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 import { goHome, getCurrDate } from '@/common/basic.js'
 
diff --git a/src/pages/inventoryMove/job/nokToHoldMoveJob.vue b/src/pages/inventoryMove/job/nokToHoldMoveJob.vue
index 25580992..fe5205dc 100644
--- a/src/pages/inventoryMove/job/nokToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/nokToHoldMoveJob.vue
@@ -5,7 +5,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onLoad, onPullDownRefresh, onNavigationBarButtonTap } from 'vue'
+import { ref } from 'vue'
+import {onLoad, onPullDownRefresh, onNavigationBarButtonTap,onReachBottom} from '@dcloudio/uni-app'
 import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 
 const title = ref('')
@@ -14,6 +15,10 @@ onLoad((option) => {
   title.value = option.title
 })
 
+onReachBottom (()=>{
+  comMoveJobRef.value.onReach();
+})
+
 onPullDownRefresh(() => {
   comMoveJobRef.value.refresh()
 })
diff --git a/src/pages/inventoryMove/job/okToHoldMoveJob.vue b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
index 2c535cf3..80529a17 100644
--- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh ,onLoad} from '@dcloudio/uni-app'
 import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 
 const receiptjob = ref()
diff --git a/src/pages/inventoryMove/job/okToScrapMoveJob.vue b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
index fb0f95ce..a7bc491a 100644
--- a/src/pages/inventoryMove/job/okToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh ,onLoad} from '@dcloudio/uni-app'
 import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 
 const receiptjob = ref()
diff --git a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
index 559c968e..8316314c 100644
--- a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh ,onLoad} from '@dcloudio/uni-app'
 import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 
 const receiptjob = ref()