Browse Source

fix:功能优化

main
pengwei 9 months ago
parent
commit
f9c7f179f9
  1. 2
      src/components/negative/verify-description.vue
  2. 8
      src/components/negative/verify.vue
  3. 18
      src/utils/util.ts

2
src/components/negative/verify-description.vue

@ -311,7 +311,7 @@
</template> </template>
<script setup> <script setup>
import { BlameType, ProblemSources } from "@/enums/dictEnums"; import { BlameType, ProblemSources } from "@/enums/dictEnums";
import {reduceMerge} from '@/utils/util';
import { ProcessingStatus } from "@/enums/flowEnums"; import { ProcessingStatus } from "@/enums/flowEnums";
import { getDictLable } from "@/utils/util"; import { getDictLable } from "@/utils/util";
import useCatchStore from "@/stores/modules/catch"; import useCatchStore from "@/stores/modules/catch";

8
src/components/negative/verify.vue

@ -1612,6 +1612,7 @@ import {
SubjectiveAspect, SubjectiveAspect,
} from "@/enums/dictEnums"; } from "@/enums/dictEnums";
import useCatchStore from "@/stores/modules/catch"; import useCatchStore from "@/stores/modules/catch";
import {reduceMerge} from '@/utils/util';
import feedback from "@/utils/feedback"; import feedback from "@/utils/feedback";
import { import {
getConfinementListAll getConfinementListAll
@ -1646,7 +1647,7 @@ let confinementOpens = ref([])
* */ * */
let confinementQuery = ref({ let confinementQuery = ref({
current: 1, current: 1,
size: 10000, size: 100,
departBranch: false departBranch: false
}) })
@ -1658,7 +1659,7 @@ let confinementQuery = ref({
const fileConfinement = async (query)=>{ const fileConfinement = async (query)=>{
confinementQuery.value={ confinementQuery.value={
current: 1, current: 1,
size: 10000, size: 100,
departBranch: false departBranch: false
} }
if(query){ if(query){
@ -1667,13 +1668,14 @@ const fileConfinement = async (query)=>{
confinementQuery.value.empNo = query confinementQuery.value.empNo = query
} }
const data =await getConfinementListAll(confinementQuery.value); 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(() => { const problemIsTrue = computed(() => {
return form.value.checkStatus !== InspectCase.FALSE; return form.value.checkStatus !== InspectCase.FALSE;
}); });

18
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) { export function getFileType(fileName) {
if (!fileName) { if (!fileName) {
return "unknown"; return "unknown";

Loading…
Cancel
Save