diff --git a/src/pages/devicesSearch/qrSearch.vue b/src/pages/devicesSearch/qrSearch.vue index 8e335fd..1154534 100644 --- a/src/pages/devicesSearch/qrSearch.vue +++ b/src/pages/devicesSearch/qrSearch.vue @@ -154,13 +154,14 @@ const handleIsOverToday = () => { // } // 扫码识别按钮点击事件 const scanStart = () => { - qrCodeScan.value = '201807-00009' - getMaInfoScan() - // codeData.value = {} - // if (scanQrCodeRef.value) { - // scanQrCodeRef.value.scanQrCode() - // } - // qrCodeScan.value = + qrCodeScan.value = '' + codeData.value = {} + if (scanQrCodeRef.value) { + scanQrCodeRef.value.scanQrCode() + } + + // 调试用 --↓ + // qrCodeScan.value = '201807-00009' // getMaInfoScan() } diff --git a/src/pages/new-purchase/accept/index.vue b/src/pages/new-purchase/accept/index.vue index 8c45bdd..6c67d5f 100644 --- a/src/pages/new-purchase/accept/index.vue +++ b/src/pages/new-purchase/accept/index.vue @@ -162,7 +162,18 @@ const getTableList = async (isTap = false) => { queryParams.value.pageNum = 1 } else { if (res.rows?.length) { - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } return res // 返回数据,供后续使用 diff --git a/src/pages/new-purchase/entry/index.vue b/src/pages/new-purchase/entry/index.vue index 0352471..9175fd2 100644 --- a/src/pages/new-purchase/entry/index.vue +++ b/src/pages/new-purchase/entry/index.vue @@ -119,7 +119,7 @@ const queryParams = ref({ taskStage: 4, // 入库 isFinish: '0', // 未完成 pageNum: 1, - pageSize: 5, + pageSize: 20, }) const boxCode = ref('') const boxInfo = ref({}) @@ -290,7 +290,18 @@ const getTableList = async (isTap = false) => { // 下拉加载时,追加数据 if (res.rows && res.rows.length > 0) { // 使用展开运算符安全地合并数组 - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } } catch (error) { @@ -309,7 +320,7 @@ const onScrollTolower = debounce(() => { console.log("下一页") // 判断是否还有更多数据 if (tableList.value.length < total.value) { - queryParams.value.pageSize += 5 + queryParams.value.pageSize += 10 getTableList(false) } }, 500) diff --git a/src/pages/part/entry/index.vue b/src/pages/part/entry/index.vue index cdedb58..a0c6b8b 100644 --- a/src/pages/part/entry/index.vue +++ b/src/pages/part/entry/index.vue @@ -218,7 +218,18 @@ const getTableList = async (isTap = false) => { // 下拉加载时,追加数据 if (res.rows && res.rows.length > 0) { // 使用展开运算符安全地合并数组 - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } } catch (error) { diff --git a/src/pages/part/parts-accept/index.vue b/src/pages/part/parts-accept/index.vue index 5cdba0c..56f1e9a 100644 --- a/src/pages/part/parts-accept/index.vue +++ b/src/pages/part/parts-accept/index.vue @@ -129,7 +129,18 @@ const getTableList = async (isTap = false) => { } else { // 下拉加载时,追加数据 if (res.rows && res.rows.length > 0) { - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } } catch (error) { diff --git a/src/pages/standardBox/acceptBox.vue b/src/pages/standardBox/acceptBox.vue index 95dc3ad..ee9ca0b 100644 --- a/src/pages/standardBox/acceptBox.vue +++ b/src/pages/standardBox/acceptBox.vue @@ -249,7 +249,18 @@ const getTableList = async (isTap = false) => { // 下拉加载时,追加数据 if (res.rows && res.rows.length > 0) { // 使用展开运算符安全地合并数组 - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } } catch (error) { diff --git a/src/pages/standardBox/boxList.vue b/src/pages/standardBox/boxList.vue index b776aca..5e28fe4 100644 --- a/src/pages/standardBox/boxList.vue +++ b/src/pages/standardBox/boxList.vue @@ -244,7 +244,18 @@ const getTableList = async (isTap = false) => { // 下拉加载时,追加数据 if (res.rows && res.rows.length > 0) { // 使用展开运算符安全地合并数组 - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } } catch (error) { diff --git a/src/pages/standardBox/index.vue b/src/pages/standardBox/index.vue index 0361df1..9a461f0 100644 --- a/src/pages/standardBox/index.vue +++ b/src/pages/standardBox/index.vue @@ -217,7 +217,18 @@ const getTableList = async (isTap = false) => { // 下拉加载时,追加数据 if (res.rows && res.rows.length > 0) { // 使用展开运算符安全地合并数组 - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } } catch (error) { diff --git a/src/pages/standardBox/transferBox.vue b/src/pages/standardBox/transferBox.vue index 0b1fcf6..65d78ea 100644 --- a/src/pages/standardBox/transferBox.vue +++ b/src/pages/standardBox/transferBox.vue @@ -229,7 +229,18 @@ const getTableList = async (isTap = false) => { // 下拉加载时,追加数据 if (res.rows && res.rows.length > 0) { // 使用展开运算符安全地合并数组 - tableList.value = [...tableList.value, ...res.rows] + const merged = [...tableList.value, ...res.rows] + // 根据 id 去重(保留前面的) + const unique = [] + const seen = new Set() + for (const item of merged) { + if (!seen.has(item.taskId)) { + seen.add(item.taskId) + unique.push(item) + } + } + console.log('🚀 ~ getTableList ~ unique:', unique) + tableList.value = unique } } } catch (error) {