From 747b1f10c070a47a234f5f613c5ccd7550605916 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 21:27:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E7=BB=88=E5=AE=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=AD=9B=E9=80=89=E3=80=82=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=BC=B9=E7=AA=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/workOrder.ts              |   9 +-
 src/views/final/aside/Aside.vue             | 240 ++++---
 src/views/final/content/Content.vue         | 698 ++++++++++----------
 src/views/final/index.vue                   |   2 +-
 src/views/worksheet/aside/WorkSheetList.vue | 150 ++---
 src/views/worksheet/modal/ApprovalModal.vue |  25 +-
 types/workorder.d.ts                        |   3 +-
 7 files changed, 591 insertions(+), 536 deletions(-)

diff --git a/src/store/modules/workOrder.ts b/src/store/modules/workOrder.ts
index 5470f90..a729454 100644
--- a/src/store/modules/workOrder.ts
+++ b/src/store/modules/workOrder.ts
@@ -11,7 +11,9 @@ export const useWorkOrderStore = defineStore({
     activeId: '',
     packageList: [],
     immersion: false,
-    name: ''
+    name: '',
+    dataId: '',
+    approvalList: [],
   }),
   getters: {
     getActiveId: (state: OrderState) => state.activeId,
@@ -22,10 +24,11 @@ export const useWorkOrderStore = defineStore({
     setOrderList(list: PackageListItem[]) {
       this.packageList = list
     },
-    setActive(index: number, orderId?: string) {
+    setActive(index: number, orderId?: string, dataId?: string) {
       this.currentIndex = index
       const order = this.packageList[index]
       this.activeId = orderId || order?.checkDuplicateId
+      this.dataId = dataId || order.id;
     },
     forward() {
       const len = this.packageList.length
@@ -46,7 +49,7 @@ export const useWorkOrderStore = defineStore({
     },
     async fetchOrderList(pagination, keyword) {
       const res = await getPackageList(pagination, keyword)
-      if (res.data&&res.data.length > 0) {
+      if (res.data && res.data.length > 0) {
         this.packageList.push(...res.data)
         if (!this.activeId)
           this.setActive(0)
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index 8c2aba9..d8fa596 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -1,162 +1,178 @@
 <script lang="ts" setup>
-import { computed, inject, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
-import { CustomFilterModalVue, FilterModal, NewFilterModal } from '@/views/final/comp'
-import Search from '@/views/home/aside/comp/Search.vue'
-import AdvanceFilter from '@/views/home/aside/comp/AdvanceFilter.vue'
-import { getViewportOffset } from '@/utils/domUtils'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useFinal } from '@/store/modules/final'
-import type { Filter } from '/#/home'
-import type { AsideEntity } from '@/config/aside'
-import { asideMap } from '@/config/final'
-import type { AsideConfig } from '/#/api'
-import emitter from '@/utils/mitt'
-
-const finalStore = useFinal()
-
+import {
+  computed,
+  inject,
+  nextTick,
+  onBeforeMount,
+  onMounted,
+  reactive,
+  ref,
+  shallowRef,
+  unref,
+  watch,
+} from "vue";
+import { CustomFilterModalVue, FilterModal, NewFilterModal } from "@/views/final/comp";
+import Search from "@/views/home/aside/comp/Search.vue";
+import AdvanceFilter from "@/views/home/aside/comp/AdvanceFilter.vue";
+import { getViewportOffset } from "@/utils/domUtils";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useFinal } from "@/store/modules/final";
+import type { Filter } from "/#/home";
+import type { AsideEntity } from "@/config/aside";
+import { asideMap } from "@/config/final";
+import type { AsideConfig } from "/#/api";
+import emitter from "@/utils/mitt";
+
+const emit = defineEmits(["inputChange"]);
+const finalStore = useFinal();
 // 所有左侧模块的值
-const asideValue: Record<keyof typeof asideMap, any> = reactive({})
+const asideValue: Record<keyof typeof asideMap, any> = reactive({});
 // 左侧某个模块是否显示: 个人配置
-const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
+const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({});
 // 当前显示的模块，按照数组顺序显示
-const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
+const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
 
 Object.keys(asideMap).forEach((key) => {
-  const { defaultValue, inFilterList } = asideMap[key]
-  if (inFilterList !== false)
-    asideValue[key] = defaultValue
-})
+  const { defaultValue, inFilterList } = asideMap[key];
+  if (inFilterList !== false) asideValue[key] = defaultValue;
+});
 
-const filterModalRef = ref(null)
-const newFilterModalRef = ref(null)
-const customModalRef = ref(null)
+const filterModalRef = ref(null);
+const newFilterModalRef = ref(null);
+const customModalRef = ref(null);
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
-const mousetrap = inject('mousetrap') as any
-mousetrap.bind('[', collapseHandler)
+const mousetrap = inject("mousetrap") as any;
+mousetrap.bind("[", collapseHandler);
 
 onMounted(() => {
   nextTick(() => {
-    computeSlideHeight()
-  })
-})
+    computeSlideHeight();
+  });
+});
 
-const collapse = ref(false)
+const collapse = ref(false);
 
 function collapseHandler() {
-  collapse.value = !collapse.value
+  collapse.value = !collapse.value;
 }
 
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308
-})
+  return collapse.value ? 0 : 308;
+});
 
-const asideHeight = ref(500)
+const asideHeight = ref(500);
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
     height: `${asideHeight.value}px`,
-  }
-})
+  };
+});
 
 const collapseIcon = computed(() => {
-  return collapse.value ? 'expand-cir' : 'collapse-cir'
-})
+  return collapse.value ? "expand-cir" : "collapse-cir";
+});
 
 function computeSlideHeight() {
-  const headEl = document.querySelector('.aside-header')!
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const height = bottomIncludeBody
-  asideHeight.value = height - 24
+  const headEl = document.querySelector(".aside-header")!;
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const height = bottomIncludeBody;
+  asideHeight.value = height - 24;
 }
 
-useWindowSizeFn(computeSlideHeight, 280)
+useWindowSizeFn(computeSlideHeight, 280);
 
 onBeforeMount(async () => {
-  finalStore.fetchCustomConfig()
-})
+  finalStore.fetchCustomConfig();
+});
 
 finalStore.$subscribe(() => {
-  const customConfig = finalStore.getCustomConfig
+  const customConfig = finalStore.getCustomConfig;
 
-  if (customConfig === null)
-    return
+  if (customConfig === null) return;
 
-  const showKeys: string[] = [...customConfig]
-  const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)
-  showKeys.unshift(...defaultKeys)
+  const showKeys: string[] = [...customConfig];
+  const defaultKeys = Object.keys(asideMap).filter(
+    (key) => asideMap[key].isDefaultFilter
+  );
+  showKeys.unshift(...defaultKeys);
 
   Object.keys(asideMap).forEach((key) => {
     // 设置显示的或者默认显示的
-    if (key.startsWith('iz'))
-      asideVisible[key] = asideMap[key] && (showKeys.includes(key) || asideMap[key].isDefaultFilter)
-  })
+    if (key.startsWith("iz"))
+      asideVisible[key] =
+        asideMap[key] && (showKeys.includes(key) || asideMap[key].isDefaultFilter);
+  });
 
   const items = showKeys.reduce((acc, key) => {
     if (asideMap[key]) {
       const config = {
         key,
         config: asideMap[key],
-      }
-      return [...acc, config]
-    }
-    else {
-      return acc
+      };
+      return [...acc, config];
+    } else {
+      return acc;
     }
-  }, [])
+  }, []);
 
-  showItems.value = items
-})
+  showItems.value = items;
+});
 
 watch(asideVisible, (newVal) => {
   Object.keys(asideValue).forEach((key) => {
-    if (newVal[key] === false)
-      asideValue[key] = asideMap[key].defaultValue
-  })
-})
+    if (newVal[key] === false) asideValue[key] = asideMap[key].defaultValue;
+  });
+});
 
-const asideEnter = ref(false)
+const asideEnter = ref(false);
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value
-})
+  return collapse.value ? true : asideEnter.value;
+});
 
-const showSearch = ref(false)
+const showSearch = ref(false);
 
 function setShowSearch(value: boolean) {
-  showSearch.value = value
+  showSearch.value = value;
 }
 
 // 滚动容器，让key对应模块处于可视区域
 function scrollHandler(key: string) {
-  const element = document.querySelector(`#${key}`)
-  element?.scrollIntoView(true)
+  const element = document.querySelector(`#${key}`);
+  element?.scrollIntoView(true);
 }
 
 function filterHandler(searchId: string) {
-  emitter.emit('filter-final', searchId)
+  emitter.emit("filter-final", searchId);
 }
 
 function editFilter(filter: any) {
-  const modal = unref(newFilterModalRef)! as any
-  modal.showModal()
-  modal.edit(filter)
+  const modal = unref(newFilterModalRef)! as any;
+  modal.showModal();
+  modal.edit(filter);
 }
 
 watch(asideValue, (newVal) => {
-  finalStore.setAsideValue(newVal)
-})
+  finalStore.setAsideValue(newVal);
+});
 
-const inputChange = (keyword)=>{
-  
-}
+const inputChange = (keyword) => {
+  console.log("Search Component", keyword);
+  emit("inputChange", keyword);
+};
 </script>
 
 <template>
-  <div class="aside" :style="asideStyle" @mouseenter="asideEnter = true" @mouseleave="asideEnter = false">
+  <div
+    class="aside"
+    :style="asideStyle"
+    @mouseenter="asideEnter = true"
+    @mouseleave="asideEnter = false"
+  >
     <div v-show="showCollapse" class="aside-collapse">
       <div class="aside-collapse-btn" @click="collapseHandler">
         <SvgIcon :name="collapseIcon" size="40" />
@@ -165,23 +181,40 @@ const inputChange = (keyword)=>{
     <n-scrollbar trigger="none">
       <div class="aside-header">
         <!-- 搜索跳转模块 -->
-        <Search v-show="showSearch" @select="scrollHandler" @close="setShowSearch(false)" @inputChange="inputChange" />
+        <Search
+          v-show="showSearch"
+          @select="scrollHandler"
+          @close="setShowSearch(false)"
+          @inputChange="inputChange"
+        />
         <!-- 高级筛选 -->
         <AdvanceFilter
-          v-show="!showSearch" :type="1" @select="filterHandler" @update:search="setShowSearch(true)"
-          @show-custom="showModal(customModalRef)" @show-filter="showModal(filterModalRef)"
+          v-show="!showSearch"
+          :type="1"
+          @select="filterHandler"
+          @update:search="setShowSearch(true)"
+          @show-custom="showModal(customModalRef)"
+          @show-filter="showModal(filterModalRef)"
         />
       </div>
 
       <component
-        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index"
-        v-model:value="asideValue[item.key]" :label="item.config.label"
+        :is="item.config.component"
+        v-for="(item, index) in showItems"
+        :id="item.key"
+        :key="index"
+        v-model:value="asideValue[item.key]"
+        :label="item.config.label"
       />
 
       <!-- 筛选 -->
       <CustomFilterModalVue ref="customModalRef" />
       <!-- 过滤列表 -->
-      <FilterModal ref="filterModalRef" @edit-filter="editFilter" @show-new-filter="showModal(newFilterModalRef)" />
+      <FilterModal
+        ref="filterModalRef"
+        @edit-filter="editFilter"
+        @show-new-filter="showModal(newFilterModalRef)"
+      />
       <!-- 新增过滤 -->
       <NewFilterModal ref="newFilterModalRef" />
     </n-scrollbar>
@@ -193,7 +226,7 @@ const inputChange = (keyword)=>{
   display: flex;
   position: relative;
   flex-direction: column;
-  background: #FFF;
+  background: #fff;
   border: 1px solid #efeff5;
   border-radius: 3px;
   box-sizing: border-box;
@@ -230,11 +263,17 @@ const inputChange = (keyword)=>{
     right: -20px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item.n-collapse-item--right-arrow-placement .n-collapse-item__header .n-collapse-item-arrow) {
+  ::v-deep(.n-collapse
+      .n-collapse-item.n-collapse-item--right-arrow-placement
+      .n-collapse-item__header
+      .n-collapse-item-arrow) {
     margin-left: 8px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__header .n-collapse-item__header-main) {
+  ::v-deep(.n-collapse
+      .n-collapse-item
+      .n-collapse-item__header
+      .n-collapse-item__header-main) {
     font-weight: bold;
     justify-content: space-between;
   }
@@ -247,11 +286,18 @@ const inputChange = (keyword)=>{
     border-top: 0px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__content-wrapper .n-collapse-item__content-inner) {
+  ::v-deep(.n-collapse
+      .n-collapse-item
+      .n-collapse-item__content-wrapper
+      .n-collapse-item__content-inner) {
     padding-top: 10px;
   }
 
-  ::v-deep(.n-scrollbar > .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar, .n-scrollbar + .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar) {
+  ::v-deep(.n-scrollbar
+      > .n-scrollbar-rail.n-scrollbar-rail--vertical
+      > .n-scrollbar-rail__scrollbar, .n-scrollbar
+      + .n-scrollbar-rail.n-scrollbar-rail--vertical
+      > .n-scrollbar-rail__scrollbar) {
     width: 0px;
   }
 }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index a28a943..72c6b4c 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
-import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
+import type { DataTableColumns, DataTableRowKey, PaginationProps } from "naive-ui";
+import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
 import {
   computed,
   defineEmits,
@@ -13,9 +13,9 @@ import {
   ref,
   unref,
   watch,
-} from 'vue'
-import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
-import { useRoute, useRouter } from 'vue-router'
+} from "vue";
+import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
+import { useRoute, useRouter } from "vue-router";
 import {
   CustomTabelModal,
   ImportExcelModal,
@@ -23,50 +23,50 @@ import {
   RepeatModal,
   RepeatTaskTableModal,
   StatusItem,
-} from '../comp'
-import { getFinalList } from '@/api/final'
-import { audit } from '@/api/task/task'
-import SvgIcon from '@/components/Icon/SvgIcon.vue'
-import type { RowData } from '@/config/final'
-import { findKey, headRules } from '@/config/final'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useUser } from '@/store/modules/user'
-import { useFinal } from '@/store/modules/final'
-import { getViewportOffset } from '@/utils/domUtils'
-import { isBoolean } from '@/utils/is'
-import { useDictionary } from '@/store/modules/dictonary'
-import NotPassed from '@/components/Approval/NotPassed.vue'
-import type { ApprovalParam } from '/#/api'
-import emitter from '@/utils/mitt'
-import { formatToDateHMS } from '@/utils/dateUtil'
-import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
-
-const emit = defineEmits(['changeShow'])
+} from "../comp";
+import { getFinalList } from "@/api/final";
+import { audit } from "@/api/task/task";
+import SvgIcon from "@/components/Icon/SvgIcon.vue";
+import type { RowData } from "@/config/final";
+import { findKey, headRules } from "@/config/final";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useUser } from "@/store/modules/user";
+import { useFinal } from "@/store/modules/final";
+import { getViewportOffset } from "@/utils/domUtils";
+import { isBoolean } from "@/utils/is";
+import { useDictionary } from "@/store/modules/dictonary";
+import NotPassed from "@/components/Approval/NotPassed.vue";
+import type { ApprovalParam } from "/#/api";
+import emitter from "@/utils/mitt";
+import { formatToDateHMS } from "@/utils/dateUtil";
+import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
+
+const emit = defineEmits(["changeShow"]);
 function changeContent() {
-  emit('changeShow')
+  emit("changeShow");
 }
-const checkedRowKeys = ref([])
-const dicStore = useDictionary()
-const izstatusList = ref([])
-const router = useRouter()
-const route = useRoute()
-const reviewType = 0
+const checkedRowKeys = ref([]);
+const dicStore = useDictionary();
+const izstatusList = ref([]);
+const router = useRouter();
+const route = useRoute();
+const reviewType = 0;
 const actionsColumns = {
-  title: '操作',
-  key: 'actions',
+  title: "操作",
+  key: "actions",
   minWidth: 200,
-  fixed: 'right',
+  fixed: "right",
   render(row) {
     return h(ListAction, {
       id: row.id,
       status: row.states,
       trigger: (action) => {
-        actionHandler(action, row)
+        actionHandler(action, row);
       },
-    })
+    });
   },
-}
-const columnsRef = ref<DataTableColumns<RowData>>([])
+};
+const columnsRef = ref<DataTableColumns<RowData>>([]);
 // const columns: DataTableColumns<RowData> = [
 //   {
 //     type: "selection",
@@ -166,234 +166,228 @@ const columnsRef = ref<DataTableColumns<RowData>>([])
 async function getColumns() {
   columnsRef.value = [
     {
-      type: 'selection',
-      fixed: 'left',
+      type: "selection",
+      fixed: "left",
       width: 50,
       disabled(row: any) {
-        return row.states !== 2
+        return row.states !== 2;
       },
     },
-  ]
-
-  const userStore = useUser()
-  const userInfo = userStore.getUserInfo
-  let res
-  res = await getAllfieldList(reviewType) // 所有筛选项目
-  const allList = res.data
-  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
-  const useList = res.data
-  const userFieldFixed = useList.userFieldFixed?.split(',')
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
-  console.log(userFieldFixed, userFieldUnFixed, 'userFieldUnFixed')
-  console.log(allList, 'allList')
+  ];
+
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(reviewType); // 所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
+  const useList = res.data;
+  const userFieldFixed = useList.userFieldFixed?.split(",");
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  console.log(userFieldFixed, userFieldUnFixed, "userFieldUnFixed");
+  console.log(allList, "allList");
   allList?.map((v) => {
     if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
       if (v.isrequired == 2) {
         columnsRef.value.push({
           title: v.fieldDesc,
-          fixed: 'left',
+          fixed: "left",
           key: v.name,
           width: 120,
-        })
+        });
       }
     }
 
-    if (userFieldFixed?.find(v2 => v2 == v.name)) {
+    if (userFieldFixed?.find((v2) => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
-        fixed: 'left',
+        fixed: "left",
         width: 120,
-      })
+      });
     }
-    if (userFieldUnFixed?.find(v2 => v2 == v.name)) {
+    if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
         width: 120,
-      })
+      });
     }
-  })
-  columnsRef.value.push(actionsColumns as any)
-  formatColumns()
-  console.log(columnsRef.value, 'columnsRef')
+  });
+  columnsRef.value.push(actionsColumns as any);
+  formatColumns();
+  console.log(columnsRef.value, "columnsRef");
 }
 
 async function formatColumns() {
   // TODO处理特殊字段
 
-  let index
-  index = columnsRef.value.findIndex(v => v.title == '任务ID')
+  let index;
+  index = columnsRef.value.findIndex((v) => v.title == "任务ID");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务ID',
+      title: "任务ID",
       key: columnsRef.value[index].key, // "id"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(
           NButton,
           {
-            'strong': true,
-            'tertiary': true,
-            'text': true,
-            'size': 'small',
-            'text-color': '#507AFD',
-            'onClick': () => goDetail(row),
+            strong: true,
+            tertiary: true,
+            text: true,
+            size: "small",
+            "text-color": "#507AFD",
+            onClick: () => goDetail(row),
           },
-          { default: () => row.id },
-        )
+          { default: () => row.id }
+        );
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '所属项目')
+  index = columnsRef.value.findIndex((v) => v.title == "所属项目");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '所属项目',
+      title: "所属项目",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '任务名称')
+  index = columnsRef.value.findIndex((v) => v.title == "任务名称");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务名称',
+      title: "任务名称",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '审批状态')
+  index = columnsRef.value.findIndex((v) => v.title == "审批状态");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '审批状态',
+      title: "审批状态",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 120,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(StatusItem, {
           id: row.id,
           status: row.states,
-          label: item ? item.label : '',
-        })
+          label: item ? item.label : "",
+        });
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '图片相似度')
+  index = columnsRef.value.findIndex((v) => v.title == "图片相似度");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '图片相似度',
+      title: "图片相似度",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 150,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
-        return h('div', {
-          id: row.id,
-          style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
-        }, { default: () => row.similarityscore ? `${row.similarityscore}%` : '' })
+        return h(
+          "div",
+          {
+            id: row.id,
+            style: { color: row.similarityscore === 100 ? "#FF4E4F" : "" },
+          },
+          { default: () => (row.similarityscore ? `${row.similarityscore}%` : "") }
+        );
       },
-
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '提报时间')
+  index = columnsRef.value.findIndex((v) => v.title == "提报时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '提报时间',
+      title: "提报时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
-        return formatToDateHMS(row.createdate || 0)
+        return formatToDateHMS(row.createdate || 0);
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '更新时间')
+  index = columnsRef.value.findIndex((v) => v.title == "更新时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '更新时间',
+      title: "更新时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.updatetime ? formatToDateHMS(row.updatetime) : ''
+        return row.updatetime ? formatToDateHMS(row.updatetime) : "";
       },
-    }
+    };
   }
 }
 
-const deviceHeight = ref(600)
+const deviceHeight = ref(600);
 
 onMounted(() => {
-  emitter.on('filter-final', refreshHandler)
-  getColumns()
+  emitter.on("filter-final", refreshHandler);
+  getColumns();
 
   nextTick(() => {
-    computeListHeight()
-  })
-})
+    computeListHeight();
+  });
+});
 
 onBeforeMount(() => {
-  dicStore.fetchizstatusListt()
-})
+  dicStore.fetchizstatusListt();
+});
 
 watch(
   () => dicStore.izstatusList,
   (newval) => {
-    izstatusList.value = newval
-  },
-)
+    izstatusList.value = newval;
+  }
+);
 
 onUnmounted(() => {
-  emitter.off('filter-final', refreshHandler)
-})
+  emitter.off("filter-final", refreshHandler);
+});
 
-const tableRef = ref<InstanceType<typeof NDataTable>>()
-const rowKey = (row: RowData) => row.id
-const loading = ref(true)
-const total = ref(0)
+const tableRef = ref<InstanceType<typeof NDataTable>>();
+const rowKey = (row: RowData) => row.id;
+const loading = ref(true);
+const total = ref(0);
 const pagination = reactive({
   page: 1,
   pageCount: 10,
@@ -401,243 +395,238 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: '10 每页',
+      label: "10 每页",
       value: 10,
     },
     {
-      label: '15 每页',
+      label: "15 每页",
       value: 15,
     },
     {
-      label: '30 每页',
+      label: "30 每页",
       value: 30,
     },
     {
-      label: '50 每页',
+      label: "50 每页",
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-})
-const tableData = ref<Array<RowData>>([])
-const selectionIds = ref<DataTableRowKey[]>([])
-const dialog = useDialog()
-const message = useMessage()
-const finalStore = useFinal()
+});
+const tableData = ref<Array<RowData>>([]);
+const selectionIds = ref<DataTableRowKey[]>([]);
+const dialog = useDialog();
+const message = useMessage();
+const finalStore = useFinal();
 
 async function query(page: number, pageSize: number, filterId?: any) {
-  const asideParmas = unref(finalStore.getAsideValue)
+  const asideParmas = unref(finalStore.getAsideValue);
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterId ? { userSearchId: filterId } : asideParmas
+  const params = filterId ? { userSearchId: filterId } : asideParmas;
   const result = await getFinalList({
-    sortorder: 'asc',
+    sortorder: "asc",
     pageSize,
     currPage: page,
-    sortname: '',
+    sortname: "",
     ...params,
-  })
-  const { data, pageCount, totalCount } = result
-  tableData.value = data
-  total.value = totalCount
-  pagination.page = page
-  pagination.pageCount = pageCount
-  loading.value = false
+  });
+  const { data, pageCount, totalCount } = result;
+  tableData.value = data;
+  total.value = totalCount;
+  pagination.page = page;
+  pagination.pageCount = pageCount;
+  loading.value = false;
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value)
-    return
-  const { pageSize } = pagination
-  pagination.page = currentPage
-  await query(currentPage, pageSize)
+  if (loading.value) return;
+  const { pageSize } = pagination;
+  pagination.page = currentPage;
+  await query(currentPage, pageSize);
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value)
-    return
+  if (loading.value) return;
 
-  const { page } = pagination
-  pagination.pageSize = currentPageSize
+  const { page } = pagination;
+  pagination.pageSize = currentPageSize;
 
-  await query(page, currentPageSize)
+  await query(page, currentPageSize);
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys
+  selectionIds.value = rowKeys;
 }
 
 async function computeListHeight() {
-  const table = unref(tableRef)
-  if (!table)
-    return
-  const tableEl: any = table?.$el
-  const headEl = tableEl.querySelector('.n-data-table-thead ')
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const headerH = 64
-  let paginationH = 2
-  const marginH = 60
+  const table = unref(tableRef);
+  if (!table) return;
+  const tableEl: any = table?.$el;
+  const headEl = tableEl.querySelector(".n-data-table-thead ");
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const headerH = 64;
+  let paginationH = 2;
+  const marginH = 60;
   if (!isBoolean(unref(pagination))) {
     const paginationEl = tableEl.querySelector(
-      '.n-data-table__pagination',
-    ) as HTMLElement
+      ".n-data-table__pagination"
+    ) as HTMLElement;
     if (paginationEl) {
-      const offsetHeight = paginationEl.offsetHeight
-      paginationH += offsetHeight || 0
-    }
-    else {
-      paginationH += 28
+      const offsetHeight = paginationEl.offsetHeight;
+      paginationH += offsetHeight || 0;
+    } else {
+      paginationH += 28;
     }
   }
-  let height = bottomIncludeBody - (headerH + paginationH + marginH)
-  const maxHeight = 800
-  height = maxHeight && maxHeight < height ? maxHeight : height
-  deviceHeight.value = height
+  let height = bottomIncludeBody - (headerH + paginationH + marginH);
+  const maxHeight = 800;
+  height = maxHeight && maxHeight < height ? maxHeight : height;
+  deviceHeight.value = height;
 }
 
-useWindowSizeFn(computeListHeight)
+useWindowSizeFn(computeListHeight);
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
-})
+  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
+});
 
-query(pagination.page, pagination.pageSize)
+query(pagination.page, pagination.pageSize);
 
-const customTabelRef = ref(null)
-const importExcelRef = ref(null)
-const notPassModalRef = ref(null) // 不通过弹窗
-const repeatModalRef = ref(null)
-const repeatTaskTableModalRef = ref(null)
+const customTabelRef = ref(null);
+const importExcelRef = ref(null);
+const notPassModalRef = ref(null); // 不通过弹窗
+const repeatModalRef = ref(null);
+const repeatTaskTableModalRef = ref(null);
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
 
-const popover = ref<ComponentRef | null>(null)
+const popover = ref<ComponentRef | null>(null);
 
 function importHandler() {
-  (popover.value as any).setShow(false)
-  showModal(importExcelRef)
+  (popover.value as any).setShow(false);
+  showModal(importExcelRef);
 }
 
 function exportHandler() {
-  loading.value = true
-  import('@/utils/exportExcel').then((excel) => {
+  loading.value = true;
+  import("@/utils/exportExcel").then((excel) => {
     const tHeader = [
-      '任务Id',
-      '任务名称',
-      '审批节点',
-      '审批状态',
-      '图片相似度',
-      '提报时间',
-      '更新时间',
-    ]
+      "任务Id",
+      "任务名称",
+      "审批节点",
+      "审批状态",
+      "图片相似度",
+      "提报时间",
+      "更新时间",
+    ];
     const filterVal = [
-      'id',
-      'name',
-      'approvalnode',
-      'approvalstatus',
-      'similarity',
-      'uptime',
-      'updatetime',
-    ]
-    const list = tableData.value
-    const data = formatJson(filterVal, list)
+      "id",
+      "name",
+      "approvalnode",
+      "approvalstatus",
+      "similarity",
+      "uptime",
+      "updatetime",
+    ];
+    const list = tableData.value;
+    const data = formatJson(filterVal, list);
     excel.export_json_to_excel({
       header: tHeader,
       data,
-      filename: 'data',
+      filename: "data",
       autoWidth: true,
-      bookType: 'xlsx',
-    })
-    loading.value = false
-  })
+      bookType: "xlsx",
+    });
+    loading.value = false;
+  });
 }
 
 function formatJson(filterVal, jsonDataList) {
-  return jsonDataList.map(v =>
+  return jsonDataList.map((v) =>
     filterVal.map((j) => {
-      return v[j]
-    }),
-  )
+      return v[j];
+    })
+  );
 }
 
 function sucessHandler(excelData) {
   const data = excelData.content.map((item) => {
-    const obj = {}
+    const obj = {};
     Object.keys(item).forEach((key) => {
-      const k = findKey(columns, key)
-      obj[k] = item[key]
-    })
-    return obj
-  })
+      const k = findKey(columns, key);
+      obj[k] = item[key];
+    });
+    return obj;
+  });
 
-  tableData.value = data
+  tableData.value = data;
 }
 
 function commitHandler(columns) {
-  columnsRef.value = [...columns, actionsColumns]
-  formatColumns()
+  columnsRef.value = [...columns, actionsColumns];
+  formatColumns();
 }
 
 function actionHandler(action: any, row: any) {
-  const { key } = action
+  const { key } = action;
   switch (key) {
-    case 'view':
-      goDetail(row)
-      break
-    case 'reset':
-      resetHandler()
-      break
-    case 'approval':
-      singleApproval(row)
-      break
-    case 'reject':
-      rejectHandler([row])
-      break
+    case "view":
+      goDetail(row);
+      break;
+    case "reset":
+      resetHandler();
+      break;
+    case "approval":
+      singleApproval(row);
+      break;
+    case "reject":
+      rejectHandler([row]);
+      break;
     default:
-      break
+      break;
   }
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0)
-    return '至少选中一个任务'
-  return null
+  if (items.length === 0) return "至少选中一个任务";
+  return null;
 }
 
 function goDetail(row) {
-  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+  router.push({ name: "final-detail", query: { id: row.id, packageid: row.packageid } });
 }
 
 function resetHandler() {
   dialog.info({
-    title: '确认提示',
-    content: '确认重置当前选中的任务的审批吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认重置当前选中的任务的审批吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function getSelectItems() {
-  return tableData.value.filter(item => selectionIds.value.includes(item.id))
+  return tableData.value.filter((item) => selectionIds.value.includes(item.id));
 }
 
 // 单个审批通过
 function singleApproval(row) {
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: [
       {
         formId: row.id,
@@ -645,112 +634,120 @@ function singleApproval(row) {
         taskName: row.fromTaskName,
       },
     ],
-  }
-  doAudit(param)
+  };
+  doAudit(param);
 }
 
 // 批量通过
 function batchApproval() {
-  const items: any = getSelectItems()
-  const msg = validate(items)
+  const items: any = getSelectItems();
+  const msg = validate(items);
 
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
-  console.log(items)
-  const list: any = []
+  console.log(items);
+  const list: any = [];
   items.forEach((item) => {
     list.push({
       formId: item.id,
       taskId: item.taskId,
       taskName: item.fromtaskname,
-    })
-  })
+    });
+  });
 
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: list,
-  }
+  };
 
-  doAudit(param)
+  doAudit(param);
 }
 
 // 小结批量不通过
 function repeatBatchReject(items) {
-  console.log(items)
-  rejectHandler(items)
+  console.log(items);
+  rejectHandler(items);
 }
 
 // 批量不通过
 function batchReject() {
-  const items: any = getSelectItems()
-  rejectHandler(items)
+  const items: any = getSelectItems();
+  rejectHandler(items);
 }
 
 // 审核不通过
 function rejectHandler(list) {
-  const msg = validate(list)
+  const msg = validate(list);
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
 
-  const modal = unref(notPassModalRef)! as any
-  modal.showModal(list)
+  const modal = unref(notPassModalRef)! as any;
+  modal.showModal(list);
 }
 
 // 审核通过
 function doAudit(param: any) {
   dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认给该任务审批为【通过】吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: () => {
       audit(param).then((res) => {
-        const { code } = res
-        if (code === 'OK') {
-          message.success(res.message)
-          reload()
+        const { code } = res;
+        if (code === "OK") {
+          message.success(res.message);
+          reload();
+        } else {
+          message.error(res.message);
         }
-        else { message.error(res.message) }
-      })
+      });
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function reload() {
-  selectionIds.value = []
-  checkedRowKeys.value = []
+  selectionIds.value = [];
+  checkedRowKeys.value = [];
 
-  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
-  query(page!, pageSize!)
+  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps;
+  query(page!, pageSize!);
 }
 
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler()
+    refreshHandler();
   },
-  { deep: true },
-)
+  { deep: true }
+);
 
 function reset() {
-  pagination.page = 1
-  pagination.pageCount = 1
+  pagination.page = 1;
+  pagination.pageCount = 1;
 }
 
 async function refreshHandler(searchId?: any) {
-  reset()
-  query(pagination.page, pagination.pageSize, searchId)
+  reset();
+  query(pagination.page, pagination.pageSize, searchId);
 }
+
+const filterTableData = (keyword) => {
+  tableData.value = tableData.value.filter((item) => item.id.indexOf(keyword) > -1);
+};
+defineExpose({
+  filterTableData,
+})
 </script>
 
 <template>
@@ -761,14 +758,27 @@ async function refreshHandler(searchId?: any) {
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
-        <SvgIcon style="margin-right: 6px;" size="13" name="summary" @click="showModal(repeatModalRef)" />
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
-          小结查重
-        </NButton>
+        <SvgIcon
+          style="margin-right: 6px"
+          size="13"
+          name="summary"
+          @click="showModal(repeatModalRef)"
+        />
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
         <div class="batch">
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
+          <img
+            class="btn-approval btn-left"
+            src="@/assets/images/task/btn-not-pass.png"
+            alt=""
+            @click.stop="batchReject"
+          />
           <SvgIcon size="24" name="vs" />
-          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+          <img
+            class="btn-approval"
+            src="@/assets/images/task/btn-pass.png"
+            alt=""
+            @click.stop="batchApproval"
+          />
         </div>
         <!-- <div class="btn" @click="batchApproval">
           <SvgIcon style="margin-right: 6px" size="14" name="tf" />
@@ -789,13 +799,19 @@ async function refreshHandler(searchId?: any) {
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="import" /><span style="margin-left: 5px">批量导入数据</span>
+              <SvgIcon size="20" name="import" /><span style="margin-left: 5px"
+                >批量导入数据</span
+              >
             </li>
             <li @click="exportHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
+                >导出待审数据</span
+              >
             </li>
             <li>
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
+                >导出全部数据</span
+              >
             </li>
             <!-- <li>
               <SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
@@ -861,8 +877,8 @@ async function refreshHandler(searchId?: any) {
 </template>
 
 <style lang="less" scoped>
-.color-red{
-  color: #FF4E4F!important;
+.color-red {
+  color: #ff4e4f !important;
 }
 
 .batch {
@@ -870,13 +886,13 @@ async function refreshHandler(searchId?: any) {
   align-items: center;
   margin-right: 10px;
 
-  .btn-approval{
+  .btn-approval {
     width: 68px;
     height: 28px;
     cursor: pointer;
   }
 
-  .btn-left{
+  .btn-left {
     margin-left: 16px;
   }
 }
@@ -917,7 +933,7 @@ async function refreshHandler(searchId?: any) {
 
     .xjcc {
       font-weight: bold;
-      color: #507AFD;
+      color: #507afd;
       margin-right: 20px;
     }
 
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index 204ad2d..f3b3415 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -7,7 +7,7 @@ import ListContent from './content/ListContent.vue'
 const showList = ref(false);
 const contentRef = ref(null);
 const inputChange = (keyword)=>{
-
+  contentRef.value.filterTableData(keyword)
 }
 
 </script>
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 330b045..039b0a6 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
-import { deletePackage } from '@/api/home/main'
-import NotPassed from '@/components/NotPassed.vue'
-import { useWorkOrder } from '@/store/modules/workOrder'
-import { isEmpty } from '@/utils'
-import { useInfiniteScroll } from '@vueuse/core'
-import { useMessage } from 'naive-ui'
-import { reactive, ref, watch } from 'vue'
-import ApprovalModal from '../modal/ApprovalModal.vue'
-import ListItem from './ListItem.vue'
-import type { PackageListItem } from '/#/workorder'
+import { deletePackage } from "@/api/home/main";
+import NotPassed from "@/components/NotPassed.vue";
+import { useWorkOrder } from "@/store/modules/workOrder";
+import { isEmpty } from "@/utils";
+import { useInfiniteScroll } from "@vueuse/core";
+import { useMessage } from "naive-ui";
+import { reactive, ref, watch } from "vue";
+import ApprovalModal from "../modal/ApprovalModal.vue";
+import ListItem from "./ListItem.vue";
+import type { PackageListItem } from "/#/workorder";
 
 defineProps({
   showFieldList: {
@@ -19,132 +19,126 @@ defineProps({
     type: Array,
     default: () => [],
   },
-})
-const workStore = useWorkOrder()
-const data = ref<PackageListItem[]>([])
-const activeId = ref('')
-const el = ref<HTMLDivElement | null>(null)
-const keyword = ref('')
-const canloadMore = ref(true)
-const isLoading = ref(false)
+});
+const workStore = useWorkOrder();
+const data = ref<PackageListItem[]>([]);
+const activeId = ref("");
+const el = ref<HTMLDivElement | null>(null);
+const keyword = ref("");
+const canloadMore = ref(true);
+const isLoading = ref(false);
 
 const pagination = reactive({
   pageNo: 0,
   pageSize: 10,
-})
+});
 
-const approvalModalRef: any = ref(null)
-const notPassedRef: any = ref(null)
+const approvalModalRef: any = ref(null);
+const notPassedRef: any = ref(null);
 const overTask = ref<any>(null);
 
 function selectHandler(id: string, index: number) {
-  workStore.setActive(index)
+  // console.log('selectHandler',id)
+  workStore.setActive(index);
   // showModal(approvalModalRef, id)
 }
 
 useInfiniteScroll(
   el as any,
   () => {
-    loadMore()
+    loadMore();
   },
   {
     distance: 10,
     interval: 1500,
     canLoadMore: () => canloadMore.value,
-  },
-)
+  }
+);
 
 async function loadMore() {
-  if (isLoading.value || el.value == null)
-    return
-  isLoading.value = true
+  if (isLoading.value || el.value == null) return;
+  isLoading.value = true;
   try {
-    const more = await fetchList()
-    more.forEach(ele=>{
-      ele.search = JSON.parse(ele.search)
+    const more = await fetchList();
+    more.forEach((ele) => {
+      ele.search = JSON.parse(ele.search);
       // ele.search.createTime = ele.search.submit_date_timestamp
-    })
-    data.value.push(...more)
-  }
-  finally {
-    isLoading.value = false
+    });
+    data.value.push(...more);
+  } finally {
+    isLoading.value = false;
   }
 }
 
 async function fetchList() {
   try {
-    pagination.pageNo += 1
-    const result = await workStore.fetchOrderList(pagination, keyword.value)
-    const { data, pageCount } = result
-    if (pageCount !== 0)
-      canloadMore.value = pageCount >= pagination.pageNo
-    else
-      canloadMore.value = false
-
-    return data || []
-  }
-  catch (error) {
-    canloadMore.value = false
-    return []
+    pagination.pageNo += 1;
+    const result = await workStore.fetchOrderList(pagination, keyword.value);
+    const { data, pageCount } = result;
+    if (pageCount !== 0) canloadMore.value = pageCount >= pagination.pageNo;
+    else canloadMore.value = false;
+
+    return data || [];
+  } catch (error) {
+    canloadMore.value = false;
+    return [];
   }
 }
 
 watch(
   () => workStore.activeId,
   (newVal) => {
-    if (isEmpty(newVal))
-      return
+    if (isEmpty(newVal)) return;
     activeId.value = newVal;
-    approvalModalRef.value.showModal(activeId.value)
-    
-  },
-)
+    approvalModalRef.value.showModal(workStore.dataId);
+  }
+);
 
 function reset() {
-  pagination.pageNo = 0
-  pagination.pageSize = 10
-  canloadMore.value = true
-  data.value.length = 0
+  pagination.pageNo = 0;
+  pagination.pageSize = 10;
+  canloadMore.value = true;
+  data.value.length = 0;
 
-  workStore.reset()
+  workStore.reset();
 }
 
 function notPass(value) {
-  notPassedRef.value.showModal(value)
+  notPassedRef.value.showModal(value);
 }
 
 async function search(word: string) {
-  keyword.value = word
-  reset()
+  keyword.value = word;
+  reset();
   useInfiniteScroll(
     el as any,
     () => {
-      loadMore()
+      loadMore();
     },
-    { distance: 10, canLoadMore: () => canloadMore.value },
-  )
+    { distance: 10, canLoadMore: () => canloadMore.value }
+  );
 }
 function overTaskHandelr(item: any) {
-  overTask.value = item
+  overTask.value = item;
 }
 function leaveTaskHandler(event) {
-  if(event?.relatedTarget?.id !=="taskPopconfirmRef"){
+  if (event?.relatedTarget?.id !== "taskPopconfirmRef") {
     overTask.value = null;
   }
 }
-const message = useMessage()
-function dismisClick(packageId:string) {
-  deletePackage({packageId: packageId}).then((res) => {
-    if(res.code==="OK"){
-      message.success("解散任务包成功")
-      reset()
-      loadMore()
+const message = useMessage();
+function dismisClick(packageId: string) {
+  deletePackage({ packageId: packageId }).then((res) => {
+    if (res.code === "OK") {
+      message.success("解散任务包成功");
+      reset();
+      loadMore();
     }
-  })
+  });
 }
 defineExpose({
   search,
-})
+});
 </script>
 
 <template>
@@ -161,7 +155,7 @@ defineExpose({
         :dicts="dicts"
         :mouse-over-task="overTask"
         @click="selectHandler(item.id, index)"
-        @mouseover="overTaskHandelr(item)"  
+        @mouseover="overTaskHandelr(item)"
         @mouseleave="leaveTaskHandler"
         @dismisClick="dismisClick"
       />
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 1e9c4d0..806ae27 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -3,6 +3,7 @@ import { nextTick, onDeactivated, onMounted, reactive, ref, toRefs } from "vue";
 import { format } from "date-fns";
 import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
 import { aiApprovaltools, aiApprovaltoolsClearmark, setTF } from "@/api/work/work";
+import { audit } from "@/api/task/task";
 import { getToolsCount } from "@/api/home/main";
 import { storage } from "@/utils/Storage";
 import { CURRENT_USER } from "@/store/mutation-types";
@@ -32,6 +33,7 @@ function showModal(id) {
 }
 
 async function getDetail(id) {
+  console.log('getDetail',id)
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
   // id = "264626184091111068";
@@ -43,12 +45,13 @@ async function getDetail(id) {
 }
 
 const handleReject = async () => {
-  const res = await setTF({
-    taskchildpictureids: state.detail.taskIdList.join(","),
-    packageid: state.packageid,
-    iztrueorfalse: 0,
-  });
-  console.log(res, "handleReject");
+  const res = await audit()
+  // const res = await setTF({
+  //   taskchildpictureids: state.detail.taskIdList.join(","),
+  //   packageid: state.packageid,
+  //   iztrueorfalse: 0,
+  // });
+  // console.log(res, "handleReject");
 };
 
 async function clearMark() {
@@ -86,13 +89,6 @@ async function viewRepeat(e: MouseEvent) {
   closeModal();
 }
 
-async function getShowStatus() {
-  const res = await getToolsCount();
-  if (res.code == "OK") {
-    show.value = true;
-  }
-}
-
 const initRem = () => {
   const designWidth = 1440;
   const rempPx = 16;
@@ -100,7 +96,6 @@ const initRem = () => {
   document.documentElement.style.fontSize = scale * rempPx + "px";
 };
 onMounted(() => {
-  getShowStatus();
   nextTick(() => {
     initRem();
   });
@@ -126,7 +121,7 @@ defineExpose({
       <div class="wrapper-hearder">
         <div class="wrapper-title">智能AI审批工具</div>
         <div class="wrapper-mark">
-          {{ detail.tenantUserName || '部门信息' }}
+          {{ detail.tenantUserName || "部门信息" }}
         </div>
       </div>
       <div class="wrapper-content">
diff --git a/types/workorder.d.ts b/types/workorder.d.ts
index e0fd016..308ca56 100644
--- a/types/workorder.d.ts
+++ b/types/workorder.d.ts
@@ -17,7 +17,8 @@ export interface OrderState {
   currentIndex: number
   packageList: PackageListItem[]
   approvalList: any[]
-  immersion: boolean
+  immersion: boolean,
+  dataId: string
 }
 
 // 任务实体

From 088e5629bb4b76e434d322973e99f35b1517f626 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 21:49:27 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/exclamation-solid.svg        |   3 +
 src/layout/components/Header/ConfrimModal.vue | 114 ++++++++++++++++
 src/layout/components/Header/RecycleModal.vue | 122 ++++++++----------
 src/views/worksheet/content/Content.vue       |   5 -
 4 files changed, 173 insertions(+), 71 deletions(-)
 create mode 100644 src/assets/icons/exclamation-solid.svg
 create mode 100644 src/layout/components/Header/ConfrimModal.vue

diff --git a/src/assets/icons/exclamation-solid.svg b/src/assets/icons/exclamation-solid.svg
new file mode 100644
index 0000000..26d03f5
--- /dev/null
+++ b/src/assets/icons/exclamation-solid.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
+	<path fill="#f6c042" d="M2.93 17.07A10 10 0 1 1 17.07 2.93A10 10 0 0 1 2.93 17.07M9 5v6h2V5zm0 8v2h2v-2z" />
+</svg>
diff --git a/src/layout/components/Header/ConfrimModal.vue b/src/layout/components/Header/ConfrimModal.vue
new file mode 100644
index 0000000..6138e5d
--- /dev/null
+++ b/src/layout/components/Header/ConfrimModal.vue
@@ -0,0 +1,114 @@
+<script lang="ts" setup>
+import { onBeforeMount, ref } from 'vue';
+
+const emit = defineEmits<{
+  (e: 'commit')
+}>()
+const props = defineProps({
+  selectedTotal: {
+    type: Number,
+    default: () => 0,
+  }
+})
+
+const show = ref(false)
+const cardStyle = {
+  'width': '450px',
+  '--n-padding-top': '20px',
+  '--n-padding-bottom': '20px',
+  '--n-padding-left': '20px',
+  '--n-padding-right': '20px',
+}
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal() {
+  show.value = false
+}
+
+defineExpose({
+  showModal,
+})
+
+async function handleSumbit(e: MouseEvent) {
+  e.preventDefault()
+  closeModal()
+  emit('commit')
+}
+
+onBeforeMount(async () => { })
+</script>
+
+<template>
+  <n-modal v-model:show="show" transform-origin="center">
+    <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+      <div class="wrapper">
+        <div class="wrapper-header">
+          <SvgIcon name="exclamation-solid" size="16" />
+          <span class="wrapper-left">确认提示</span>
+        </div>
+        <div class="wrapper-content">
+          已选<span class="highlighted-text">{{ props.selectedTotal }}</span>张图片，确认将所选照片移除可疑夹吗？
+        </div>
+      </div>
+      <template #footer>
+        <div class="wrapper-footer">
+          <n-button type="info" @click="handleSumbit">
+            确定
+          </n-button>
+          <n-button secondary style="margin-left:15px" @click="closeModal">
+            取消
+          </n-button>
+        </div>
+      </template>
+    </n-card>
+  </n-modal>
+</template>
+
+<style lang="less" scoped>
+.wrapper {
+  &-header {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 10px;
+  }
+
+  &-left {
+    font-weight: 600;
+    font-size: 16px;
+    margin-left: 15px;
+  }
+
+  &-content {
+    margin-left: 15px;
+    color: #8e8e8e;
+
+    .highlighted-text {
+      color: #5b85f8;
+      margin: 0 5px;
+    }
+  }
+
+  &-footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+
+::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
+  border: 0px;
+}
+
+::v-deep(.n-card > .n-card-header) {
+  --n-padding-top: 0px;
+  --n-padding-bottom: 12px;
+}
+
+::v-deep(.n-divider:not(.n-divider--vertical)) {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+</style>
diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 4afda80..c9d2d99 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -12,6 +12,7 @@ import { debounce } from 'lodash-es'
 import { audit } from '@/api/task/task'
 import NotPassed from '@/components/Approval/NotPassed.vue'
 import { off, on } from '@/utils/domUtils'
+import ConfrimModal from "./ConfrimModal.vue"
 
 const cardStyle = {
   '--n-padding-bottom': '40px',
@@ -59,6 +60,7 @@ const show = ref(false)
 const selectedApproveItems = ref<any[]>([]); // 审核批量选中
 const dialog = useDialog();
 let processItems: any[] = [];
+const confrimModalRef = ref<any>();
 
 const layout = debounce(() => {
   if (!show.value)
@@ -252,14 +254,8 @@ function closeModal(event: MouseEvent) {
   selectedApproveItems.value = []
   show.value = false
 }
-
-async function remove() {
-  if ( !selectIds.value|| selectIds.value.length === 0) {
-    message.error('至少选中一个')
-    return
-  }
-
-  const ids =  selectIds.value.join(',')
+async function commit() {
+  const ids = selectIds.value.join(',')
   const res = await removeFiles({ pictureid: ids })
   if (res.code === 'OK') {
     message.success('移除成功')
@@ -269,6 +265,13 @@ async function remove() {
     layout()
   }
 }
+ function remove() {
+  if ( !selectIds.value|| selectIds.value.length === 0) {
+    message.error('至少选中一个')
+    return
+  }
+  confrimModalRef?.value?.showModal()
+}
 
 
 function setBatch(value) {
@@ -288,11 +291,9 @@ defineExpose({
   showModal,
 })
 
-const checked = ref(false)
-
 const notPassModalRef = ref(null)
 const showActions = computed(() => {
-  console.log('selectedApproveItems',selectedApproveItems)
+  console.log('selectedApproveItems', selectedApproveItems)
   return selectedApproveItems.value.length > 0 && batch;
 });
 
@@ -385,7 +386,7 @@ function doAudit(param: any) {
 function reloadList() {
   refreshHandler()
 }
-function refreshHandler(){
+function refreshHandler() {
   reset()
   featchList()
 }
@@ -394,14 +395,10 @@ function refreshHandler(){
 
 <template>
   <div>
-    <n-modal
-      v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
-      @after-enter="afterEnter" @after-leave="afterLeave"
-    >
-    <n-card
-    :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge" role="dialog"
-    aria-modal="true"
-    >
+    <n-modal v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
+      @after-enter="afterEnter" @after-leave="afterLeave">
+      <n-card :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge"
+        role="dialog" aria-modal="true">
         <div class="wrapper">
           <div class="wrapper-m32">
             <SvgIcon name="recycle" size="16" />
@@ -436,45 +433,37 @@ function refreshHandler(){
                   批量审批
                 </div>
                 <div v-show="showActions" class="batch">
-                    <n-button text @click="setBatch(false)">
-                      <template #icon>
-                        <SvgIcon name="revoke" />
-                      </template>
-                      返回
-                    </n-button>
-                    <div style="cursor: pointer; margin-left: 16px" @click.stop="rejectHandler">
-                      <SvgIcon width="64" height="28" name="a1" />
-                    </div>
-                    <SvgIcon size="24" name="vs" />
-                    <div style="cursor: pointer" @click.stop="approvalHandler">
-                      <SvgIcon width="64" height="28" name="a2" />
-                    </div>
+                  <n-button text @click="setBatch(false)">
+                    <template #icon>
+                      <SvgIcon name="revoke" />
+                    </template>
+                    返回
+                  </n-button>
+                  <div style="cursor: pointer; margin-left: 16px" @click.stop="rejectHandler">
+                    <SvgIcon width="64" height="28" name="a1" />
+                  </div>
+                  <SvgIcon size="24" name="vs" />
+                  <div style="cursor: pointer" @click.stop="approvalHandler">
+                    <SvgIcon width="64" height="28" name="a2" />
                   </div>
+                </div>
               </div>
             </div>
 
             <div ref="el" class="scroll">
               <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
               <div ref="masonryRef" class="grid">
-                <div
-                  v-for="(item, index) in listData" :key="item.id" :data-id="item.id"
-                  :class="{ 'grid-item-selected': isSelected(item.id) }" :style="{ height: gridHeight }" class="grid-item"
-                >
+                <div v-for="(item, index) in listData" :key="item.id" :data-id="item.id"
+                  :class="{ 'grid-item-selected': isSelected(item.id) }" :style="{ height: gridHeight }"
+                  class="grid-item">
                   <!-- <img
                     class="wrapper-content-item-img"
                     :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
                   > -->
-                  <n-image
-                    :src="item.imgurl"
-                    class="img "
-                    :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }"
-                  />
-                  <n-checkbox
-                    v-if="batch"
-                    v-model:checked="item.checked"
-                    style="position:absolute;left:20px;top:20px" @click.prevent
-                    @update:checked="onCheckChange($event, item)"
-                  />
+                  <n-image :src="item.imgurl" class="img "
+                    :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" />
+                  <n-checkbox v-if="batch" v-model:checked="item.checked" style="position:absolute;left:20px;top:20px"
+                    @click.prevent @update:checked="onCheckChange($event, item)" />
                   <!-- <div class="percent">
                     {{ getPercent(item.pictureid, item) }}
                   </div> -->
@@ -491,6 +480,7 @@ function refreshHandler(){
       </n-card>
     </n-modal>
     <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <ConfrimModal ref="confrimModalRef" @commit="commit" :selectedTotal="selectIds.length"/>
 
   </div>
 </template>
@@ -502,11 +492,9 @@ function refreshHandler(){
   user-select: none;
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
-
-  /* Standard syntax */
 }
 
-.remove{
+.remove {
   cursor: pointer;
 }
 
@@ -538,7 +526,7 @@ function refreshHandler(){
   }
 }
 
-.img{
+.img {
   border-radius: 8px;
 }
 
@@ -553,7 +541,7 @@ function refreshHandler(){
     padding: 24px 0px 12px 0px;
   }
 
-  &-m32{
+  &-m32 {
     margin-left: 32px;
   }
 
@@ -636,21 +624,23 @@ function refreshHandler(){
   }
 }
 
-.wrapper-content-form-button{
+.wrapper-content-form-button {
   cursor: pointer;
 }
 
 .img-fit {
-      width: 100%;
-      overflow: hidden;
-    }
-    .img-full {
-      width: 100%;
-      overflow: hidden;
-      ::v-deep(img) {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-      }
-    }
+  width: 100%;
+  overflow: hidden;
+}
+
+.img-full {
+  width: 100%;
+  overflow: hidden;
+
+  ::v-deep(img) {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+}
 </style>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 305ac53..8d7e2e7 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -607,11 +607,6 @@ function reloadList() {
             <div class="pass-status" v-else-if="item.historyStates === 3">
               <SvgIcon name="no-pass-icon" style="width:52;height:24px" />
             </div>
-            <!-- 
-              重复标签
-            <div class="pass-status" v-if="item.historyStates === 1">
-              <SvgIcon name="repeat-icon" style="width:52;height:24px" />
-            </div> -->
             <div v-show="overTask && overTask.id === item.id" class="action">
               <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
               <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="singleRejectHandler(item)" />

From ef1bfb679cb5cc21e0e8297e10d72d493970127c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 22:11:07 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=88=97=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=BE=E5=AE=A1=E5=BC=B9=E7=AA=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/AdvanceFilter.vue | 12 ++++++--
 src/views/task/modal/CustomSettingModal.vue |  8 +++---
 src/views/worksheet/modal/ApprovalModal.vue | 31 ++++++++++++++-------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 95a4234..44574fa 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -257,7 +257,12 @@ const moveEnd = () => {
             <span style="font-size: 20px; color: #333333; font-weight: Medium">{{
               currentlySelectedAdvanced
             }}</span>
-            <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" color="#999999"/>
+            <SvgIcon
+              :style="{ marginLeft: '5px' }"
+              name="down"
+              size="14"
+              color="#999999"
+            />
           </div>
         </template>
         <n-spin :show="loading">
@@ -265,7 +270,7 @@ const moveEnd = () => {
             <n-form :rules="rules" ref="ruleformRef" :model="ruleForm">
               <n-form-item path="keyword">
                 <n-input
-                  :style="{ '--n-border': '0px' }"
+                  :style="{ '--n-border': '0px', '--n-display': 'block' }"
                   placeholder="请输入关键字"
                   @input="inputHandler"
                   :value="ruleForm.keyword"
@@ -429,4 +434,7 @@ const moveEnd = () => {
     align-items: center;
   }
 }
+::v-deep(.wrapper-left-popover .n-form-item){
+  display: block !important;
+}
 </style>
diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index 8fb0c1c..8f0e590 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/src/views/task/modal/CustomSettingModal.vue
@@ -40,6 +40,9 @@ onMounted(async () => {
         Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
     };
     offList.value.push(item);
+    if(item.checked){
+      selectIds.value.push(item.id);
+    }
   });
 });
 
@@ -131,21 +134,18 @@ function onCheckAllChange(value) {
       ids.push(item.id);
     }
   }
-
   selectIds.value = value ? ids : [];
 }
 
 function onCheckChange(checked: any, item: any) {
   const index = selectIds.value.indexOf(item.id);
-
   item.checked = checked;
-
   if (index === -1 && checked) selectIds.value.push(item.id);
   else selectIds.value.splice(index, 1);
 }
 
 const indeterminate = computed(() => {
-  return offList.value.length > 0 && offList.value.length > selectIds.value.length;
+  return selectIds.value.length > 0 && offList.value.length > selectIds.value.length;
 });
 </script>
 
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 806ae27..28d04bb 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -11,6 +11,7 @@ const emit = defineEmits<{
   (e: "reject", params: any);
   (e: "notPass", params: any);
 }>();
+const message = useMessage()
 
 const dialog = useDialog();
 
@@ -33,25 +34,35 @@ function showModal(id) {
 }
 
 async function getDetail(id) {
-  console.log('getDetail',id)
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
   // id = "264626184091111068";
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
-    show.value = true;
+    if(Number(res.data.similarComplete) > 0){
+      show.value = true;
+    }
   }
 }
 
 const handleReject = async () => {
-  const res = await audit()
-  // const res = await setTF({
-  //   taskchildpictureids: state.detail.taskIdList.join(","),
-  //   packageid: state.packageid,
-  //   iztrueorfalse: 0,
-  // });
-  // console.log(res, "handleReject");
+  const param = {
+    result: false,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: state.detail.flowTaskInfoList,
+  }
+  const res = await audit(param)
+  if(res.code == 'OK'){
+    message.success(res.message)
+  }else{
+    message.error(res.message)
+  }
+  closeModal();
 };
 
 async function clearMark() {
@@ -138,7 +149,7 @@ defineExpose({
             </div>
             <div class="time_box">
               任务包生成时间：
-              {{ format(detail?.createtime || 0, "yyyy-MM-dd HH:mm:ss") }}
+              {{ format(detail?.createTime || 0, "yyyy-MM-dd HH:mm:ss") }}
             </div>
           </div>
         </div>

From ee6f52c1864c84bf7662e5b89881a7cbeddb8eca Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 22:25:39 +0800
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0=20checkDuplicateI?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index bbef956..f7e1259 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -83,7 +83,7 @@ export async function getTaskDetailInfo(checkDuplicateId: string) {
  * @param params
  * @returns
  */
-export async function getTaskDetailPictureList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) {
+export async function getPictureSimilarityList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) {
 
   const res = await http.request({
     url: `/backstage/jifen/ocrtaskchildpicture/getPictureSimilarityList`,
@@ -97,6 +97,7 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa
   const list = records.map((item,index) => {
     return {
       id: item.id,
+      checkDuplicateId: item.checkDuplicateId,
       taskId: item.taskId,
       taskname: item.fromTaskName,
       assignee: item.assignee,

From 15dd6ce13bbbed47cb83efffedbbe3ee025ea3bb Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 22:27:40 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=BC=B9=E7=AA=97=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/modal/ApprovalModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 28d04bb..b0ad148 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -40,7 +40,7 @@ async function getDetail(id) {
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
-    if(Number(res.data.similarComplete) > 0){
+    if(Number(res.data.pendingApprovaCount) > 0){
       show.value = true;
     }
   }

From 85ae4ead310774c29f1800d63a02a803b0471c4a Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 22:28:05 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 8d7e2e7..825192f 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { audit } from '@/api/task/task';
 import {
-getTaskDetailInfo,
-getTaskDetailPictureList
+getPictureSimilarityList, getTaskDetailInfo
 } from "@/api/work/work";
 import NotPassed from '@/components/Approval/NotPassed.vue';
 import { fieldMap } from "@/config/workorder";
@@ -135,7 +134,7 @@ async function featchList() {
   loading.value = true;
   try {
     taskpagination.pageNo += 1;
-    const { data, total, pageCount } = await getTaskDetailPictureList(
+    const { data, total, pageCount } = await getPictureSimilarityList(
       { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.id }
     );
 

From 1e175e2647320043e03c0d44440f064fcac41500 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 23:29:24 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/AdvanceFilter.vue | 6 +++++-
 src/views/worksheet/modal/ApprovalModal.vue | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 44574fa..80595df 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -233,6 +233,10 @@ function unFavoriteHandler(event: MouseEvent, item) {
   }
 }
 
+const handleScroll= (event)=>{
+  console.log(event)
+}
+
 const moveEnd = () => {
   unData.value.map((v, index) => {
     sort(v.id, index);
@@ -291,7 +295,7 @@ const moveEnd = () => {
               </n-form-item>
             </n-form>
 
-            <ul ref="el" class="wrapper-left-list">
+            <ul ref="el" class="wrapper-left-list" @scroll="handleScroll">
               <li
                 v-for="(item, index) in data"
                 :key="index"
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index b0ad148..1170e4b 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -36,7 +36,7 @@ function showModal(id) {
 async function getDetail(id) {
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
-  // id = "264626184091111068";
+  // id = "264627119490116380";
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;

From 68ebf8f3117c1f54fe3202894dc37dd2dc1053d5 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 23:31:14 +0800
Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E5=9B=BE=E7=89=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worksheet/components/PictureInfo.vue      | 183 ++++++++++++++++++
 src/views/worksheet/content/Content.vue       |  38 +---
 2 files changed, 187 insertions(+), 34 deletions(-)
 create mode 100644 src/views/worksheet/components/PictureInfo.vue

diff --git a/src/views/worksheet/components/PictureInfo.vue b/src/views/worksheet/components/PictureInfo.vue
new file mode 100644
index 0000000..a312527
--- /dev/null
+++ b/src/views/worksheet/components/PictureInfo.vue
@@ -0,0 +1,183 @@
+<script setup lang="ts">
+import { fieldMap } from "@/config/workorder";
+import { TASK_STATUS_OBJ } from '@/enums/index';
+import { format } from 'date-fns';
+import { pickBy } from "lodash-es";
+import { computed, defineProps } from "vue";
+
+const props = defineProps({
+  taskDetailInfo: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const propertys = computed(() => {
+  const { ocrPicture } = props.taskDetailInfo;
+  const v = pickBy(ocrPicture, (value, key: string) => {
+    return key.startsWith("field") && value !== null;
+  });
+  return v;
+});
+</script>
+
+<template>
+  <div class="right">
+    <n-scrollbar style="max-height: 100%">
+      <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
+      <div class="tags">
+        <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
+        <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
+        <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+        <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+      </div>
+      <n-divider class="divider-line" />
+      <div class="property">
+        <span class="property-name top" style="color: #666666">图片大小</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSize && (taskDetailInfo.pictureInfo.imgSize / 1000).toFixed(2) }}KB</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">图片格式</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgFormat }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">图片尺寸</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">色彩空间</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">提报人</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.upname || "-" }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">创建时间</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.createTime }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">提报时间</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.submitDateTimestamp && format(taskDetailInfo.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
+      </div>
+      <div v-for="(value, key) in propertys" :key="key" class="property">
+        <span class="property-name">{{ fieldMap[key] }}</span>
+        <span class="property-content">{{ value }}</span>
+      </div>
+    </n-scrollbar>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.right {
+  // flex: 1;
+  // display: flex;
+  // flex-direction: column;
+  // justify-content: space-between;
+  // // background: #fafafa;
+
+  // border-radius: 8px;
+  // margin-left: 20px;
+  // padding: 24px;
+  // width: 24vw;
+  flex: 0.5;
+  background: #f9f9f9;
+  border-radius: 8px;
+  margin-left: 20px;
+  padding: 24px;
+  // background: lime;
+
+
+  .task-name {
+    display: inline-block;
+    width: 100%;
+    font-size: 18px;
+    color: #0d0b22;
+    line-height: 25px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: Medium;
+    max-width: 445px;
+    /* 设置文本溢出时的样式为省略号 */
+    text-overflow: ellipsis;
+    /* 隐藏超出容器的文本 */
+    overflow: hidden;
+    /* 确保文本不换行 */
+    white-space: nowrap;
+  }
+
+  // ::v-deep(.n-divider:not(.n-divider--vertical)) {
+
+  ::v-deep(.divider-line .n-divider__line) {
+    background-color: #e8e8e8;
+  }
+
+  .tags {
+    display: flex;
+    margin-top: 8px;
+  }
+
+  .tag {
+    border: 1px solid #d8d8d8;
+    box-sizing: border-box;
+    border-radius: 8px;
+    color: #666666;
+    margin-right: 12px;
+    padding: 4px 8px;
+    font-size: 12px;
+    line-height: 16px;
+  }
+
+  .tag-submited {
+    color: #507AFD;
+    border: 1px solid #507AFD;
+  }
+
+  .tag-submiting {
+    color: #FFB800;
+    border: 1px solid #FFB800;
+  }
+
+  .tag-passed {
+    color: #02C984;
+    border: 1px solid #02C984;
+  }
+
+  .tag-not-passed {
+    color: #ff7575;
+    border: 1px solid #ff7575;
+  }
+
+  .tag-approved {
+    color: #507afd;
+    border: 1px solid #507afd;
+  }
+
+  .property {
+    display: flex;
+    align-items: center;
+    margin-top: 12px;
+    line-height: 20px;
+  }
+
+  .property-name {
+    width: 56px;
+    text-align: right;
+    color: #999999;
+    position: relative;
+    margin-right: 32px;
+  }
+
+  .top {}
+
+  .property-content {
+    flex: 1;
+    color: #333333;
+  }
+}
+
+
+::v-deep(.n-divider:not(.n-divider--vertical)) {
+  margin-top: 12px;
+  margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 825192f..aa732d6 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -4,7 +4,6 @@ import {
 getPictureSimilarityList, getTaskDetailInfo
 } from "@/api/work/work";
 import NotPassed from '@/components/Approval/NotPassed.vue';
-import { fieldMap } from "@/config/workorder";
 import { TASK_STATUS_OBJ } from '@/enums/index';
 import { useWorkOrder } from "@/store/modules/workOrder";
 import { isEmpty } from "@/utils";
@@ -17,6 +16,7 @@ import imagesloaded from "imagesloaded";
 import { clone, debounce, pickBy } from "lodash-es";
 import { useDialog, useMessage } from "naive-ui";
 import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
+import PictureInfo from "../components/PictureInfo.vue";
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { ApprovalParam, SimilarityPictureSortParam } from "/#/api";
 
@@ -486,18 +486,10 @@ function reloadList() {
             </div>
           </div>
           <!-- 右侧任务 标题信息 -->
-          <div class="right">
+          <!-- <div class="right">
             <n-scrollbar style="max-height: 100%">
               <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
               <div class="tags">
-                <!-- <div class="tag tag-submiting" v-if="taskDetailInfo.workStatus == '1'">{{ TASK_STATUS_OBJ[taskDetailInfo.workStatus]
-                }}</div>
-                <div class="tag tag-submited" v-else-if="taskDetailInfo.workStatus == '2'">已审批</div>
-                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates]
-                }}</div> -->
                 <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
                 <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
                 <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
@@ -549,7 +541,8 @@ function reloadList() {
                 <span class="property-content">{{ propertys[key] }}</span>
               </div>
             </n-scrollbar>
-          </div>
+          </div> -->
+          <PictureInfo :taskDetailInfo="taskDetailInfo"></PictureInfo>
         </div>
         <div style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0">
           <div>
@@ -669,29 +662,6 @@ function reloadList() {
       }
     }
 
-    .right {
-      display: flex;
-      align-items: center;
-
-      .btn {
-        width: 118px;
-        height: 36px;
-        background: linear-gradient(135deg, #5b85f8, #3c6cf0);
-        border-radius: 17px;
-        box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: #fff;
-        cursor: pointer;
-      }
-
-      .batch {
-        display: flex;
-        align-items: center;
-      }
-    }
-
     .font {
       font-size: 20px;
       font-family: PingFang SC, PingFang SC-Medium;