From f9c7f179f943defc93e5429d97ed2dd4a2a695d9 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Thu, 22 May 2025 11:44:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/negative/verify-description.vue |  2 +-
 src/components/negative/verify.vue             |  8 +++++---
 src/utils/util.ts                              | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/negative/verify-description.vue b/src/components/negative/verify-description.vue
index 6914f00..65e7bbc 100644
--- a/src/components/negative/verify-description.vue
+++ b/src/components/negative/verify-description.vue
@@ -311,7 +311,7 @@
 </template>
 <script setup>
 import { BlameType, ProblemSources } from "@/enums/dictEnums";
-
+import {reduceMerge} from '@/utils/util';
 import { ProcessingStatus } from "@/enums/flowEnums";
 import { getDictLable } from "@/utils/util";
 import useCatchStore from "@/stores/modules/catch";
diff --git a/src/components/negative/verify.vue b/src/components/negative/verify.vue
index e59f81e..5cf4f08 100644
--- a/src/components/negative/verify.vue
+++ b/src/components/negative/verify.vue
@@ -1612,6 +1612,7 @@ import {
   SubjectiveAspect,
 } from "@/enums/dictEnums";
 import useCatchStore from "@/stores/modules/catch";
+import {reduceMerge} from '@/utils/util';
 import feedback from "@/utils/feedback";
 import {
   getConfinementListAll
@@ -1646,7 +1647,7 @@ let confinementOpens = ref([])
  * */
 let confinementQuery = ref({
   current: 1,
-  size: 10000,
+  size: 100,
   departBranch: false
 })
 
@@ -1658,7 +1659,7 @@ let confinementQuery = ref({
 const fileConfinement = async (query)=>{
   confinementQuery.value={
     current: 1,
-    size: 10000,
+    size: 100,
     departBranch: false
   }
   if(query){
@@ -1667,13 +1668,14 @@ const fileConfinement = async (query)=>{
     confinementQuery.value.empNo = query
   }
   const data =await getConfinementListAll(confinementQuery.value);
-  confinementOpens.value =  [...new Set(confinementOpens.value.concat(data.records))];
+  confinementOpens.value = reduceMerge(confinementOpens.value.concat(data.records));
 }
 
 
 
 
 
+
 const problemIsTrue = computed(() => {
   return form.value.checkStatus !== InspectCase.FALSE;
 });
diff --git a/src/utils/util.ts b/src/utils/util.ts
index 60efd3e..61bd411 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -374,6 +374,24 @@ export function getAppealType(appealState: String) {
     }
 }
 
+/**
+ * 数组去重
+ * */
+export const  reduceMerge= (val)=>{
+    const mergedItems = val.reduce((acc, item) => {
+        // 检查acc中是否已存在当前项的ID
+        const existingItem = acc.find(i => i.id === item.id);
+        if (existingItem) {
+            // 如果存在，则更新quantity
+            existingItem.quantity += item.quantity;
+        } else {
+            // 如果不存在，则添加到acc中
+            acc.push({ ...item }); // 使用扩展运算符复制对象以避免引用问题
+        }
+        return acc;
+    }, []); // 初始值为空数组
+    return mergedItems
+}
 export function getFileType(fileName) {
     if (!fileName) {
         return "unknown";