机具库存查询-优化

src/pages/back/index.vue

@@ -307,7 +307,7 @@ const getTableList = async (isTap = false) => {
 // 滚动触底事件
 const onScrollTolower = debounce(() => {
   if (total.value > tableList.value.length) {
-    queryParams.value.pageNum++
+    queryParams.value.pageSize += 5
     getTableList()
   }
 })

src/pages/expectations/detail.vue

@@ -129,7 +129,7 @@
 
 	const onScrollTolower = debounce(() => {
 		if (total.value > tableList.value.length) {
-			queryParams.value.pageNum++
+			queryParams.value.pageSize += 5
 			getTableList()
 		}
 	}, 500)

src/pages/expectations/index.vue

@@ -159,7 +159,7 @@
 
 	const onScrollTolower = debounce(() => {
 		if (total.value > tableList.value.length) {
-			queryParams.value.pageNum++
+			queryParams.value.pageSize += 5
 			getTableList()
 		}
 	}, 500)

src/pages/new-purchase/accept/index.vue

@@ -175,7 +175,7 @@ const onScrollTolower = debounce(() => {
     console.log('触底事件')
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/new-purchase/bind/index.vue

@@ -145,7 +145,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList()
     }
 }, 500)

src/pages/new-purchase/entry/index.vue

@@ -295,7 +295,7 @@ const onScrollTolower = debounce(() => {
     console.log("下一页")
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/part/entry/index.vue

@@ -227,7 +227,7 @@ const onScrollTolower = debounce(() => {
     console.log('下一页')
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/part/part-lease/applyList.vue

@@ -133,7 +133,7 @@ const onScrollTolower = debounce(() => {
     console.log('触底事件')
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/part/parts-accept/index.vue

@@ -137,7 +137,7 @@ const onScrollTolower = debounce(() => {
     console.log('触底事件')
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/picking/outbound/code-outbound.vue

@@ -226,7 +226,7 @@ const onCodeSearch = () => {
 const onScrollTolower = debounce(() => {
     // console.log('滚动触底--')
     if (total.value > codeDeviceList.value.length) {
-        queryCodeParams.value.pageNum++
+        queryCodeParams.value.pageSize += 5
         getCodeDeviceListData()
     }
 }, 500)

src/pages/picking/outbound/index.vue

@@ -212,7 +212,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList()
     }
 }, 500)

src/pages/picking/outbound/inner-detail.vue

@@ -159,7 +159,7 @@ const onCodeSearch = () => {
 const onScrollTolower = debounce(() => {
     // console.log('滚动触底--')
     if (total.value > codeDeviceList.value.length) {
-        queryCodeParams.value.pageNum++
+        queryCodeParams.value.pageSize += 5
         getCodeDeviceListData()
     }
 }, 500)

src/pages/picking/outbound/sign.vue

@@ -204,7 +204,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList()
     }
 }, 500)

src/pages/picking/review/details.vue

@@ -379,7 +379,7 @@ const handleReview = (action) => {
 const onScrollTolower = debounce(() => {
     // console.log('滚动触底--')
     if (total.value > codeDeviceList.value.length) {
-        queryCodeParams.value.pageNum++
+        queryCodeParams.value.pageSize += 5
         getCodeDeviceListData()
     }
 }, 500)

src/pages/picking/review/index.vue

@@ -264,7 +264,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList()
     }
 }, 500)

src/pages/repair/equipAssessment/index.vue

@@ -223,7 +223,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList()
     }
 }, 500)

src/pages/repair/fieldMaintenance/detail.vue

@@ -212,7 +212,7 @@
 
 	const onScrollTolower = debounce(() => {
 		if (total.value > tableList.value.length) {
-			queryParams.value.pageNum++
+			queryParams.value.pageSize += 5
 			getTableList()
 		}
 	}, 500)

src/pages/repair/fieldMaintenance/index.vue

@@ -225,7 +225,7 @@
 
 	const onScrollTolower = debounce(() => {
 		if (total.value > tableList.value.length) {
-			queryParams.value.pageNum++
+			queryParams.value.pageSize += 5
 			getTableList()
 		}
 	}, 500)

src/pages/repair/scrapExamine/index.vue

@@ -217,7 +217,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList()
     }
 }, 500)

src/pages/repair/testedInBound/index.vue

@@ -245,7 +245,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList()
     }
 }, 500)

src/pages/standardBox/acceptBox.vue

@@ -257,7 +257,7 @@ const getTableList = async (isTap = false) => {
 const onScrollTolower = debounce(() => {
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/standardBox/boxList.vue

@@ -260,7 +260,7 @@ const getTableList = async (isTap = false) => {
 const onScrollTolower = debounce(() => {
   // 判断是否还有更多数据
   if (tableList.value.length < total.value) {
-    queryParams.value.pageNum++
+    queryParams.value.pageSize += 5
     getTableList(false)
   }
 }, 500)

src/pages/standardBox/index.vue

@@ -225,7 +225,7 @@ const getTableList = async (isTap = false) => {
 const onScrollTolower = debounce(() => {
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/standardBox/transferBox.vue

@@ -237,7 +237,7 @@ const getTableList = async (isTap = false) => {
 const onScrollTolower = debounce(() => {
     // 判断是否还有更多数据
     if (tableList.value.length < total.value) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 5
         getTableList(false)
     }
 }, 500)

src/pages/stquery/deviceStatusRecord/index.vue

@@ -2,16 +2,16 @@
     <!-- 退料任务 -->
     <view class="accept page-common"> 
         <uni-row :gutter="24" class="search-form"> 
-            <uni-col :span="16">
+            <uni-col :span="18">
                 <view>
-                    <uni-easyinput placeholder="请输入内容"/>
+                    <uni-easyinput v-model="queryParams.keyWord" placeholder="请输入内容"/>
                 </view>
             </uni-col>
-            <uni-col :span="4">
+            <uni-col :span="6">
-                <view class="search" @click="">查询</view>
+                <view class="search" @click="getTableList">查询</view>
             </uni-col>
         </uni-row>
-		<uni-row :gutter="24" class="search-form">
+		<!-- <uni-row :gutter="24" class="search-form">
 			<uni-col :span="5">
 			    <view style="font-size: 24rpx;">物资类型：</view> 
 			</uni-col>
@@ -44,7 +44,7 @@
                     </view> 
 				</scroll-view> 
 			</uni-col>
-		</uni-row>
+		</uni-row> -->
 		<view style="width:100%;">
 			<uni-table border stripe emptyText="">
 					<uni-tr>
@@ -185,26 +185,27 @@ const queryParams = ref({
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageNum++
+        queryParams.value.pageSize += 10
         getTableList()
     }
 }, 500)
 // 获取列表数据
 const getTableList = async (isTap = false) => {
-    // console.log('queryParams.value查询参数', queryParams.value)
+  const res = await getRetainedEquipmentListApi(queryParams.value);
-    const res = await getRetainedEquipmentListApi(queryParams.value)
+  const newRows = res?.data?.rows || [];
-	console.log(res)
+  total.value = res?.data?.total || 0;
-    total.value = res.data.total
+
-    if (isTap) {
+  if (isTap || queryParams.pageNum === 1) {
-        tableList.value = res.data.rows
+    // 刷新或tab切换，直接替换
+    tableList.value = newRows;
   } else {
-        if (res.data.rows.length == 0) {
+    // 加载更多，按 typeId 去重后合并
-            tableList.value = []
+    const existingIds = new Set(tableList.value.map(item => item.typeId));
-        } else {
+    const filteredRows = newRows.filter(item => !existingIds.has(item.typeId));
-            tableList.value.push(...res.data.rows)
+    tableList.value.push(...filteredRows);
-        }
-    }
   }
+};
+
 const getRetainedEquipmentList = async () => {
 	const res = await getRetainedEquipmentListApi({isApp:1})
 	console.log(res)
@@ -264,10 +265,10 @@ onLoad(() => {
 		
         // 搜索按钮
         .search {
-            height: 80rpx;
+            height: 60rpx;
             background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
             text-align: center;
-            line-height: 80rpx;
+            line-height: 60rpx;
             color: #fff;
             border-radius: 12rpx;
             font-size: 28rpx;

src/services/stquery/stquery.js

@@ -4,7 +4,7 @@ import { http } from '@/utils/http'
 export const getRetainedEquipmentListApi = (data) => {
     return http({
       method: 'GET',
-      url: '/material/complex_query/getRetainedEquipmentList',
+      url: '/material/complex_query/getPersonNum',
       data,
     })
 }