修改

pages/workbranch/warehouse/scanInOut/In/materialsDetail.vue

@@ -79,6 +79,7 @@ export default defineComponent({
     const detailId = ref('')
     const queryParams = ref({ pageSize: 10, pageNo: 1, id: '' })
     const cardList = ref([])
+	const hasMore = ref(true)
 
     onBeforeMount(() => {
       detailId.value = JSON.parse(parentRow)?.id
@@ -91,7 +92,12 @@ export default defineComponent({
     const search = () => {
       uni.$reqGet('getScannedInSendResourcePage', { ...queryParams.value, id: detailId.value }).then(
         ({ data }) => {
-          cardList.value = data?.inRequestSubdetailList ?? []
+          const list = data?.inRequestSubdetailList ?? []
+		  console.log('返回数据:', list)  // ← 添加调试，看数据是否存在
+		  console.log('数据长度:', list.length)
+          cardList.value = list
+          // 如果首次加载不足10条，标记为没有更多数据
+          hasMore.value = list.length >= queryParams.value.pageSize
         }
       )
     }
@@ -152,10 +158,15 @@ export default defineComponent({
 
     /* 下拉加载更多 */
     onReachBottom(() => {
+	  // 如果没有更多数据，直接返回不调用接口
+	  if (!hasMore.value) return
       queryParams.value.pageNo += 1
       uni.$reqGet('getScannedInSendResourcePage', { ...queryParams.value, id: detailId.value }).then(
         ({ data }) => {
-          cardList.value.push(...(data?.inRequestSubdetailList ?? []))
+          const list = data?.inRequestSubdetailList ?? []
+          cardList.value.push(...list)
+          // 如果本次返回数据不足10条，标记为没有更多数据
+          hasMore.value = list.length >= queryParams.value.pageSize
         }
       )
     })

pages/workbranch/warehouse/scanInOut/Out/materialsDetail.vue

@@ -79,6 +79,7 @@ export default defineComponent({
     const detailId = ref('')
     const queryParams = ref({ pageSize: 10, pageNo: 1, id: '' })
     const cardList = ref([])
+	const hasMore = ref(true)
 
     onBeforeMount(() => {
       detailId.value = JSON.parse(parentRow)?.id
@@ -91,7 +92,12 @@ export default defineComponent({
     const search = () => {
       uni.$reqGet('getScannedOutSendResourcePage', { ...queryParams.value, id: detailId.value }).then(
         ({ data }) => {
-          cardList.value = data?.inoutRequestSubdetailList ?? []
+          const list = data?.inoutRequestSubdetailList ?? []
+		  cardList.value = list
+		  console.log('返回数据:', list)  // ← 添加调试，看数据是否存在
+		  console.log('数据长度:', list.length)
+		  // 如果首次加载不足10条，标记为没有更多数据
+		  hasMore.value = list.length >= queryParams.value.pageSize
         }
       )
     }
@@ -152,10 +158,17 @@ export default defineComponent({
 
     /* 下拉加载更多 */
     onReachBottom(() => {
+      // 如果没有更多数据，直接返回不调用接口
+      if (!hasMore.value) return
+      
       queryParams.value.pageNo += 1
+      
       uni.$reqGet('getScannedOutSendResourcePage', { ...queryParams.value, id: detailId.value }).then(
         ({ data }) => {
-          cardList.value.push(...(data?.inoutRequestSubdetailList ?? []))
+          const list = data?.inoutRequestSubdetailList ?? []
+          cardList.value.push(...list)
+          // 如果本次返回数据不足10条，标记为没有更多数据
+          hasMore.value = list.length >= queryParams.value.pageSize
         }
       )
     })

pages/workbranch/warehouse/scanInOut/Out/scannedMaterials.vue

@@ -216,6 +216,7 @@ export default defineComponent({
     const scanMaterialList = ref([])
     const receiveList = ref([])
     const currentWarehouseId = ref('')
+    const currentWarehouseName = ref('')
     // 当前处理的数据行
     const fdIndex = ref(-1)
     // 当前扫描的物料
@@ -288,6 +289,7 @@ export default defineComponent({
             receiveList.value = data
             scanTie.value = data?.scanTie
             currentWarehouseId.value = data?.warehouseId
+            currentWarehouseName.value = data?.warehouseName
             tableData.value = data?.inoutRequestDetailPDARespVOList || []
             console.log('获取到的scanTie:', scanTie.value)
             // 1. 先清空本地已扫列表，准备重新填充
@@ -814,7 +816,7 @@ export default defineComponent({
         // #ifdef APP-PLUS
         plus.device.beep(2);
         // #endif
-        errorTipMessage.value = `物料仓库(${cur.warehouseId})与当前仓库(${currentWarehouseId.value})不一致`;
+        errorTipMessage.value = `物料仓库(${cur.erpStockName})与当前仓库(${currentWarehouseName.value})不一致`;
         errorTip.value.open();
         errorState.value = 0;
         return false;