Merge branch 'master' of http://192.168.30.2:3000/bonus/bonus-material-app

2025-07-23 18:26:43 +08:00 · 2025-07-23 18:26:43 +08:00 · effce51e87
parent 1b614792f5 2315b5d869
commit effce51e87
26 changed files with 125 additions and 74 deletions
--- a/src/pages/back/index.vue
+++ b/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()
  }
 })
--- a/src/pages/expectations/detail.vue
+++ b/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)
--- a/src/pages/expectations/index.vue
+++ b/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)
--- a/src/pages/new-purchase/accept/index.vue
+++ b/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)
--- a/src/pages/new-purchase/bind/index.vue
+++ b/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)
--- a/src/pages/new-purchase/entry/index.vue
+++ b/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)
--- a/src/pages/part/entry/index.vue
+++ b/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)
--- a/src/pages/part/part-lease/applyList.vue
+++ b/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)
--- a/src/pages/part/parts-accept/index.vue
+++ b/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)
--- a/src/pages/picking/outbound/code-outbound.vue
+++ b/src/pages/picking/outbound/code-outbound.vue
@ -30,7 +30,7 @@
            </view>

            <view class="table-list-item">
-                <uni-row :gutter="24" style="display: flex;align-items: center">
+                <uni-row :gutter="24" style="display: flex; align-items: center">
                    <uni-col :span="6">出库方式：</uni-col>
                    <uni-col :span="6">
                        <view class="coding-btn" @tap="onCodeIdentify">编码识别</view>
@ -78,8 +78,8 @@
            >
                <view class="table-list-item" v-for="item in codeDeviceList" :key="item.maId">
                    <uni-row :gutter="24">
-                        <uni-col :span="6">物资类型：</uni-col>
-                        <uni-col :span="14">
+                        <uni-col :span="8">物资类型：</uni-col>
+                        <uni-col :span="12">
                            <view class="cont">{{ item.materialName }}</view>
                        </uni-col>
                        <uni-col :span="4">
@ -90,7 +90,10 @@
                                        borderColor="#409eff"
                                        activeBorderColor="#409eff"
                                        :checked="item.checked"
-                                        :disabled="maxNum === isSelectNum && !item.checked"
+                                        :disabled="
+                                            (maxNum === isSelectNum && !item.checked) ||
+                                            isWithinOneMonth(item.nextCheckTime)
+                                        "
                                        style="transform: scale(0.7)"
                                    />
                                </label>
@ -98,29 +101,47 @@
                        </uni-col>
                    </uni-row>
                    <uni-row :gutter="24">
-                        <uni-col :span="6">规格型号：</uni-col>
-                        <uni-col :span="16">
+                        <uni-col :span="8">规格型号：</uni-col>
+                        <uni-col :span="14">
                            <view class="cont">{{ item.materialModel }}</view>
                        </uni-col>
                    </uni-row>
                    <uni-row :gutter="24">
-                        <uni-col :span="6">设备编码：</uni-col>
-                        <uni-col :span="16">
+                        <uni-col :span="8">设备编码：</uni-col>
+                        <uni-col :span="14">
                            <view class="cont">{{ item.maCode }}</view>
                        </uni-col>
                    </uni-row>
                    <uni-row :gutter="24">
-                        <uni-col :span="6">设备状态：</uni-col>
-                        <uni-col :span="16">
+                        <uni-col :span="8">设备状态：</uni-col>
+                        <uni-col :span="14">
                            <view class="cont">{{ item.statusName }}</view>
                        </uni-col>
                    </uni-row>
                    <uni-row :gutter="24">
-                        <uni-col :span="6">设备数量：</uni-col>
-                        <uni-col :span="16">
+                        <uni-col :span="8">设备数量：</uni-col>
+                        <uni-col :span="14">
                            <view class="cont">1</view>
                        </uni-col>
                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">本次检验时间：</uni-col>
+                        <uni-col :span="14">
+                            <view class="cont">{{ item.thisCheckTime }}</view>
+                        </uni-col>
+                    </uni-row>
+                    <uni-row :gutter="24">
+                        <uni-col :span="8">下次检验时间：</uni-col>
+                        <uni-col :span="14">
+                            <view
+                                class="cont"
+                                :style="{
+                                    color: isWithinOneMonth(item.nextCheckTime) ? 'red' : '',
+                                }"
+                                >{{ item.nextCheckTime }}</view
+                            >
+                        </uni-col>
+                    </uni-row>
                </view>

                <view class="loading-text">
@ -157,6 +178,7 @@ const maxNum = ref(0)
 const total = ref(0)
 const boxCode = ref('')
 const boxInfo = ref({})
+const checkedIds = ref([])
 // 编码设备列表查询参数
 const queryCodeParams = ref({
    pageNum: 1,
@ -186,6 +208,20 @@ onShow(() => {
    console.log(queryParams.value)
    getCodeDetailData(queryParams.value.id, queryParams.value.publishTask, queryParams.value.typeId) //获取详情
 })
+
+const isWithinOneMonth = (dateStr) => {
+    if (!dateStr) {
+        return false
+    }
+    const inputDate = new Date(dateStr)
+    const today = new Date()
+    today.setHours(0, 0, 0, 0) // 清除时分秒
+    const futureLimit = new Date(today)
+    futureLimit.setDate(today.getDate() + 30)
+
+    return inputDate >= today && inputDate <= futureLimit
+}
+
 // 获取编码列表
 const getCodeDetailData = async (id, publishTask, typeId) => {
    console.log('yyyyyyyyyy', id, publishTask, typeId)
@ -203,16 +239,27 @@ const getCodeDetailData = async (id, publishTask, typeId) => {

 // 获取编码列表
 const getCodeDeviceListData = async () => {
-    // 记录已勾选的设备ID
-    const checkedIds = codeDeviceList.value.filter(e => e.checked).map(e => e.maId)
+    const checkedIdSet = new Set(checkedIds.value)
    const res = await getCodeDeviceListAPI(queryCodeParams.value)
-    // 合并新数据，并保持已勾选项的 checked 状态
-    const newRows = res.rows.map(e => ({
-        ...e,
-        checked: checkedIds.includes(e.maId)
-    }))
-    codeDeviceList.value.push(...newRows)
-    total.value = res.total
+    const newRows = res.rows || []
+    const map = new Map()
+
+    // 先放入旧数据（可保留滚动加载场景）
+    codeDeviceList.value.forEach((item) => {
+        map.set(item.maId, item)
+    })
+
+    // 再放入新数据，设置 checked 状态
+    newRows.forEach((item) => {
+        map.set(item.maId, {
+            ...item,
+            checked: checkedIdSet.has(item.maId),
+        })
+    })
+
+    // 更新最终列表
+    codeDeviceList.value = Array.from(map.values())
+    total.value = res.total || 0
 }

 // 编码搜索按钮
@ -226,7 +273,7 @@ const onCodeSearch = () => {
 const onScrollTolower = debounce(() => {
    // console.log('滚动触底--')
    if (total.value > codeDeviceList.value.length) {
-        queryCodeParams.value.pageNum++
+        queryCodeParams.value.pageSize += 5
        getCodeDeviceListData()
    }
 }, 500)
@ -239,6 +286,11 @@ const finish = computed(() => {
 // 复选框事件
 const onChangeChecked = (item) => {
    item.checked = !item.checked
+    if (item.checked) {
+        checkedIds.value.push(item.maId)
+    } else {
+        checkedIds.value = checkedIds.value.filter((maId) => maId !== item.maId)
+    }
 }

 // 计算已选择数量
@ -430,7 +482,7 @@ const boxOutBound = async () => {
            outNum: 1,
            parentId,
            typeId,
-            publishTask
+            publishTask,
        })
    })
    console.log(paramsList)
@ -525,8 +577,6 @@ const handleScanError = (error) => {
    uni.showToast({ title: error.message, icon: 'none' })
 }

-
-
 //查看是否是该规格型号
 const getMaInfoScan = async () => {
    let param = {
@ -574,7 +624,7 @@ const confirmCodeOutBound = async () => {
        typeId,
        typeName: codeData.value.typeName,
        typeModelName: codeData.value.typeModelName,
-        publishTask
+        publishTask,
    })
    const res = await setOutboundNumAPI({ leaseOutDetailsList: paramsList })
    console.log('333333333333', res)
--- a/src/pages/picking/outbound/index.vue
+++ b/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)
--- a/src/pages/picking/outbound/inner-detail.vue
+++ b/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)
--- a/src/pages/picking/outbound/sign.vue
+++ b/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)
--- a/src/pages/picking/review/details.vue
+++ b/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)
--- a/src/pages/picking/review/index.vue
+++ b/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)
--- a/src/pages/repair/equipAssessment/index.vue
+++ b/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)
--- a/src/pages/repair/fieldMaintenance/detail.vue
+++ b/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)
--- a/src/pages/repair/fieldMaintenance/index.vue
+++ b/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)
--- a/src/pages/repair/scrapExamine/index.vue
+++ b/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)
--- a/src/pages/repair/testedInBound/index.vue
+++ b/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)
--- a/src/pages/standardBox/acceptBox.vue
+++ b/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)
--- a/src/pages/standardBox/boxList.vue
+++ b/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)
--- a/src/pages/standardBox/index.vue
+++ b/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)
--- a/src/pages/standardBox/transferBox.vue
+++ b/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)
--- a/src/pages/stquery/deviceStatusRecord/index.vue
+++ b/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">
-                <view class="search" @click="">查询</view>
+            <uni-col :span="6">
+                <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)
-	console.log(res)
-    total.value = res.data.total
-    if (isTap) {
-        tableList.value = res.data.rows
-    } else {
-        if (res.data.rows.length == 0) {
-            tableList.value = []
-        } else {
-            tableList.value.push(...res.data.rows)
-        }
-    }
-}
+  const res = await getRetainedEquipmentListApi(queryParams.value);
+  const newRows = res?.data?.rows || [];
+  total.value = res?.data?.total || 0;
+
+  if (isTap || queryParams.pageNum === 1) {
+    // 刷新或tab切换，直接替换
+    tableList.value = newRows;
+  } else {
+    // 加载更多，按 typeId 去重后合并
+    const existingIds = new Set(tableList.value.map(item => item.typeId));
+    const filteredRows = newRows.filter(item => !existingIds.has(item.typeId));
+    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;
--- a/src/services/stquery/stquery.js
+++ b/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,
    })
 }