diff --git a/mock/user/user.ts b/mock/user/user.ts
index ff5816e..66bb4b5 100644
--- a/mock/user/user.ts
+++ b/mock/user/user.ts
@@ -23,7 +23,7 @@ const adminInfo = {
       value: 'task-main',
     },
     {
-      label: '图审审批管理',
+      label: '图审审批',
       value: 'worksheet-main',
     },
   ],
diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index f7e1259..ac3aed9 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -22,7 +22,7 @@ export async function getPackageList(params: PageParam, packageName: string) {
 }
 
 /**
- * 任务包列表主图-新 
+ * 任务包列表主图-新
  * @returns
  */
 export async function getPackagePicture(params: PageParam, packagename: string) {
@@ -62,12 +62,11 @@ export async function getPackageTaskList(packageid: string, params: PageParam) {
 }
 
 /**
- * 任务包列表主图-新 
+ * 任务包列表主图-新
  * @param checkDuplicateId  查重id
  * @returns
  */
 export async function getTaskDetailInfo(checkDuplicateId: string) {
-
   const res = await http.request({
     url: `/ocr/ocrPicture/getPackagePicture?checkDuplicateId=${checkDuplicateId}`,
     method: 'get',
@@ -75,7 +74,18 @@ export async function getTaskDetailInfo(checkDuplicateId: string) {
 
   return res.data
 }
-
+/**
+ * 移动到可疑文件夹
+ * @param pictureid 图片id 多个 逗号分割 xx,xx,xx,xx
+ * @returns
+ */
+export async function dubiousfileyd(pictureid: string) {
+  const res = await http.request({
+    url: `/ocr/dubiousfile/dubiousfileyd?pictureid=${pictureid}`,
+    method: 'get',
+  })
+  return res.data
+}
 /**
  *  获取某个任务详情(相似图片列表)
  * @param packageid 任务包id
@@ -84,7 +94,6 @@ export async function getTaskDetailInfo(checkDuplicateId: string) {
  * @returns
  */
 export async function getPictureSimilarityList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) {
-
   const res = await http.request({
     url: `/backstage/jifen/ocrtaskchildpicture/getPictureSimilarityList`,
     method: 'get',
@@ -94,7 +103,7 @@ export async function getPictureSimilarityList(params: PageParam & PictureSortPa
   const { data: { records, pages, total } } = res
 
   // 精简一下数据
-  const list = records.map((item,index) => {
+  const list = records.map((item, index) => {
     return {
       id: item.id,
       checkDuplicateId: item.checkDuplicateId,
@@ -108,9 +117,9 @@ export async function getPictureSimilarityList(params: PageParam & PictureSortPa
       iztrueorfalse: item.iztrueorfalse,
       states: item.states,
       history: item.ocpictureid && item.picturecompare && hasHistory(item.ocpictureid, item.picturecompare),
-      historyStates:item.historyStates,
-      submitDateTimestamp:item.submitDateTimestamp,
-      photoDateTimestamp:item.photoDateTimestamp,
+      historyStates: item.historyStates,
+      submitDateTimestamp: item.submitDateTimestamp,
+      photoDateTimestamp: item.photoDateTimestamp,
     }
   })
   return {
diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue
index 8c42ca5..e0b9d3e 100644
--- a/src/components/DataHeader/index.vue
+++ b/src/components/DataHeader/index.vue
@@ -1,76 +1,80 @@
-<template>
-  <div class="header_wrap">
-    <div v-for="(item, index) in data" :key="index" class="header_item">
-      <SvgIcon :name="item.link"/>
-      <div class="data_wrap">
-        <div class="data_title" :style="hasColor?`color:${item.color || ''}`:''">{{ item.count }}</div>
-        <div class="data_content">{{ item.title }}</div>
-      </div>
-    </div>
-    <SvgIcon size="14px" style="cursor: pointer" name="setting" class="settingSvg"></SvgIcon>
-  </div>
-</template>
-
 <script lang="ts" setup>
-import { defineProps, onMounted } from "vue";
+import { defineProps, onMounted } from 'vue'
 
 defineProps({
   hasColor: {
     type: Boolean,
     default: () => false,
   },
-});
-const initRem = () => {
-  const designWidth = 1440;
-  const rempPx = 16;
-  const scale = window.innerWidth / designWidth;
-  document.documentElement.style.fontSize = scale * rempPx + "px";
-};
-onMounted(()=>{
-  initRem();
+})
+function initRem() {
+  const designWidth = 1440
+  const rempPx = 16
+  const scale = window.innerWidth / designWidth
+  document.documentElement.style.fontSize = `${scale * rempPx}px`
+}
+onMounted(() => {
+  initRem()
 })
 
 const data = [
   {
-    link: "count",
-    title: "任务总数",
+    link: 'count',
+    title: '任务总数',
     count: 6399,
   },
   {
-    link: "wait",
-    title: "待审批",
+    link: 'wait',
+    title: '待审批',
     count: 6290,
   },
   {
-    link: "done",
-    title: "已审批",
+    link: 'done',
+    title: '已审批',
     count: 109,
   },
   {
-    link: "resolve",
-    title: "通过",
+    link: 'resolve',
+    title: '通过',
     count: 3290,
-    color: "#03c984",
+    color: '#03c984',
   },
   {
-    link: "reject",
-    title: "不通过",
+    link: 'reject',
+    title: '不通过',
     count: 3000,
-    color: "#ff8b8b",
+    color: '#ff8b8b',
   },
   {
-    link: "reimg",
-    title: "图片重复数",
+    link: 'reimg',
+    title: '图片重复数',
     count: 230,
   },
   {
-    link: "breakcount",
-    title: "小结重复数",
+    link: 'breakcount',
+    title: '小结重复数',
     count: 365,
   },
-];
+]
 </script>
 
+<template>
+  <div class="header_wrap">
+    <div v-for="(item, index) in data" :key="index" class="header_item">
+      <SvgIcon :name="item.link" />
+      <div class="data_wrap">
+        <div class="data_title" :style="hasColor ? `color:${item.color || ''}` : ''">
+          {{ item.count }}
+        </div>
+        <div class="data_content">
+          {{ item.title }}
+        </div>
+      </div>
+    </div>
+    <SvgIcon size="14px" style="cursor: pointer" name="setting" class="settingSvg" />
+  </div>
+</template>
+
 <style scoped lang="less">
 .header_wrap {
   display: flex;
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 9756995..6b0b8b9 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -11,11 +11,11 @@ import { msgPolling } from '@/api/message/message'
 import { getImgUrl } from '@/utils/urlUtils'
 import { useUser } from '@/store/modules/user'
 import { useTaskStore } from '@/store/modules/task'
-import defaultAvatar from '@/assets/icons/avatar.svg';
+import defaultAvatar from '@/assets/icons/avatar.svg'
 
-const taskStore = useTaskStore();
+const taskStore = useTaskStore()
 export default defineComponent({
-  name: "PageHeader",
+  name: 'PageHeader',
   components: {
     UserSettings,
     QuillModal,
@@ -31,139 +31,140 @@ export default defineComponent({
       type: Boolean,
     },
   },
-  emits: ["update:collapsed"],
+  emits: ['update:collapsed'],
   setup() {
-    const message = useMessage();
-    const dialog = useDialog();
+    const message = useMessage()
+    const dialog = useDialog()
 
-    const userStore = useUser();
-    const useInfo = userStore.getUserInfo;
+    const userStore = useUser()
+    const useInfo = userStore.getUserInfo
 
-    const name = "";
+    const name = ''
 
     const state = reactive({
-      username: name ?? "",
-      fullscreenIcon: "FullscreenOutlined",
-    });
+      username: name ?? '',
+      fullscreenIcon: 'FullscreenOutlined',
+    })
 
-    const router = useRouter();
-    const route = useRoute();
-    const routename = ref(route.meta.title);
+    const router = useRouter()
+    const route = useRoute()
+    const routename = ref(route.meta.title)
     // 图标列表mm
     const iconList = ref([
       {
-        icon: "magnifying-1",
+        icon: 'magnifying-1',
         handle: searchHandler,
       },
       {
-        icon: "shortcut-keys",
+        icon: 'shortcut-keys',
         handle: shortcutHandler,
       },
       {
-        icon: "suspicious-folder",
+        icon: 'suspicious-folder',
         handle: recycleHandler,
       },
       {
-        icon: "memo",
+        icon: 'memo',
         handle: quillHandler,
       },
       {
-        icon: "nomessage",
+        icon: 'nomessage',
         handle: goMessage,
       },
-    ]);
+    ])
 
     watch(
       () => route.fullPath,
       () => {
-        routename.value = route.meta.title;
-      }
-    );
+        routename.value = route.meta.title
+      },
+    )
 
     const handleDragOver = (event, item) => {
-      taskStore.setInFile(true);
-    };
+      taskStore.setInFile(true)
+    }
 
     const handleDragLeave = (event, item) => {
-      taskStore.setInFile(false);
-    };
+      taskStore.setInFile(false)
+    }
 
     const dropdownSelect = (key) => {
-      router.push({ name: key });
-    };
+      router.push({ name: key })
+    }
 
     // 退出登录
     const doLogout = () => {
       dialog.info({
-        title: "提示",
-        content: "您确定要退出登录吗",
-        positiveText: "确定",
-        negativeText: "取消",
+        title: '提示',
+        content: '您确定要退出登录吗',
+        positiveText: '确定',
+        negativeText: '取消',
         onPositiveClick: () => {
           userStore.logout().then(() => {
-            message.success("成功退出登录");
+            message.success('成功退出登录')
             router
               .replace({
-                name: "Login",
+                name: 'Login',
                 query: {
                   // redirect: route.fullPath,
                 },
               })
-              .finally(() => location.reload());
-          });
+              .finally(() => location.reload())
+          })
         },
         onNegativeClick: () => {},
-      });
-    };
+      })
+    }
 
-    const quillModalRef = ref(null);
-    const shortcutModal = ref(null);
-    const recycleModalRef = ref(null);
-    const SearchModalRef = ref(null);
+    const quillModalRef = ref(null)
+    const shortcutModal = ref(null)
+    const recycleModalRef = ref(null)
+    const SearchModalRef = ref(null)
 
     function quillHandler() {
-      const modal = unref(quillModalRef)! as any;
-      modal.showModal();
+      const modal = unref(quillModalRef)! as any
+      modal.showModal()
     }
 
     function shortcutHandler() {
-      const modal = unref(shortcutModal)! as any;
-      modal.showModal();
+      const modal = unref(shortcutModal)! as any
+      modal.showModal()
     }
 
     function recycleHandler() {
-      const modal = unref(recycleModalRef)! as any;
-      modal.showModal();
+      const modal = unref(recycleModalRef)! as any
+      modal.showModal()
     }
 
     function searchHandler() {
-      const modal = unref(SearchModalRef)! as any;
-      modal.showModal();
+      const modal = unref(SearchModalRef)! as any
+      modal.showModal()
     }
 
     function goMessage() {
-      router.push({ name: "message-main" });
+      router.push({ name: 'message-main' })
     }
 
     async function getMessage() {
-      const res = await msgPolling();
-      if (res.data) iconList.value[4].icon = "hasmessage";
-      else iconList.value[4].icon = "nomessage";
+      const res = await msgPolling()
+      if (res.data)
+        iconList.value[4].icon = 'hasmessage'
+      else iconList.value[4].icon = 'nomessage'
     }
     setInterval(() => {
-      getMessage();
-    }, 5000);
+      getMessage()
+    }, 5000)
 
-    const mousetrap = inject("mousetrap") as any;
+    const mousetrap = inject('mousetrap') as any
     onMounted(() => {
-      getMessage();
-      mousetrap.bind("n r", quillHandler);
-      mousetrap.bind("n t", quillHandler);
-      mousetrap.bind("n n", recycleHandler);
-      mousetrap.bind("m m", searchHandler);
-    });
+      getMessage()
+      mousetrap.bind('n r', quillHandler)
+      mousetrap.bind('n t', quillHandler)
+      mousetrap.bind('n n', recycleHandler)
+      mousetrap.bind('m m', searchHandler)
+    })
 
-    const defaultAvatarSrc = ref(defaultAvatar);
+    const defaultAvatarSrc = ref(defaultAvatar)
 
     return {
       ...toRefs(state),
@@ -187,7 +188,7 @@ export default defineComponent({
       defaultAvatarSrc,
     }
   },
-});
+})
 </script>
 
 <template>
@@ -226,7 +227,7 @@ export default defineComponent({
       <!-- 个人中心 -->
       <div class="layout-header-trigger layout-header-trigger-min">
         <!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
-        <n-avatar style="width:36px;height:36px;" :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round/>
+        <n-avatar style="width:36px;height:36px;" :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round />
       </div>
       <!-- 设置 -->
       <UserSettings @logout="doLogout" />
diff --git a/src/router/modules/worksheet.ts b/src/router/modules/worksheet.ts
index d80eb8d..9f1d082 100644
--- a/src/router/modules/worksheet.ts
+++ b/src/router/modules/worksheet.ts
@@ -1,5 +1,5 @@
-import { Layout } from '@/router/constant'
 import type { RouteRecordRaw } from 'vue-router'
+import { Layout } from '@/router/constant'
 
 /**
  * @param name 路由名称, 必须设置,且不能重名
@@ -19,7 +19,7 @@ const routes: Array<RouteRecordRaw> = [
     redirect: '/worksheet',
     component: Layout,
     meta: {
-      title: '图审审批管理',
+      title: '图审审批',
       permissions: ['worksheet-main'],
       svgname: 'worksheet',
       svgsize: 22,
@@ -30,7 +30,7 @@ const routes: Array<RouteRecordRaw> = [
         path: 'worksheet',
         name: 'worksheet-main',
         meta: {
-          title: '图审审批管理',
+          title: '图审审批',
         },
         component: () => import('@/views/worksheet/index.vue'),
       },
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index d52817a..ab16fb7 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -124,10 +124,9 @@ export const useUserStore = defineStore({
         // 默认设置为第一个租户
         const firstTenant = data.tenantList.length > 0 ? data.tenantList[0] : null
         const tenantId = firstTenant ? firstTenant.id : ''
-        data.frontmenuTList.forEach(ele=>{
-          if(ele.description === 'AI工单'){
-            ele.description = '图审审批管理'
-          }
+        data.frontmenuTList.forEach((ele) => {
+          if (ele.description === 'AI工单')
+            ele.description = '图审审批'
         })
         storage.set(CURRENT_USER, data, ex)
         storage.set(TENANT_ID, tenantId)
diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue
index 085ccd9..8361da7 100644
--- a/src/views/final/comp/CustomTabelModal.vue
+++ b/src/views/final/comp/CustomTabelModal.vue
@@ -1,97 +1,98 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-import { ColumnsMap } from "@/config/final";
-import { useUser } from "@/store/modules/user";
-import { difference } from "lodash-es";
-import { computed, onMounted, ref, watch } from "vue";
-import { VueDraggable } from "vue-draggable-plus";
+import { difference } from 'lodash-es'
+import { computed, onMounted, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { ColumnsMap } from '@/config/final'
+import { useUser } from '@/store/modules/user'
 
-const emit = defineEmits<{
-  (e: "commit", columns: any[]);
-}>();
-
-// 左侧隐藏列表
-const offList = ref<any[]>([]);
-// 右侧显示列表
-const fixLeftList = ref<any[]>([]);
-const onList = ref<any[]>([]);
 const props = defineProps({
   reviewType: {
     type: Number,
     default: () => 0,
     require: true,
   },
-});
+})
 
+const emit = defineEmits<{
+  (e: 'commit', columns: any[])
+}>()
+
+// 左侧隐藏列表
+const offList = ref<any[]>([])
+// 右侧显示列表
+const fixLeftList = ref<any[]>([])
+const onList = ref<any[]>([])
 onMounted(async () => {
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(props.reviewType); //所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(props.reviewType, userInfo.id); //当前用户选择的项目
-  const useList = res.data;
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(props.reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(props.reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
   /**
    * name 标题
    * id 键值
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
-  let mustList = [];
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
+  const mustList = []
   allList?.map((v) => {
-    let item = {
+    const item = {
       name: v.fieldDesc,
       id: v.name,
       fix: v.isrequired == 2,
       checked:
-        v.isrequired == 2 ||
-        Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
-        Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
-    };
-    if (item.fix) {
-      mustList.push(item);
-      if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
-        fixLeftList.value.push(item);
-      }
-    }
-    if (userFieldFixed?.find((v2) => v2 == v.name)) {
-      fixLeftList.value.push(item);
+        v.isrequired == 2
+        || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+        || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
     }
-    if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
-      onList.value.push(item);
+    if (item.fix) {
+      mustList.push(item)
+      if (!userFieldFixed?.length && !userFieldUnFixed?.length)
+        fixLeftList.value.push(item)
     }
-    offList.value.push(item);
-  });
-});
+    if (userFieldFixed?.find(v2 => v2 == v.name))
+      fixLeftList.value.push(item)
+
+    if (userFieldUnFixed?.find(v2 => v2 == v.name))
+      onList.value.push(item)
+
+    offList.value.push(item)
+  })
+})
 
 const allCount = computed(() => {
-  return `全部字段(共${offList.value.length - 1}个)`;
-});
+  return `全部字段(共${offList.value.length - 1}个)`
+})
 
 const selectCount = computed(() => {
-  return `显示字段(共${onList.value.length}个)`;
-});
+  return `显示字段(共${onList.value.length}个)`
+})
 
 function generatList() {
-  const keys = Object.keys(ColumnsMap);
+  const keys = Object.keys(ColumnsMap)
   // const showStr = 'name'
   // const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
 
   for (const key of keys) {
-    const { title, fixed, fixLeft, width } = ColumnsMap[key];
+    const { title, fixed, fixLeft, width } = ColumnsMap[key]
     const item = {
       id: key,
       title,
       fix: fixed,
       checked: ColumnsMap[key].fixed,
       width,
-    };
+    }
 
-    if (!fixed) offList.value.push(item);
+    if (!fixed)
+      offList.value.push(item)
 
-    if (fixLeft) fixLeftList.value.push(item);
+    if (fixLeft)
+      fixLeftList.value.push(item)
   }
 
   // showList = showKeys.reduce((acc, key) => {
@@ -103,18 +104,18 @@ function generatList() {
   //   return [...acc, config]
   // }, [])
 
-  const fixedList = generateDefaultList();
+  const fixedList = generateDefaultList()
   const filterList = fixedList.filter((item) => {
-    return !item.fixLeft;
-  });
+    return !item.fixLeft
+  })
 
-  onList.value.unshift(...filterList);
-  offList.value.unshift(...fixedList);
+  onList.value.unshift(...filterList)
+  offList.value.unshift(...fixedList)
 }
 
 function generateDefaultList() {
   return Object.keys(ColumnsMap).reduce((acc, key) => {
-    const { title, fixed, fixLeft, width } = ColumnsMap[key];
+    const { title, fixed, fixLeft, width } = ColumnsMap[key]
 
     if (fixed) {
       const config = {
@@ -124,115 +125,117 @@ function generateDefaultList() {
         checked: true,
         fixLeft,
         width,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 }
 
-const show = ref(false);
-const checkAll = ref(false);
+const show = ref(false)
+const checkAll = ref(false)
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  e.preventDefault();
-  closeModal();
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let userFieldFixed = "";
-  let userFieldUnFixed = "";
+  e.preventDefault()
+  closeModal()
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let userFieldFixed = ''
+  let userFieldUnFixed = ''
   fixLeftList.value.map((v) => {
-    userFieldFixed += `${v.id},`;
-  });
+    userFieldFixed += `${v.id},`
+  })
   onList.value.map((v) => {
-    userFieldUnFixed += `${v.id},`;
-  });
-  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1);
-  userFieldUnFixed = userFieldUnFixed.slice(0, userFieldUnFixed.length - 1);
-  savefield(props.reviewType, userInfo.id, userFieldFixed, userFieldUnFixed);
+    userFieldUnFixed += `${v.id},`
+  })
+  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1)
+  userFieldUnFixed = userFieldUnFixed.slice(0, userFieldUnFixed.length - 1)
+  savefield(props.reviewType, userInfo.id, userFieldFixed, userFieldUnFixed)
   const columns: any[] = [
     {
-      type: "selection",
-      fixed: "left",
+      type: 'selection',
+      fixed: 'left',
       width: 50,
     },
-  ];
+  ]
 
   const leftList = fixLeftList.value.map((item) => {
     return {
       title: item.name,
       key: item.id,
-      fixed: "left",
+      fixed: 'left',
       width: 120,
-    };
-  });
+    }
+  })
 
   const unfixList = onList.value.map((item) => {
     return {
       title: item.name,
       key: item.id,
       width: 120,
-    };
-  });
+    }
+  })
 
-  columns.push(...leftList, ...unfixList);
-  emit("commit", columns);
+  columns.push(...leftList, ...unfixList)
+  emit('commit', columns)
 }
 
 defineExpose({
   showModal,
-});
+})
 
 // generatList()
 
-const selectIds = ref<string[]>([]);
+const selectIds = ref<string[]>([])
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
   if (value) {
     offList.value.map((v) => {
-      if (!v.checked) {
-        onList.value.push(v);
-      }
-    });
-  } else {
-    onList.value = [];
-    fixLeftList.value = [];
+      if (!v.checked)
+        onList.value.push(v)
+    })
+  }
+  else {
+    onList.value = []
+    fixLeftList.value = []
     offList.value.map((v) => {
-      if (v.fix) {
-        fixLeftList.value.push(v);
-      }
-    });
+      if (v.fix)
+        fixLeftList.value.push(v)
+    })
   }
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
 }
 
 function onCheckChange(checked: any, item: any) {
-  item.checked = checked;
+  item.checked = checked
   if (checked) {
-    onList.value.push(item);
-  } else {
-    let index = onList.value.findIndex((v) => v.id == item.id);
+    onList.value.push(item)
+  }
+  else {
+    let index = onList.value.findIndex(v => v.id == item.id)
     if (index > -1) {
-      onList.value.splice(index, 1);
-    } else {
-      index = fixLeftList.value.findIndex((v) => v.id == item.id);
-      fixLeftList.value.splice(index, 1);
+      onList.value.splice(index, 1)
+    }
+    else {
+      index = fixLeftList.value.findIndex(v => v.id == item.id)
+      fixLeftList.value.splice(index, 1)
     }
   }
   // TODO 与现有逻辑冲突 暂时注释
@@ -242,24 +245,26 @@ function onCheckChange(checked: any, item: any) {
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id;
-  });
-});
+    return item.id
+  })
+})
 
 watch(
   () => selectIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const action = newVal > oldVal ? "add" : "remove";
-    const diff: string[] =
-      action === "add"
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff: string[]
+      = action === 'add'
         ? difference(selectIds.value, showIds.value)
-        : difference(showIds.value, selectIds.value);
+        : difference(showIds.value, selectIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
-    if (action === "add") {
+    if (action === 'add') {
       for (const item of offList.value) {
         if (!item.fix && diff.includes(item.id)) {
           onList.value.push({
@@ -267,77 +272,81 @@ watch(
             name: item.name,
             fix: item.fix || false,
             width: 120,
-          });
+          })
         }
       }
-    } else {
-      const list = onList.value;
+    }
+    else {
+      const list = onList.value
       for (let index = 0; index < list.length; index++) {
-        const item = list[index];
+        const item = list[index]
         if (!item.fix && diff.includes(item.id)) {
-          list.splice(index, 1);
-          return;
+          list.splice(index, 1)
+          return
         }
       }
     }
-  }
-);
+  },
+)
 
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const diff = difference(selectIds.value, showIds.value);
+    const diff = difference(selectIds.value, showIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
     for (const item of offList.value) {
       if (!item.fix && diff.includes(item.id)) {
-        const index = selectIds.value.indexOf(item.id);
-        item.checked = false;
-        selectIds.value.splice(index, 1);
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
       }
     }
-  }
-);
+  },
+)
 
 function clearDragSource() {
   onList.value = onList.value.filter((item) => {
-    return item.fix === true;
-  });
+    return item.fix === true
+  })
 }
 
-function removeHandler(id: string, type: "fix" | "unfix") {
-  const list = type === "fix" ? fixLeftList.value : onList.value;
+function removeHandler(id: string, type: 'fix' | 'unfix') {
+  const list = type === 'fix' ? fixLeftList.value : onList.value
 
   let index = list.findIndex((item) => {
-    return item.id === id;
-  });
+    return item.id === id
+  })
 
-  if (index !== -1) list.splice(index, 1);
-  index = offList.value.findIndex((v) => v.id == id);
+  if (index !== -1)
+    list.splice(index, 1)
+  index = offList.value.findIndex(v => v.id == id)
   if (index !== -1) {
-    offList.value[index].checked = false;
-  } else {
-    index == fixLeftList.value.findIndex((v) => v.id == id);
-    fixLeftList.value[index].checked = false;
+    offList.value[index].checked = false
+  }
+  else {
+    index == fixLeftList.value.findIndex(v => v.id == id)
+    fixLeftList.value[index].checked = false
   }
 }
 
 const indeterminate = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
+    if (v.fix)
+      baseNum += 1
+  })
   return (
-    onList.value.length + fixLeftList.value.length - baseNum > 0 &&
-    offList.value.length - baseNum >
-      onList.value.length + fixLeftList.value.length - baseNum
-  );
-});
+    onList.value.length + fixLeftList.value.length - baseNum > 0
+    && offList.value.length - baseNum
+    > onList.value.length + fixLeftList.value.length - baseNum
+  )
+})
 </script>
 
 <template>
@@ -376,8 +385,8 @@ const indeterminate = computed(() => {
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全部"
-                      @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
+                      @update:checked="onCheckAllChange"
                     />
                   </div>
                   <div class="content">
@@ -475,7 +484,9 @@ const indeterminate = computed(() => {
 
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
+          <n-button type="info" @click="handleSumbit">
+            确定
+          </n-button>
           <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
           </n-button>
@@ -543,7 +554,7 @@ const indeterminate = computed(() => {
 .textbtnStyle {
   cursor: pointer;
   color: #507AFD;
-  
+
 }
 
 .drag-wrapper {
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index f65a440..591a015 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -1,201 +1,209 @@
 <script lang="ts" setup>
 import {
   computed,
+  nextTick,
   onMounted,
   onUnmounted,
   reactive,
   ref,
   unref,
   watch,
-  nextTick,
-} from "vue";
-import { chunk, clone } from "lodash-es";
-import { useDialog, useMessage } from "naive-ui";
-import { useRoute, useRouter } from "vue-router";
-import BatchModal from "../modal/BatchModal.vue";
-import CustomSettingModal from "../modal/CustomSettingModal.vue";
-import PictureTable from "./PictureTable.vue";
-import TaskTable from "./TaskTable.vue";
-import History from "./History.vue";
-import NotPassed from "@/components/Approval/NotPassed.vue";
-import { getAllfieldList, getfieldList } from "@/api/home/filter";
-import { TASK_STATUS_OBJ } from "@/enums/index";
-import { useFinal } from "@/store/modules/final";
-import { useInfiniteScroll } from "@vueuse/core";
+} from 'vue'
+import { chunk, clone } from 'lodash-es'
+import { useDialog, useMessage } from 'naive-ui'
+import { useRoute, useRouter } from 'vue-router'
+import { useInfiniteScroll } from '@vueuse/core'
+import BatchModal from '../modal/BatchModal.vue'
+import CustomSettingModal from '../modal/CustomSettingModal.vue'
+import PictureTable from './PictureTable.vue'
+import TaskTable from './TaskTable.vue'
+import History from './History.vue'
+import NotPassed from '@/components/Approval/NotPassed.vue'
+import { getAllfieldList, getfieldList } from '@/api/home/filter'
+import { TASK_STATUS_OBJ } from '@/enums/index'
+import { useFinal } from '@/store/modules/final'
 import {
   audit,
   dubiousfileyd,
   getSimilarityList,
   getTaskDetailInfo,
-} from "@/api/task/task";
-import { useTask } from "@/store/modules/task";
-import { useUser } from "@/store/modules/user";
-import { isEmpty } from "@/utils";
-import { formatToDateHMS } from "@/utils/dateUtil";
-import { hideDownload } from "@/utils/image";
-
-const emit = defineEmits(["setAsideItemName"]);
-
-const router = useRouter();
-const loading = ref(false);
-const batch = ref(false);
-const batchtwo = ref(false);
-const selectItems = ref<any[]>([]);
-const message = useMessage();
-const dialog = useDialog();
-const notPassModalRef = ref(null);
-const batchModalRef: any = ref(null);
-const totalCount = ref(0);
-const taskId: any = ref(""); // 任务id
-const packageId: any = ref(""); // 包id
-const CustomSettingModalRef = ref(null);
-const taskTableData = ref<any[]>([]);
-const route = useRoute();
-const isDetail = ref(false); // 是否是详情
-const finalStore = useFinal();
-const imgbigshow = ref(true);
+} from '@/api/task/task'
+import { useTask } from '@/store/modules/task'
+import { useUser } from '@/store/modules/user'
+import { isEmpty } from '@/utils'
+import { formatToDateHMS } from '@/utils/dateUtil'
+import { hideDownload } from '@/utils/image'
+
+const emit = defineEmits(['setAsideItemName'])
+
+const router = useRouter()
+const loading = ref(false)
+const batch = ref(false)
+const batchtwo = ref(false)
+const selectItems = ref<any[]>([])
+const message = useMessage()
+const dialog = useDialog()
+const notPassModalRef = ref(null)
+const batchModalRef: any = ref(null)
+const totalCount = ref(0)
+const taskId: any = ref('') // 任务id
+const packageId: any = ref('') // 包id
+const CustomSettingModalRef = ref(null)
+const taskTableData = ref<any[]>([])
+const route = useRoute()
+const isDetail = ref(false) // 是否是详情
+const finalStore = useFinal()
+const imgbigshow = ref(true)
 const sortBy: any = {
-  orderType: "desc",
-  orderName: "similarityScore",
-};
-const el = ref<HTMLDivElement | null>(null);
+  orderType: 'desc',
+  orderName: 'similarityScore',
+}
+const el = ref<HTMLDivElement | null>(null)
 const pagination = reactive({
   pageNo: 0,
   pageSize: 30,
-});
+})
 function onCheckChange(checked: any, item: any) {
-  const index = selectItems.value.indexOf(item);
-  item.checked = checked;
+  const index = selectItems.value.indexOf(item)
+  item.checked = checked
 
-  if (index === -1 && checked) selectItems.value.push(item);
-  else selectItems.value.splice(index, 1);
+  if (index === -1 && checked)
+    selectItems.value.push(item)
+  else selectItems.value.splice(index, 1)
 }
 
 const showActions = computed(() => {
-  return selectItems.value.length > 0 && batch;
-});
+  return selectItems.value.length > 0 && batch
+})
 
 const taskpagination = reactive({
   pageNo: 1,
   pageSize: 30,
-});
-const taskStore = useTask();
-const overTask = ref<any>(null);
-const overTasktwo = ref<any>(null);
-const taskDetailInfo = ref<any>({});
-const taskDetailPictureList = ref<any[]>([]);
-const userStore = useUser();
-const imageRef = ref<ComponentElRef | null>();
-let processItems: any[] = [];
-const isFullScreen = ref(false);
+})
+const taskStore = useTask()
+const overTask = ref<any>(null)
+const overTasktwo = ref<any>(null)
+const taskDetailInfo = ref<any>({})
+const taskDetailPictureList = ref<any[]>([])
+const userStore = useUser()
+const imageRef = ref<ComponentElRef | null>()
+let processItems: any[] = []
+const isFullScreen = ref(false)
 
 const fullscreenStyles = computed<any>(() => ({
-  width: isFullScreen.value ? "100vw" : "",
-  height: isFullScreen.value ? "100vh" : "",
-  position: isFullScreen.value ? "fixed" : "",
-  top: isFullScreen.value ? "0" : "",
-  left: isFullScreen.value ? "0" : "",
-  zIndex: isFullScreen.value ? "100" : "",
-}));
+  width: isFullScreen.value ? '100vw' : '',
+  height: isFullScreen.value ? '100vh' : '',
+  position: isFullScreen.value ? 'fixed' : '',
+  top: isFullScreen.value ? '0' : '',
+  left: isFullScreen.value ? '0' : '',
+  zIndex: isFullScreen.value ? '100' : '',
+}))
 
 onMounted(() => {
-  window.addEventListener("keydown", handleKeydown);
+  window.addEventListener('keydown', handleKeydown)
 
   if (route.query.id) {
-    taskId.value = route.query.id;
-    packageId.value = route.query.packageid;
-    isDetail.value = true;
-    getDetail();
+    taskId.value = route.query.id
+    packageId.value = route.query.packageid
+    isDetail.value = true
+    getDetail()
   }
-});
+})
 
-let lastKeyPressTime = 0;
-let keyPressTimer = null;
+let lastKeyPressTime = 0
+let keyPressTimer = null
 function changeimgbigshow() {
-  imgbigshow.value = !imgbigshow.value;
+  imgbigshow.value = !imgbigshow.value
 }
-const doubleClickInterval = 300; // 可以自定义间隔时间，单位是毫秒
+const doubleClickInterval = 300 // 可以自定义间隔时间，单位是毫秒
 // 键盘左右箭头快捷切换
 function handleKeydown(event) {
-  if (event.key === "ArrowLeft") backHandler();
+  if (event.key === 'ArrowLeft') { backHandler() }
   // 在这里执行左箭头的逻辑
-  else if (event.key === "ArrowRight") forwardHandler();
+  else if (event.key === 'ArrowRight') { forwardHandler() }
   // 在这里执行右箭头的逻辑
   else if (event.keyCode === 67) {
-    isFullScreen.value = false;
+    isFullScreen.value = false
 
     // batchModalRef.value.closeModal()
-  } else if (event.keyCode === 27) {
-    overTask.value = null;
-    overTasktwo.value = null;
-  } else if (event.key === "p" || event.key === "P") {
+  }
+  else if (event.keyCode === 27) {
+    overTask.value = null
+    overTasktwo.value = null
+  }
+  else if (event.key === 'p' || event.key === 'P') {
     // 获取当前时间
-    const now = Date.now();
+    const now = Date.now()
 
     // 如果两次按键时间间隔小于我们设定的双击间隔，则认为是双击
     if (now - lastKeyPressTime < doubleClickInterval) {
       // 清除已经设置的定时器（如果有的话）
-      clearTimeout(keyPressTimer);
-      const item = taskDetailInfo.value;
+      clearTimeout(keyPressTimer)
+      const item = taskDetailInfo.value
       if (
-        item?.userapprove?.statshis === 2 ||
-        item?.userapprove?.statshis == 3
+        item?.userapprove?.statshis === 2
+        || item?.userapprove?.statshis == 3
       ) {
-        overTask.value = null;
-        return;
+        overTask.value = null
+        return
       }
 
       if (validate([item]) == null && batch.value === false)
-        overTask.value = item;
+        overTask.value = item
       // 执行想要的操作
-      approvalHandler();
+      approvalHandler()
 
       // 重置上次按键时间
-      lastKeyPressTime = 0;
-    } else {
+      lastKeyPressTime = 0
+    }
+    else {
       // 如果不是双击，则更新上次按键时间，并开始一个新的计时器
-      lastKeyPressTime = now;
+      lastKeyPressTime = now
 
       // 通过定时器重置上次按键时间
       // 这可以防止如果用户只按了一次键，也会触发双击的情况
-      clearTimeout(keyPressTimer);
-      keyPressTimer = setTimeout(function () {
-        lastKeyPressTime = 0;
-      }, doubleClickInterval);
+      clearTimeout(keyPressTimer)
+      keyPressTimer = setTimeout(() => {
+        lastKeyPressTime = 0
+      }, doubleClickInterval)
     }
-  } else if (event.key === "x" || event.key === "X") {
+  }
+  else if (event.key === 'x' || event.key === 'X') {
     // 获取当前时间
-    const now = Date.now();
+    const now = Date.now()
 
     // 如果两次按键时间间隔小于我们设定的双击间隔，则认为是双击
     if (now - lastKeyPressTime < doubleClickInterval) {
-      const item = taskDetailInfo.value;
+      // 清除已经设置的定时器（如果有的话）
+      clearTimeout(keyPressTimer)
+      const item = taskDetailInfo.value
       if (
-        item?.userapprove?.statshis === 2 ||
-        item?.userapprove?.statshis == 3
+        item?.userapprove?.statshis === 2
+        || item?.userapprove?.statshis == 3
       ) {
-        overTask.value = null;
-        return;
+        overTask.value = null
+        return
       }
 
       if (validate([item]) == null && batch.value === false)
-        overTask.value = item;
+        overTask.value = item
       // 执行想要的操作
-      const modal = unref(notPassModalRef)! as any;
-      modal.showModal([taskDetailInfo.value]);
+      const modal = unref(notPassModalRef)! as any
+      modal.showModal([taskDetailInfo.value])
 
       // 重置上次按键时间
-      lastKeyPressTime = 0;
-    } else {
+      lastKeyPressTime = 0
+    }
+    else {
       // 如果不是双击，则更新上次按键时间，并开始一个新的计时器
-      lastKeyPressTime = now;
+      lastKeyPressTime = now
 
       // 通过定时器重置上次按键时间
       // 这可以防止如果用户只按了一次键，也会触发双击的情况
-      clearTimeout(keyPressTimer);
-      keyPressTimer = setTimeout(function () {
-        lastKeyPressTime = 0;
-      }, doubleClickInterval);
+      clearTimeout(keyPressTimer)
+      keyPressTimer = setTimeout(() => {
+        lastKeyPressTime = 0
+      }, doubleClickInterval)
     }
   }
 }
@@ -204,26 +212,27 @@ function setBatch(value: boolean) {
   // if (totalCount.value === 0)
   //   return
 
-  batch.value = value;
+  batch.value = value
 
   if (value === false) {
-    taskDetailInfo.value.checked = false;
-    selectItems.value = [];
+    taskDetailInfo.value.checked = false
+    selectItems.value = []
     taskDetailPictureList.value.forEach((item) => {
-      item.checked = false;
-    });
+      item.checked = false
+    })
   }
 }
 
 // 从store里面获取任务id
 function currentTaskId() {
-  const index = taskStore.getCurrentIndex;
-  return taskStore.getApprovalList[index]?.id || "";
+  const index = taskStore.getCurrentIndex
+  return taskStore.getApprovalList[index]?.id || ''
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0) return "至少选中一个任务";
+  if (items.length === 0)
+    return '至少选中一个任务'
 
   // const useInfo = userStore.getUserInfo
   // const username = useInfo.loginname
@@ -240,182 +249,182 @@ function validate(items: any[]) {
   //     return '审批人不一致'
   // }
 
-  return null;
+  return null
 }
 
 function approvalHandler(items?: any) {
-  let cloneItem: any;
+  let cloneItem: any
   if (batch.value) {
-    processItems = selectItems.value;
-  } else if (overTask.value) {
-    cloneItem = clone(overTask.value);
-    processItems = [cloneItem];
+    processItems = selectItems.value
+  }
+  else if (overTask.value) {
+    cloneItem = clone(overTask.value)
+    processItems = [cloneItem]
   }
 
   if (items !== undefined && !(items instanceof PointerEvent))
-    processItems = items;
+    processItems = items
 
-  const msg = validate(processItems);
+  const msg = validate(processItems)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
-  console.log(processItems);
+  console.log(processItems)
 
-  const list: any = [];
+  const list: any = []
   processItems.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,
-  };
+  }
 
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      doAudit(param);
-      overTask.value = null;
+      doAudit(param)
+      overTask.value = null
     },
     onNegativeClick: () => {
-      overTask.value = null;
+      overTask.value = null
     },
-  });
+  })
 }
 function approvalHandlerx(item?: any) {
-  console.log(item);
-  alert(1);
+  console.log(item)
+  alert(1)
 }
 function singleRejectHandlex(item?: any) {
-  console.log(item);
-  const modal = unref(notPassModalRef)! as any;
+  console.log(item)
+  const modal = unref(notPassModalRef)! as any
 
-  modal.showModal([item]);
+  modal.showModal([item])
 }
 function rejectHandler(items?: any) {
-  console.log(items);
-  const modal = unref(notPassModalRef)! as any;
-  modal.showModal(items);
+  console.log(items)
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal(items)
 }
 
 function singleRejectHandler() {
-  const modal = unref(notPassModalRef)! as any;
-  modal.showModal([taskDetailInfo.value]);
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([taskDetailInfo.value])
 }
 
 function doAudit(param: any) {
   audit(param).then((res) => {
-    const { code } = res;
-    if (code === "OK") {
-      message.success(res.message);
-      setBatch(false);
-      reloadList(param, "通过");
-      batchModalRef.value.reload();
+    const { code } = res
+    if (code === 'OK') {
+      message.success(res.message)
+      setBatch(false)
+      reloadList(param, '通过')
+      batchModalRef.value.reload()
     }
-  });
+  })
 }
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any;
-  modal.showModal(taskId.value);
+  const modal = unref(modalRef)! as any
+  modal.showModal(taskId.value)
 }
 
 function forwardHandler() {
-  taskStore.forward();
+  taskStore.forward()
 }
 
 function backHandler() {
-  taskStore.back();
+  taskStore.back()
 }
 
 async function handleDragEnd(event, item) {
-  console.log(event, item);
+  console.log(event, item)
   // 可以在这里添加拖拽结束后的逻辑
-  const flag = taskStore.getInFile;
+  const flag = taskStore.getInFile
   if (flag) {
-    const res = await dubiousfileyd({ pictureid: item.pictureId });
-    if (res.code === "OK") {
-      message.success("加入成功");
-      setBatch(false);
-      getTableData();
-      getImgList();
-    } else {
-      message.error(res.message);
+    const res = await dubiousfileyd({ pictureid: item.pictureId })
+    if (res.code === 'OK') {
+      message.success('加入成功')
+      setBatch(false)
+      getTableData()
+      getImgList()
     }
-    taskStore.setInFile(false);
-    taskStore.setInFile(item.pictureId);
+    taskStore.setInFile(false)
+    taskStore.setInFile(item.pictureId)
   }
 }
 async function addSuspicious() {
-  taskStore.setInFileId(taskDetailInfo.value.ocrPicture);
-  console.log(taskDetailInfo.value.ocrPicture);
+  taskStore.setInFileId(taskDetailInfo.value.ocrPicture)
+  console.log(taskDetailInfo.value.ocrPicture)
   if (taskDetailInfo.value.ocrPicture.pictureid) {
     const res = await dubiousfileyd({
       pictureid: taskDetailInfo.value.ocrPicture.id,
-    });
-
-    if (res.code === "OK") {
-      message.success("加入成功");
-      setBatch(false);
-      getTableData();
-      getImgList();
-    } else {
-      message.error(res.message);
+    })
+
+    if (res.code === 'OK') {
+      message.success('加入成功')
+      setBatch(false)
+      getTableData()
+      getImgList()
+    }
+    else {
+      message.error(res.message)
     }
-    taskStore.setInFile(false);
+    taskStore.setInFile(false)
   }
 }
 async function getTableData() {
-  const useInfo = userStore.getUserInfo;
-  const listData = [];
-  const reviewType = 3; // 类型
-  let res = await getAllfieldList(reviewType);
-  const fieldList = (res as any)?.data;
-  res = await getfieldList(reviewType, useInfo.id);
-  const userFieldList = (res as any)?.data.userFieldFixed;
+  const useInfo = userStore.getUserInfo
+  const listData = []
+  const reviewType = 3 // 类型
+  let res = await getAllfieldList(reviewType)
+  const fieldList = (res as any)?.data
+  res = await getfieldList(reviewType, useInfo.id)
+  const userFieldList = (res as any)?.data.userFieldFixed
   const blueList = [
-    "拜访终端名称",
-    "定位信息",
-    "拜访日期",
-    "定位距离",
-    "拜访小结",
-    "拜访项目类别",
-  ];
+    '拜访终端名称',
+    '定位信息',
+    '拜访日期',
+    '定位距离',
+    '拜访小结',
+    '拜访项目类别',
+  ]
 
   fieldList.map((v) => {
     if (userFieldList.includes(v.name)) {
-      let locationobj = { address: "" };
-      if (v.name == "location") {
-        locationobj = JSON.parse(taskDetailInfo.value.ocrPicture[v.name]);
-      }
+      let locationobj = { address: '' }
+      if (v.name == 'location')
+        locationobj = JSON.parse(taskDetailInfo.value.ocrPicture[v.name])
+
       const item = {
         label: v.fieldDesc,
         value:
-          v.name == "location"
+          v.name == 'location'
             ? locationobj.address
             : taskDetailInfo.value.ocrPicture[v.name],
         key: v.name,
         blue: blueList.includes(v.fieldDesc),
-      };
-      listData.push(item);
+      }
+      listData.push(item)
     }
-  });
-  taskTableData.value = chunk(listData, 2);
+  })
+  taskTableData.value = chunk(listData, 2)
 }
 
 async function getImgList() {
@@ -424,230 +433,236 @@ async function getImgList() {
       ...taskpagination,
       ...sortBy,
       pictureId: taskDetailInfo.value.ocrPicture.id,
-    });
-    taskDetailPictureList.value = data;
-    totalCount.value = total;
-  } else {
-    taskDetailPictureList.value.length = 0;
-    totalCount.value = 0;
+    })
+    taskDetailPictureList.value = data
+    totalCount.value = total
+  }
+  else {
+    taskDetailPictureList.value.length = 0
+    totalCount.value = 0
   }
 }
 
 function overTaskHandle() {
-  const item = taskDetailInfo.value;
+  const item = taskDetailInfo.value
   if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
-    overTask.value = null;
-    return;
+    overTask.value = null
+    return
   }
 
-  if (validate([item]) == null && batch.value === false) overTask.value = item;
+  if (validate([item]) == null && batch.value === false)
+    overTask.value = item
 }
 
 function leaveTaskHandler() {
-  overTask.value = null;
-  overTasktwo.value = null;
+  overTask.value = null
+  overTasktwo.value = null
 }
 
 function showActionsModal() {
-  const modal = unref(CustomSettingModalRef)! as any;
-  modal.showModal();
+  const modal = unref(CustomSettingModalRef)! as any
+  modal.showModal()
 }
 
 onUnmounted(() => {
-  taskStore.reset();
-  window.removeEventListener("keydown", handleKeydown);
-});
+  taskStore.reset()
+  window.removeEventListener('keydown', handleKeydown)
+})
 
 function immersionHandler() {
   // taskStore.updateImmersion()
-  toggleFullScreen();
+  toggleFullScreen()
 }
 // 切换全屏状态
 function toggleFullScreen() {
-  isFullScreen.value = !isFullScreen.value;
+  isFullScreen.value = !isFullScreen.value
   if (isFullScreen.value) {
-    fetchData();
-    window.addEventListener("scroll", checkBottom);
-  } else {
-    window.removeEventListener("scroll", checkBottom);
+    fetchData()
+    window.addEventListener('scroll', checkBottom)
+  }
+  else {
+    window.removeEventListener('scroll', checkBottom)
   }
 }
 function previewHandler(event: MouseEvent) {
-  event.stopImmediatePropagation();
-  event.stopPropagation();
+  event.stopImmediatePropagation()
+  event.stopPropagation()
 
   if (imageRef.value && (imageRef.value as any).src)
-    (imageRef.value as any).mergedOnClick();
+    (imageRef.value as any).mergedOnClick()
 }
 
 watch(
   () => [taskStore.activeId],
   () => {
     if (!isEmpty(taskStore.getActiveId)) {
-      packageId.value = taskStore.getPackageid;
-      taskId.value = taskStore.getActiveId;
-      getDetail();
+      packageId.value = taskStore.getPackageid
+      taskId.value = taskStore.getActiveId
+      getDetail()
     }
-  }
-);
+  },
+)
 
 // 获取数据
 async function getDetail() {
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value);
-  setBatch(false);
-  getTableData();
-  getImgList();
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value)
+  setBatch(false)
+  getTableData()
+  getImgList()
 }
 
 function notPassSuccess(param) {
-  batchModalRef.value.reload();
-  reloadList(param, "不通过");
-  overTask.value = null;
+  batchModalRef.value.reload()
+  reloadList(param, '不通过')
+  overTask.value = null
 }
 
 function reloadList(param, text) {
   // 修改左侧状态
-  const id = currentTaskId();
+  const id = currentTaskId()
   const hasCurrentId = param.flowTaskInfoList.find(
-    (item) => item.formId === id
-  );
-  finalStore.setListKey();
-  if (hasCurrentId) emit("setAsideItemName", text);
+    item => item.formId === id,
+  )
+  finalStore.setListKey()
+  if (hasCurrentId)
+    emit('setAsideItemName', text)
 
-  getDetail();
+  getDetail()
 }
 
 function goBack() {
-  router.back();
+  router.back()
 }
 
 function switchBatch() {
-  setBatch(!batch.value);
+  setBatch(!batch.value)
 }
 
 function getrowValue(e) {
-  if (e.key == "location") {
-    let locationobj = JSON.parse(taskDetailInfo.value.ocrPicture.location);
-    let lat = locationobj.lat.$numberDecimal;
-    let lng = locationobj.lng.$numberDecimal;
-    let name = e.value;
-    const protocol = window.location.protocol;
-    const hostname = window.location.hostname;
-    const port = window.location.port;
-    const hostWithPort = protocol + "//" + hostname + ":" + port + "/";
+  if (e.key == 'location') {
+    const locationobj = JSON.parse(taskDetailInfo.value.ocrPicture.location)
+    const lat = locationobj.lat.$numberDecimal
+    const lng = locationobj.lng.$numberDecimal
+    const name = e.value
+    const protocol = window.location.protocol
+    const hostname = window.location.hostname
+    const port = window.location.port
+    const hostWithPort = `${protocol}//${hostname}:${port}/`
     window.open(
-      hostWithPort + "map" + "?name=" + name + "&lat=" + lat + "&lng=" + lng
-    );
+      `${hostWithPort}map` + `?name=${name}&lat=${lat}&lng=${lng}`,
+    )
   }
 }
 function overTaskHandelr(item: any) {
   if (item?.historyStates === 2 || item?.historyStates == 3) {
-    overTasktwo.value = null;
-    return;
+    overTasktwo.value = null
+    return
   }
 
   if (validate([item]) == null && batchtwo.value === false)
-    overTasktwo.value = item;
+    overTasktwo.value = item
 }
 function closePassno() {
   console.log(notPassModalRef.value)
-  overTask.value = null;
+  overTask.value = null
 }
-//const loadingx = ref(false);
-const items = ref([]);
-const scrollContainer = ref(null);
-let debounceTimer;
+// const loadingx = ref(false);
+const items = ref([])
+const scrollContainer = ref(null)
+let debounceTimer
 async function fetchData() {
-  if (loading.value) {
-    return; // 如果已经在加载中，则不重复加载
-  }
-  loading.value = true;
+  if (loading.value)
+    return // 如果已经在加载中，则不重复加载
+
+  loading.value = true
   try {
-    loadMore();
-  } finally {
-    loading.value = false;
+    loadMore()
+  }
+  finally {
+    loading.value = false
   }
 }
-//const throttledCheckScroll = throttle(checkBottom, 200);
+// const throttledCheckScroll = throttle(checkBottom, 200);
 
-let num = 1;
+let num = 1
 
 // 检查是否滚动到底部
 function checkBottom() {
-  const container = scrollContainer.value;
+  const container = scrollContainer.value
   // console.log(1)
-  if (!container) {
-    return;
-  }
-  //const { scrollTop, clientHeight, scrollHeight } = container;
-  const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+  if (!container)
+    return
+
+  // const { scrollTop, clientHeight, scrollHeight } = container;
+  const scrollTop = window.pageYOffset || document.documentElement.scrollTop
 
   // 获取视口的内部高度
-  const clientHeight =
-    window.innerHeight || document.documentElement.clientHeight;
+  const clientHeight
+    = window.innerHeight || document.documentElement.clientHeight
 
   // 获取整个文档的高度
-  const scrollHeight = document.documentElement.scrollHeight;
+  const scrollHeight = document.documentElement.scrollHeight
 
-  clearTimeout(debounceTimer);
+  clearTimeout(debounceTimer)
   debounceTimer = setTimeout(() => {
     if (scrollTop + clientHeight >= scrollHeight - 10) {
-      num = num + 1;
-      console.log(num);
-      fetchData(); // 接近底部时加载更多数据
+      num = num + 1
+      console.log(num)
+      fetchData() // 接近底部时加载更多数据
     }
-  }, 500);
+  }, 500)
 }
 
 async function loadMore() {
-  console.log(loading.value);
+  console.log(loading.value)
   if (loading.value) {
-    const more = await fetchList();
-    taskDetailPictureList.value.push(...more);
-    console.log(taskDetailPictureList);
+    const more = await fetchList()
+    taskDetailPictureList.value.push(...more)
+    console.log(taskDetailPictureList)
   }
 }
-let canloadMore = true;
+let canloadMore = true
 async function fetchList() {
   try {
-    pagination.pageNo += 1;
+    pagination.pageNo += 1
     const { data, pageCount, total } = await getSimilarityList({
       ...pagination,
       ...sortBy,
       pictureId: taskDetailInfo.value.ocrPicture.id,
-    });
-    canloadMore = pageCount >= pagination.pageNo && pageCount > 0;
-    totalCount.value = total;
-    return data;
-  } catch (error) {
-    canloadMore = false;
-    return [];
+    })
+    canloadMore = pageCount >= pagination.pageNo && pageCount > 0
+    totalCount.value = total
+    return data
+  }
+  catch (error) {
+    canloadMore = false
+    return []
   }
 }
 async function reset() {
-  pagination.pageNo = 0;
-  pagination.pageSize = 30;
-  taskDetailPictureList.value.length = 0;
-  loading.value = false;
-  canloadMore = true;
+  pagination.pageNo = 0
+  pagination.pageSize = 30
+  taskDetailPictureList.value.length = 0
+  loading.value = false
+  canloadMore = true
   // layout()
 }
 async function refreshHandler() {
-  getImgList();
+  getImgList()
 }
-function sortHandler(orderby: "similarityScore" | "createdate") {
-  sortBy.orderName = orderby;
-  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
-  refreshHandler();
+function sortHandler(orderby: 'similarityScore' | 'createdate') {
+  sortBy.orderName = orderby
+  sortBy.orderType = sortBy.orderType === 'asc' ? 'desc' : 'asc'
+  refreshHandler()
 }
 </script>
 
 <template>
   <div
     ref="scrollContainer"
-    @scroll="checkBottom"
     class="wrapper fullscreen-container"
     :style="fullscreenStyles"
+    @scroll="checkBottom"
   >
     <div class="wrapper-header">
       <div class="left">
@@ -727,14 +742,14 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             src="@/assets/images/task/btn-not-pass.png"
             alt=""
             @click.stop="rejectHandler(selectItems)"
-          />
+          >
           <SvgIcon size="24" name="vs" />
           <img
             class="btn-approval"
             src="@/assets/images/task/btn-pass.png"
             alt=""
             @click.stop="approvalHandler"
-          />
+          >
         </div>
       </div>
       <div v-else class="right">
@@ -751,15 +766,14 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
       :style="
         isFullScreen
           ? {
-              height: '596px',
-            }
+            height: '596px',
+          }
           : {}
       "
     >
       <div
         v-show="!imgbigshow"
         class="aside-collapse-btn"
-        @click="collapseHandler"
         :style="{
           position: 'fixed',
           right: '0px',
@@ -767,6 +781,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
           cursor: 'pointer',
           zIndex: 100,
         }"
+        @click="collapseHandler"
       >
         <SvgIcon
           :name="false ? 'expand-cir' : 'collapse-cir'"
@@ -780,18 +795,18 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
           isFullScreen
             ? imgbigshow
               ? {
-                  position: 'relative',
-                  flex: 2,
-                  'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
-                }
+                'position': 'relative',
+                'flex': 2,
+                'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
+              }
               : {
-                  height: '92vh',
-                  flex: 2,
-                  'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
-                }
-            : {
+                'height': '92vh',
+                'flex': 2,
                 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
               }
+            : {
+              'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
+            }
         "
         @mouseover="overTaskHandle"
         @mouseleave="leaveTaskHandler"
@@ -832,13 +847,13 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             class="img-status"
             src="@/assets/images/task/pass.png"
             alt=""
-          />
+          >
           <img
             v-show="taskDetailInfo?.userapprove?.statshis === 3"
             class="img-status"
             src="@/assets/images/task/not_pass.png"
             alt=""
-          />
+          >
         </div>
         <div class="mark">
           <SvgIcon
@@ -866,7 +881,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                   class="icon-status"
                   src="@/assets/images/task/status.png"
                   alt=""
-                />
+                >
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
@@ -881,12 +896,11 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                   class="icon-status"
                   src="@/assets/images/task/similarity.png"
                   alt=""
-                />
+                >
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
-              <span class="value num"
-                >{{ totalCount }}<span class="unit">张</span>
+              <span class="value num">{{ totalCount }}<span class="unit">张</span>
               </span>
               <span class="label">相似匹配</span>
             </n-gi>
@@ -900,7 +914,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
               size="16"
               name="camera-time"
             />
-             
+
             <span>{{
               taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-"
             }}</span>
@@ -916,8 +930,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             <span>{{
               taskDetailInfo?.ocrPicture?.submitDateTimestamp
                 ? formatToDateHMS(
-                    Number(taskDetailInfo.ocrPicture.submitDateTimestamp)
-                  )
+                  Number(taskDetailInfo.ocrPicture.submitDateTimestamp),
+                )
                 : "-"
             }}</span>
           </div>
@@ -929,31 +943,31 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             :src="taskDetailInfo?.ocrPicture?.imgurl"
           />
         </div>
-        <div class="leftback"></div>
+        <div class="leftback" />
       </div>
       <div
-        class="right"
         v-show="imgbigshow"
+        class="right"
         :style="
           isFullScreen
             ? {
-                width: '320px',
-                borderLeft: '2px solid #507AFD',
-                position: 'relative',
-              }
+              width: '320px',
+              borderLeft: '2px solid #507AFD',
+              position: 'relative',
+            }
             : {}
         "
       >
         <div
           v-show="isFullScreen"
           class="aside-collapse-btn"
-          @click="collapseHandler"
           :style="{
             position: 'absolute',
             left: '-20px',
             top: '85px',
             cursor: 'pointer',
           }"
+          @click="collapseHandler"
         >
           <SvgIcon
             :name="true ? 'expand-cir' : 'collapse-cir'"
@@ -963,7 +977,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
         </div>
         <n-scrollbar v-if="totalCount > 0" style="max-height: 100%">
           <div class="right-card">
-            <div class="header" v-show="!isFullScreen">
+            <div v-show="!isFullScreen" class="header">
               <span>相似图片({{ totalCount }})</span>
               <SvgIcon
                 style="margin-right: 20px; cursor: pointer"
@@ -972,7 +986,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                 @click="showModal(batchModalRef)"
               />
             </div>
-            <div class="list" v-if="!isFullScreen">
+            <div v-if="!isFullScreen" class="list">
               <div
                 v-for="item in taskDetailPictureList"
                 :key="item.id"
@@ -1005,13 +1019,13 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                   class="tag-status"
                   src="@/assets/images/task/tag-pass.png"
                   alt=""
-                />
+                >
                 <img
                   v-if="item.historyStates === 3"
                   class="tag-status"
                   src="@/assets/images/task/tag-not-pass.png"
                   alt=""
-                />
+                >
                 <div class="time">
                   <div class="time-item">
                     <SvgIcon
@@ -1054,29 +1068,29 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
               </n-ellipsis>
               <div class="tags">
                 <div
-                  class="tag tag-submiting"
                   v-if="taskDetailInfo?.userapprove?.statshis == 1"
+                  class="tag tag-submiting"
                 >
                   待审批
                 </div>
                 <div
-                  class="tag tag-submited"
                   v-else-if="
-                    taskDetailInfo?.userapprove?.statshis == 2 ||
-                    taskDetailInfo?.userapprove?.statshis == 3
+                    taskDetailInfo?.userapprove?.statshis == 2
+                      || taskDetailInfo?.userapprove?.statshis == 3
                   "
+                  class="tag tag-submited"
                 >
                   已审批
                 </div>
                 <div
-                  class="tag tag-passed"
                   v-if="taskDetailInfo?.userapprove?.statshis == 2"
+                  class="tag tag-passed"
                 >
                   {{ TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] }}
                 </div>
                 <div
-                  class="tag tag-not-passed"
                   v-else-if="taskDetailInfo?.userapprove?.statshis == 3"
+                  class="tag tag-not-passed"
                 >
                   {{ TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] }}
                 </div>
@@ -1102,26 +1116,26 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                     </div>
                   </div>
                   <div
-                    class="viewlabel"
                     v-if="!(item[0].label == '拜访终端名称')"
+                    class="viewlabel"
                   >
                     {{ item[0].label }}
                   </div>
                   <div
-                    class="viewvalue"
                     v-if="!(item[0].label == '拜访终端名称')"
+                    class="viewvalue"
                   >
                     {{ item[0].value }}
                   </div>
                   <div
-                    class="viewlabel"
                     v-if="item[1] && !(item[1].label == '拜访终端名称')"
+                    class="viewlabel"
                   >
                     {{ item[1].label }}
                   </div>
                   <div
-                    class="viewvalue"
                     v-if="item[1] && !(item[1].label == '拜访终端名称')"
+                    class="viewvalue"
                   >
                     {{ item[1].value }}
                   </div>
@@ -1134,7 +1148,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
       </div>
     </div>
 
-    <n-tabs type="line" animated v-if="!isFullScreen">
+    <n-tabs v-if="!isFullScreen" type="line" animated>
       <n-tab-pane name="task-info" tab="任务信息">
         <TaskTable
           :data="taskDetailInfo"
@@ -1167,8 +1181,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
               color: #333333;
               font-family: PingFang SC, PingFang SC-Medium;
             "
-            >相似图片({{ totalCount }})</span
-          >
+          >相似图片({{ totalCount }})</span>
         </div>
         <div
           style="
@@ -1214,7 +1227,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
           </div>
         </div>
       </div>
-      <div class="allview" v-show="imgbigshow">
+      <div v-show="imgbigshow" class="allview">
         <div class="list">
           <div
             v-for="item in taskDetailPictureList"
@@ -1266,13 +1279,13 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
               class="tag-status"
               src="@/assets/images/task/tag-pass.png"
               alt=""
-            />
+            >
             <img
               v-if="item.historyStates === 3"
               class="tag-status"
               src="@/assets/images/task/tag-not-pass.png"
               alt=""
-            />
+            >
             <div class="time">
               <div class="time-item">
                 <SvgIcon
@@ -1314,7 +1327,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
         <div
           v-for="(item, index) in taskDetailPictureList"
           :key="index"
-        
+
           class="grid-item"
           @click="handleSelect(item)"
           @mouseover="overTaskHandelr(item)"
@@ -1358,16 +1371,16 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
           >
             <div class="val">
               {{
-                item?.similarityScore &&
-                Number(item?.similarityScore).toFixed(0)
+                item?.similarityScore
+                  && Number(item?.similarityScore).toFixed(0)
               }}<span class="percent-unit">%</span>
             </div>
           </div>
 
-          <div class="pass-status" v-if="item.historyStates === 2">
+          <div v-if="item.historyStates === 2" class="pass-status">
             <SvgIcon name="pass-icon" style="width: 52; height: 24px" />
           </div>
-          <div class="pass-status" v-else-if="item.historyStates === 3">
+          <div v-else-if="item.historyStates === 3" class="pass-status">
             <SvgIcon name="no-pass-icon" style="width: 52; height: 24px" />
           </div>
           <div
@@ -1375,7 +1388,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             class="action"
                @mouseover="overTaskHandelr"
         @mouseleave="leaveTaskHandler"
-       
+
           >
             <SvgIcon
               style="cursor: pointer"
@@ -1389,10 +1402,10 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             />
           </div>
         </div>
-      </div>-->
+      </div> -->
     </div>
     <NotPassed
-      
+
       ref="notPassModalRef"
       @success="notPassSuccess"
       @close="closePassno"
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index 7622e52..c50b804 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -1,365 +1,369 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-import { workPackageMap } from "@/config/workorder";
-import { useUser } from "@/store/modules/user";
-import { difference, cloneDeep } from "lodash-es";
-import { computed, defineEmits, defineProps, onMounted, ref, watch } from "vue";
-import { VueDraggable } from "vue-draggable-plus";
+import { cloneDeep, difference } from 'lodash-es'
+import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { workPackageMap } from '@/config/workorder'
+import { useUser } from '@/store/modules/user'
+
 const props = defineProps({
   reviewType: {
     type: Number,
     default: () => 1,
     require: true,
   },
-});
+})
 
-const emit = defineEmits(["onOk"]);
+const emit = defineEmits(['onOk'])
 
 // 左侧隐藏列表
-const offList = ref<any[]>([]);
+const offList = ref<any[]>([])
 // 右侧显示列表
-const onList = ref<any[]>([]);
+const onList = ref<any[]>([])
 // 固定默认列表
-const fixList = ref<any[]>([]);
+const fixList = ref<any[]>([])
 
-const offShowList = ref<any[]>([]);
-const onShowList = ref<any[]>([]);
-const fixShowList = ref<any[]>([]);
+const offShowList = ref<any[]>([])
+const onShowList = ref<any[]>([])
+const fixShowList = ref<any[]>([])
 
 const allCount = computed(() => {
-  return `全部字段(共${offList.value.length - 1}个)`;
-});
+  return `全部字段(共${offList.value.length - 1}个)`
+})
 
 const selectCount = computed(() => {
-  return `显示字段(共${onList.value.length}个)`;
-});
+  return `显示字段(共${onList.value.length}个)`
+})
 
 function generatList() {
-  const keys = Object.keys(workPackageMap);
-  let showList: object[] = [];
-  const hideList: object[] = [];
-  const showStr = "status";
-  const showKeys = showStr.split(",").map((key: string) => key.toLowerCase());
+  const keys = Object.keys(workPackageMap)
+  let showList: object[] = []
+  const hideList: object[] = []
+  const showStr = 'status'
+  const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
 
   for (const key of keys) {
-    const name = workPackageMap[key]?.label;
-    const isDefault = workPackageMap[key]?.isDefault;
+    const name = workPackageMap[key]?.label
+    const isDefault = workPackageMap[key]?.isDefault
 
     // 系统配置为Y且不是默认配置
     if (!isDefault) {
       hideList.push({
         id: key,
-        name: name || "未配置",
+        name: name || '未配置',
         fix: isDefault,
         checked: workPackageMap[key].isDefault,
-      });
+      })
     }
   }
 
   showList = showKeys.reduce((acc, key) => {
     const config = {
       id: key,
-      name: workPackageMap[key].label || "未配置",
+      name: workPackageMap[key].label || '未配置',
       fix: workPackageMap[key].isDefault,
-    };
-    return [...acc, config];
-  }, []);
+    }
+    return [...acc, config]
+  }, [])
 
-  const fixedList = generateDefaultList();
+  const fixedList = generateDefaultList()
 
-  hideList.unshift(...fixedList);
-  showList.unshift(...fixedList);
+  hideList.unshift(...fixedList)
+  showList.unshift(...fixedList)
 
-  onList.value = showList;
-  offList.value = hideList;
-  return { showList, hideList };
+  onList.value = showList
+  offList.value = hideList
+  return { showList, hideList }
 }
 
 function generateDefaultList() {
   return Object.keys(workPackageMap).reduce((acc, key) => {
-    const { label, isDefault } = workPackageMap[key];
+    const { label, isDefault } = workPackageMap[key]
 
     if (isDefault) {
       const config = {
         id: key,
-        name: label || "未配置",
+        name: label || '未配置',
         fix: true,
         checked: true,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 }
 
-const show = ref(false);
+const show = ref(false)
 const checkAll = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
-  return onList.value.length == offList.value.length - baseNum;
-});
+    if (v.fix)
+      baseNum += 1
+  })
+  return onList.value.length == offList.value.length - baseNum
+})
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let userFieldFixed = "";
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let userFieldFixed = ''
   fixList.value.map((v) => {
-    userFieldFixed += `${v.id},`;
-  });
+    userFieldFixed += `${v.id},`
+  })
   onList.value.map((v) => {
-    userFieldFixed += `${v.id},`;
-  });
-  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1);
-  savefield(props.reviewType, userInfo.id, userFieldFixed);
-  e.preventDefault();
-  closeModal();
-  emit("onOk");
+    userFieldFixed += `${v.id},`
+  })
+  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1)
+  savefield(props.reviewType, userInfo.id, userFieldFixed)
+  e.preventDefault()
+  closeModal()
+  emit('onOk')
 }
 
 defineExpose({
   showModal,
-});
+})
 
 // generatList();
 
-const selectIds = ref<string[]>([]);
+const selectIds = ref<string[]>([])
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
   for (const item of offShowList.value) {
-    if (!item.fix) {
-      item.checked = value;
-    }
+    if (!item.fix)
+      item.checked = value
   }
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
   if (value) {
     offList.value.map((v) => {
-      if (!v.checked) {
-        onList.value.push(v);
-      }
-    });
-    onShowList.value = cloneDeep(onList.value);
-  } else {
-    onList.value = [];
-    onShowList.value = [];
+      if (!v.checked)
+        onList.value.push(v)
+    })
+    onShowList.value = cloneDeep(onList.value)
+  }
+  else {
+    onList.value = []
+    onShowList.value = []
   }
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id);
-  item.checked = checked;
-  let currentIndex = offList.value.findIndex((v) => v.id == item.id);
-  offList.value[currentIndex].checked = checked;
-  if (index === -1 && checked) {
-    selectIds.value.push(item.id);
-  } else {
-    selectIds.value.splice(index, 1);
-  }
+  const index = selectIds.value.indexOf(item.id)
+  item.checked = checked
+  const currentIndex = offList.value.findIndex(v => v.id == item.id)
+  offList.value[currentIndex].checked = checked
+  if (index === -1 && checked)
+    selectIds.value.push(item.id)
+  else
+    selectIds.value.splice(index, 1)
 }
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id;
-  });
-});
+    return item.id
+  })
+})
 
 watch(
   () => selectIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const action = newVal > oldVal ? "add" : "remove";
-    const diff =
-      action === "add"
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff
+      = action === 'add'
         ? difference(selectIds.value, showIds.value)
-        : difference(showIds.value, selectIds.value);
+        : difference(showIds.value, selectIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
-    if (action === "add") {
+    if (action === 'add') {
       for (const item of offList.value) {
         if (!item.fix && diff.includes(item.id)) {
           onList.value.push({
             id: item.id,
-            name: item.name || "未配置",
+            name: item.name || '未配置',
             fix: item.fix || false,
-          });
+          })
         }
       }
-      onShowList.value = cloneDeep(onList.value);
-    } else {
-      const list = onList.value;
+      onShowList.value = cloneDeep(onList.value)
+    }
+    else {
+      const list = onList.value
       for (let index = 0; index < list.length; index++) {
-        const item = list[index];
+        const item = list[index]
         if (!item.fix && diff.includes(item.id)) {
-          list.splice(index, 1);
-          onShowList.value.splice(index, 1);
-          index--;
+          list.splice(index, 1)
+          onShowList.value.splice(index, 1)
+          index--
         }
       }
-      console.log(onShowList.value, list, "onShowList");
+      console.log(onShowList.value, list, 'onShowList')
     }
-  }
-);
+  },
+)
 
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const diff = difference(selectIds.value, showIds.value);
+    const diff = difference(selectIds.value, showIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
     for (const item of offList.value) {
       if (!item.fix && diff.includes(item.id)) {
-        const index = selectIds.value.indexOf(item.id);
-        item.checked = false;
-        selectIds.value.splice(index, 1);
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
       }
     }
-  }
-);
+  },
+)
 
 function clearDragSource() {
   onList.value = onList.value.filter((item) => {
-    return item.fix === true;
-  });
-  onShowList.value = cloneDeep(onList.value);
+    return item.fix === true
+  })
+  onShowList.value = cloneDeep(onList.value)
 }
 
 function removeHandler(id: string) {
   let index = onList.value.findIndex((item) => {
-    return item.id === id;
-  });
+    return item.id === id
+  })
   if (index !== -1) {
-    onList.value.splice(index, 1);
-    onShowList.value.splice(index, 1);
+    onList.value.splice(index, 1)
+    onShowList.value.splice(index, 1)
   }
 
-  index = offList.value.findIndex((v) => v.id == id);
-  offList.value[index].checked = false;
-  offShowList.value = cloneDeep(offList.value);
+  index = offList.value.findIndex(v => v.id == id)
+  offList.value[index].checked = false
+  offShowList.value = cloneDeep(offList.value)
 }
-const initData = ()=>{
-  offList.value = [];
-  onList.value = [];
-  fixList.value = [];
-  offShowList.value = [];
-  onShowList.value = [];
-  fixShowList.value = [];
-  selectIds.value = [];
+function initData() {
+  offList.value = []
+  onList.value = []
+  fixList.value = []
+  offShowList.value = []
+  onShowList.value = []
+  fixShowList.value = []
+  selectIds.value = []
 }
-const getData = async (type = "") => {
-  initData();
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(props.reviewType); //所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(props.reviewType, userInfo.id); //当前用户选择的项目
-  const useList = res.data;
+async function getData(type = '') {
+  initData()
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(props.reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(props.reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
   /**
    * name 标题
    * id 键值
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList?.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList?.userFieldUnFixed?.split(",");
-  if (!type || type == "off") {
-    offList.value = [];
+  const userFieldFixed = useList?.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList?.userFieldUnFixed?.split(',')
+  if (!type || type == 'off') {
+    offList.value = []
     allList?.map((v) => {
-      let item = {
+      const item = {
         name: v.fieldDesc,
         id: v.name,
         fix: v.isrequired == 2,
         checked:
-          v.isrequired == 2 ||
-          Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
-          Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
-      };
-      if (item.fix) {
-        fixList.value.push(item);
-      } else {
-        offList.value.push(item);
+          v.isrequired == 2
+          || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+          || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
       }
-    });
-    offList.value.unshift(...fixList.value);
+      if (item.fix)
+        fixList.value.push(item)
+      else
+        offList.value.push(item)
+    })
+    offList.value.unshift(...fixList.value)
   }
-  if (!type || type == "on") {
-    useList?.userFieldFixed?.split(",").map((v) => {
-      let item = allList.find((v2) => v2.name == v);
+  if (!type || type == 'on') {
+    useList?.userFieldFixed?.split(',').map((v) => {
+      let item = allList.find(v2 => v2.name == v)
       if (item) {
         item = {
           name: item.fieldDesc,
           id: item.name,
           fix: item.isrequired == 2,
           checked: true,
-        };
-        selectIds.value.push(item.id);
-        if (!item.fix) {
-          onList.value.push(item);
         }
+        selectIds.value.push(item.id)
+        if (!item.fix)
+          onList.value.push(item)
       }
-    });
+    })
   }
-  offShowList.value = cloneDeep(offList.value);
-  fixShowList.value = cloneDeep(fixList.value);
-  onShowList.value = cloneDeep(onList.value);
-};
+  offShowList.value = cloneDeep(offList.value)
+  fixShowList.value = cloneDeep(fixList.value)
+  onShowList.value = cloneDeep(onList.value)
+}
 
-onMounted(() => getData());
+onMounted(() => getData())
 
 const indeterminate = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
+    if (v.fix)
+      baseNum += 1
+  })
   return (
-    onShowList.value.length > 0 &&
-    offShowList.value.length - baseNum > onShowList.value.length
-  );
-});
-const queryData = (value, type) => {
+    onShowList.value.length > 0
+    && offShowList.value.length - baseNum > onShowList.value.length
+  )
+})
+function queryData(value, type) {
   if (value) {
-    if (type == "off") {
-      offShowList.value = offList.value.filter((item) => item.name.indexOf(value) > -1);
-    } else {
-      onShowList.value = onList.value.filter((item) => item.name.indexOf(value) > -1);
-      fixShowList.value = fixList.value.filter((item) => item.name.indexOf(value) > -1);
+    if (type == 'off') {
+      offShowList.value = offList.value.filter(item => item.name.includes(value))
     }
-  } else {
+    else {
+      onShowList.value = onList.value.filter(item => item.name.includes(value))
+      fixShowList.value = fixList.value.filter(item => item.name.includes(value))
+    }
+  }
+  else {
     // getData(type);
-    if (type == "off") {
-      offShowList.value = cloneDeep(offList.value);
-    } else {
-      onShowList.value = cloneDeep(onList.value);
-      fixShowList.value = cloneDeep(fixList.value);
+    if (type == 'off') {
+      offShowList.value = cloneDeep(offList.value)
+    }
+    else {
+      onShowList.value = cloneDeep(onList.value)
+      fixShowList.value = cloneDeep(fixList.value)
     }
   }
-};
+}
 </script>
 
 <template>
@@ -401,8 +405,8 @@ const queryData = (value, type) => {
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全选"
-                      @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
+                      @update:checked="onCheckAllChange"
                     />
                   </div>
                   <div class="content">
@@ -445,7 +449,9 @@ const queryData = (value, type) => {
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
                 </n-input>
-                <div class="draggable-title">系统默认</div>
+                <div class="draggable-title">
+                  系统默认
+                </div>
                 <div class="draggable-ul" style="border-bottom: none">
                   <div
                     v-for="item in fixShowList"
@@ -456,7 +462,9 @@ const queryData = (value, type) => {
                     <span class="ml-2">{{ item.name }}</span>
                   </div>
                 </div>
-                <div class="draggable-title" style="border-top: none">自定义配置</div>
+                <div class="draggable-title" style="border-top: none">
+                  自定义配置
+                </div>
                 <VueDraggable
                   v-model="onList"
                   class="draggable-ul"
@@ -487,7 +495,9 @@ const queryData = (value, type) => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
+          <n-button type="info" @click="handleSumbit">
+            确定
+          </n-button>
           <n-button secondary style="margin-left: 15px" @click="getData();closeModal()">
             取消
           </n-button>
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index 36f6f9a..e151339 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -1,10 +1,5 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList } from "@/api/home/filter";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useUser } from "@/store/modules/user";
-import { useWorkOrder } from "@/store/modules/workOrder";
-import { getViewportOffset } from "@/utils/domUtils";
-import { debounce } from "lodash-es";
+import { debounce } from 'lodash-es'
 import {
   computed,
   defineEmits,
@@ -15,70 +10,75 @@ import {
   ref,
   unref,
   watch,
-} from "vue";
-import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
-import WorkSheetList from "./WorkSheetList.vue";
+} from 'vue'
+import CustomFieldModalVue from '../modal/CustomFieldModal.vue'
+import WorkSheetList from './WorkSheetList.vue'
+import { getAllfieldList, getfieldList } from '@/api/home/filter'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useUser } from '@/store/modules/user'
+import { useWorkOrder } from '@/store/modules/workOrder'
+import { getViewportOffset } from '@/utils/domUtils'
 
-defineOptions({ name: "AsideContent" });
-const emit = defineEmits(["ApprovalOver"]);
+defineOptions({ name: 'AsideContent' })
+const emit = defineEmits(['ApprovalOver'])
 
-const collapse = ref(false);
-const workStore = useWorkOrder();
-const filterModalRef = ref(null);
-const packageListRef = ref<HTMLDivElement | null>(null);
+const collapse = ref(false)
+const workStore = useWorkOrder()
+const filterModalRef = ref(null)
+const packageListRef = ref<HTMLDivElement | null>(null)
 // 展示字段
-const showFieldList = ref<any[]>([]);
-const reviewType = 1;
-const dicts = ref<any>([]);
+const showFieldList = ref<any[]>([])
+const reviewType = 1
+const dicts = ref<any>([])
 function collapseHandler() {
-  collapse.value = !collapse.value;
+  collapse.value = !collapse.value
 }
-const mousetrap = inject("mousetrap") as any;
-mousetrap.bind("[", collapseHandler);
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 
-const searchKeyword = ref("");
+const searchKeyword = ref('')
 
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308;
-});
+  return collapse.value ? 0 : 308
+})
 
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
-  };
-});
+  }
+})
 
 const collapseIcon = computed(() => {
-  return collapse.value ? "expand-cir" : "collapse-cir";
-});
+  return collapse.value ? 'expand-cir' : 'collapse-cir'
+})
 
-const listHeight = ref(700);
+const listHeight = ref(700)
 
 function computeListHeight() {
-  const listEl = document.querySelector(".work-sheet-list")!;
-  const { bottomIncludeBody } = getViewportOffset(listEl);
-  const height = bottomIncludeBody;
-  listHeight.value = height - 25;
+  const listEl = document.querySelector('.work-sheet-list')!
+  const { bottomIncludeBody } = getViewportOffset(listEl)
+  const height = bottomIncludeBody
+  listHeight.value = height - 25
 }
 
 const listStyle = computed(() => {
   return {
     height: `${listHeight.value}px`,
-  };
-});
+  }
+})
 
-useWindowSizeFn(computeListHeight, 280);
+useWindowSizeFn(computeListHeight, 280)
 
 async function getshowFieldList() {
-  showFieldList.value = [];
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(reviewType); // 所有筛选项目
-  const allList = res.data;
-  dicts.value = res.data;
-  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
-  const useList = res.data;
+  showFieldList.value = []
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(reviewType) // 所有筛选项目
+  const allList = res.data
+  dicts.value = res.data
+  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
   /**
    * name 标题
    * id 键值
@@ -86,19 +86,20 @@ async function getshowFieldList() {
    * checked 是否选中
    */
   if (useList.userFieldFixed) {
-    useList.userFieldFixed?.split(",").map((v) => {
-      let item = allList.find((v2) => v2.name == v);
+    useList.userFieldFixed?.split(',').map((v) => {
+      let item = allList.find(v2 => v2.name == v)
       if (item) {
         item = {
           name: item.fieldDesc,
           id: item.name,
           fix: item.isrequired == 2,
           checked: true,
-        };
-        showFieldList.value.push(item);
+        }
+        showFieldList.value.push(item)
       }
-    });
-  } else {
+    })
+  }
+  else {
     // 若为首次获取 则赋默认值
     allList.map((v) => {
       if (v.isrequired == 2) {
@@ -107,55 +108,55 @@ async function getshowFieldList() {
           id: v.name,
           fix: v.isrequired == 2,
           checked: true,
-        };
-        showFieldList.value.push(item);
+        }
+        showFieldList.value.push(item)
       }
-    });
+    })
   }
 }
 
 onMounted(() => {
   nextTick(() => {
-    computeListHeight();
-    getshowFieldList();
-  });
-});
-const asideEnter = ref(false);
+    computeListHeight()
+    getshowFieldList()
+  })
+})
+const asideEnter = ref(false)
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value;
-});
+  return collapse.value ? true : asideEnter.value
+})
 
 function showFilter() {
-  const modal = unref(filterModalRef)! as any;
-  modal.showModal();
+  const modal = unref(filterModalRef)! as any
+  modal.showModal()
 }
 
 watch(
   () => workStore.immersion,
   () => {
-    collapse.value = true;
-  }
-);
+    collapse.value = true
+  },
+)
 
-const showSearch = ref(false);
+const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
-  showSearch.value = value;
+  showSearch.value = value
   if (value === false) {
-    (packageListRef.value as any).search("");
-    searchKeyword.value = "";
+    (packageListRef.value as any).search('')
+    searchKeyword.value = ''
   }
 }
 
 const inputHandler = debounce((word) => {
   searchKeyword.value = word;
-  (packageListRef.value as any).search(word);
-}, 500);
+  (packageListRef.value as any).search(word)
+}, 500)
 
-const ApprovalOver = (packageId) => {
-  emit("ApprovalOver", packageId);
-};
+function ApprovalOver(packageId) {
+  emit('ApprovalOver', packageId)
+}
 </script>
 
 <template>
@@ -216,9 +217,9 @@ const ApprovalOver = (packageId) => {
       class="work-sheet-list"
       :show-field-list="showFieldList"
       :dicts="dicts"
-      @ApprovalOver="ApprovalOver"
+      @approval-over="ApprovalOver"
     />
-    <CustomFieldModalVue ref="filterModalRef" :review-type="1" @onOk="getshowFieldList" />
+    <CustomFieldModalVue ref="filterModalRef" :review-type="1" @on-ok="getshowFieldList" />
   </div>
 </template>
 
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 60c9ccc..aca8520 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { format } from 'date-fns'
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import type { PackageListItem } from '/#/workorder'
+import { useDialog } from 'naive-ui'
 
 defineOptions({ name: 'ListItem' })
 const props = defineProps({
@@ -22,31 +23,50 @@ const props = defineProps({
     default: () => [],
   },
   mouseOverTask: {
-    type: Array,
+    type: Object,
     default: () => [],
   },
 })
-
 const emit = defineEmits(['dismisClick'])
-
+const dialog = useDialog()
 const svgName = computed(() => {
   return props.selected ? 'taskpack-select' : 'taskpack'
 })
-
+const showFull = ref(false)
 const popconfirmTarget: any = ref(null)
 const popconfirmRef: any = ref(null)
 
 function handleDismissTask() {
-  emit('dismisClick', props.mouseOverTask.id)
+  dialog.warning({
+    title: '确认提示',
+    content: '确认解散该任务包吗？',
+    positiveText: '取消',
+    negativeText: '确定',
+    negativeButtonProps: {
+      type: 'info',
+      ghost: false,
+    },
+    positiveButtonProps: {
+      type: 'default',
+    },
+    onPositiveClick: () => {
+    },
+    onNegativeClick: () => {
+      emit('dismisClick', props.mouseOverTask.id)
+    },
+  })
   popconfirmRef.value[0]?.setShow(false) // 关闭 popconfirm
 }
+watch(() => props.mouseOverTask, (value) => {
+  console.log(props)
+})
 
 onMounted(async () => {
 })
 </script>
 
 <template>
-  <div ref="popconfirmTarget" class="list-item" :class="{ 'list-item-selected': selected }">
+  <div ref="popconfirmTarget" class="list-item relative" :class="{ 'list-item-selected': selected, 'h200': showFieldList?.length > 5 && !showFull }">
     <div v-for="(item, index) in showFieldList" :key="index">
       <div v-if="item.id === 'name'" class="list-item-header">
         <div class="id-wrap">
@@ -61,7 +81,8 @@ onMounted(async () => {
               placement="bottom" trigger="click"
             >
               <template #trigger>
-                <span v-show="mouseOverTask?.id" class="dismiss-task-pack" style="cursor: pointer;">...</span>
+
+                <span v-show="mouseOverTask?.id === listItem.id" class="dismiss-task-pack" style="cursor: pointer;">...</span>
               </template>
               <template #action>
                 <span style="cursor: pointer;" @click="handleDismissTask">解散任务包</span>
@@ -85,21 +106,40 @@ onMounted(async () => {
         </li>
         <li v-else-if="item.id === 'createdate'">
           提交时间：<n-ellipsis style="max-width: 170px">
-            {{ listItem.createdate && format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
+            {{ listItem.createdate && format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") || '全部' }}
           </n-ellipsis>
         </li>
         <li v-else-if="item.id === 'createTime'">
           生成时间：<n-ellipsis style="max-width: 170px">
-            {{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
+            {{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") || '全部' }}
+          </n-ellipsis>
+        </li>
+        <li v-else-if="item.id === 'submit_date_timestamp'">
+          筛选日期：<n-ellipsis style="max-width: 170px">
+            <!-- {{ listItem.submit_date_timestamp && format(listItem.submit_date_timestamp.split('-')[0], "yyyy年MM月dd日") || '全部' }} -->
+            {{ listItem.submit_date_timestamp && format(new Date(listItem.submit_date_timestamp?.split('-')[0]), "yyyy年MM月dd日") }}
+            至
+            {{ listItem.submit_date_timestamp && format(new Date(listItem.submit_date_timestamp?.split('-')[1]), "yyyy年MM月dd日") }}
           </n-ellipsis>
         </li>
         <li v-else class="ellipsis">
           <span class="label">{{ item.name }}：</span><n-ellipsis style="max-width: 170px">
-            {{ listItem[item.id] }}
+            {{ listItem[item.id] || '全部' }}
           </n-ellipsis>
         </li>
       </ul>
     </div>
+    <template
+      v-if="showFieldList?.length > 5"
+    >
+      <div class="absolute bottom-0 py-[8px] pl-[36px] item-action">
+        <span class="cursor-pointer" @click.stop="showFull = !showFull">
+          <SvgIcon style="margin-left: 6px" name="expand" size="16" />
+          <SvgIcon style="margin-left: 6px" name="collapse" size="16" />
+          {{ showFull ? '收起' : '展开' }}
+        </span>
+      </div>
+    </template>
     <!-- <div class="list-item-header">
       <div style="display: flex;">
         <SvgIcon :name="svgName" size="28" />
@@ -122,7 +162,12 @@ onMounted(async () => {
   padding: 10px 0px 10px 8px;
   position: relative;
   border-bottom: 1px solid #e8e8e8;
-
+// · transition: height: 0.2s ease-out;
+// transform: ;
+  &.h200 {
+    height: 206px;
+    overflow: hidden;
+  }
   &-header {
     display: flex;
     align-items: center;
@@ -170,9 +215,16 @@ onMounted(async () => {
       color: #507afd !important;
     }
   }
-
+  .item-action {
+    background-color: #fff;
+    width: calc(100% - 8px);
+  }
   &-selected {
     background-color: #f2f5fe;
+    .item-action {
+      background-color: #f2f5fe;
+
+    }
   }
 
   &-detail {
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index d283231..880d716 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -1,16 +1,15 @@
 <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 { onMounted, reactive, ref, watch } from "vue";
-import ApprovalModal from "../modal/ApprovalModal.vue";
-import ListItem from "./ListItem.vue";
-import type { PackageListItem } from "/#/workorder";
-
-const emit = defineEmits(["ApprovalOver"]);
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { throttle } from 'lodash'
+import { useInfiniteScroll } from '@vueuse/core'
+import { useMessage } from 'naive-ui'
+import ApprovalModal from '../modal/ApprovalModal.vue'
+import ListItem from './ListItem.vue'
+import { deletePackage } from '@/api/home/main'
+import { useWorkOrder } from '@/store/modules/workOrder'
+import { isEmpty } from '@/utils'
+import type { PackageListItem } from '/#/workorder'
+import NotPassed from '@/components/NotPassed.vue'
 
 defineProps({
   showFieldList: {
@@ -21,54 +20,61 @@ 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 emit = defineEmits(["ApprovalOver"]);
+
+const emit = defineEmits(['ApprovalOver'])
+
+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 overTask = ref<any>(null);
+const approvalModalRef: any = ref(null)
+const notPassedRef: any = ref(null)
+const overTask = ref<any>(null)
 
 function selectHandler(id: string, index: number) {
   // console.log('selectHandler',id)
-  workStore.setActive(index);
+  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();
+    const more = await fetchList()
     more.forEach((ele) => {
-      ele.search = JSON.parse(ele.search);
+      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
   }
 }
 
@@ -80,77 +86,123 @@ async function loadMore() {
 
 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;
-    activeId.value = newVal;
-    approvalModalRef.value.showModal(workStore.dataId);
-  }
-);
+    if (isEmpty(newVal))
+      return
+    activeId.value = newVal
+    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") {
-    overTask.value = null;
-  }
+  if (event?.relatedTarget?.id !== 'taskPopconfirmRef')
+    overTask.value = null
 }
-const message = useMessage();
+const message = useMessage()
 function dismisClick(packageId: string) {
-  deletePackage({ packageId: packageId }).then((res) => {
-    if (res.code === "OK") {
-      message.success("解散任务包成功");
-      reset();
-      loadMore();
+  deletePackage({ packageId }).then((res) => {
+    if (res.code === 'OK') {
+      message.success('解散任务包成功')
+      reset()
+      loadMore()
     }
-  });
+  })
+}
+function ApprovalOver(packageId) {
+  emit('ApprovalOver', packageId)
 }
-const ApprovalOver = (packageId) => {
-  emit("ApprovalOver", packageId);
-};
 
 defineExpose({
   search,
-});
+})
+
+const onKeydown = throttle((event) => {
+  const eles = ['INPUT', 'TEXTAREA']
+  if (eles.includes(event.target.tagName))
+    return
+
+  if (event.defaultPrevented)
+    return // 如果已取消默认操作，则不应执行任何操作
+
+  const handled = false
+  if (event.key !== undefined) {
+    // 使用 KeyboardEvent.key 处理事件，并将 handled 设置为 true。
+  }
+  else if (event.keyCode !== undefined) {
+    // 使用 KeyboardEvent.keyCode 处理事件并将 handled 设置为 true。
+  }
+
+  if (handled) {
+    // 如果事件已处理，则禁止“双重操作”
+    event.preventDefault()
+  }
+  if (event.key === 'ArrowUp') {
+    const prev = data.value[workStore.currentIndex - 1]?.id
+    if (prev)
+      selectHandler(prev, workStore.currentIndex - 1)
+  }
+  if (event.key === 'ArrowDown') {
+    const next = data.value[workStore.currentIndex + 1]?.id
+    if (next)
+      selectHandler(next, workStore.currentIndex + 1)
+  }
+  if (event.key === 'ArrowRight' || event.key === 'ArrowLeft') {
+    if (activeId.value)
+      activeId.value = ''
+    else
+      activeId.value = data.value[workStore.currentIndex]?.checkDuplicateId
+  }
+}, 500)
+onMounted(() => {
+  document.addEventListener('keydown', onKeydown, true)
+})
+onUnmounted(() => {
+  document.removeEventListener('keydown', onKeydown)
+})
 </script>
 
 <template>
@@ -169,7 +221,7 @@ defineExpose({
         @click="selectHandler(item.id, index)"
         @mouseover="overTaskHandelr(item)"
         @mouseleave="leaveTaskHandler"
-        @dismisClick="dismisClick"
+        @dismis-click="dismisClick"
       />
     </div>
   </n-spin>
diff --git a/src/views/worksheet/components/PictureInfo.vue b/src/views/worksheet/components/PictureInfo.vue
index 2a6c825..f649519 100644
--- a/src/views/worksheet/components/PictureInfo.vue
+++ b/src/views/worksheet/components/PictureInfo.vue
@@ -28,10 +28,18 @@ const propertys = computed(() => {
         任务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.historyStates == 3">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+        <div v-if="taskDetailInfo.historyStates == 1" class="tag tag-submiting">
+          待审批
+        </div>
+        <div v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3 || taskDetailInfo.historyStates == 3" class="tag tag-submited">
+          已审批
+        </div>
+        <div v-if="taskDetailInfo.historyStates == 2" class="tag tag-passed">
+          {{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}
+        </div>
+        <div v-else-if="taskDetailInfo.historyStates == 3" class="tag tag-not-passed">
+          {{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}
+        </div>
       </div>
       <n-divider class="divider-line" />
       <div class="property">
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 16aa05a..ccc4b24 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -1,82 +1,83 @@
 <script lang="ts" setup>
-import { audit } from "@/api/task/task";
-import { getPictureSimilarityList, getTaskDetailInfo } from "@/api/work/work";
-import NotPassed from "@/components/Approval/NotPassed.vue";
-import { TASK_STATUS_OBJ } from "@/enums/index";
-import { useWorkOrder } from "@/store/modules/workOrder";
-import { isEmpty } from "@/utils";
-import { formatToDateHMS } from "@/utils/dateUtil";
-import { hideDownload } from "@/utils/image";
-import emitter from "@/utils/mitt";
-import { useInfiniteScroll } from "@vueuse/core";
-import { format } from "date-fns";
-import imagesloaded from "imagesloaded";
-import { clone, cloneDeep, 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";
-
-const batch = ref(false); // 批量审批状态
-const selectItems = ref<any[]>([]);
-const message = useMessage();
-const dialog = useDialog();
-const totalCount = ref(0);
-let _imagesload: any;
+import { audit } from '@/api/task/task'
+import { getPictureSimilarityList, getTaskDetailInfo } from '@/api/work/work'
+import NotPassed from '@/components/Approval/NotPassed.vue'
+import { TASK_STATUS_OBJ } from '@/enums/index'
+import { useWorkOrder } from '@/store/modules/workOrder'
+import { isEmpty } from '@/utils'
+import { formatToDateHMS } from '@/utils/dateUtil'
+import { hideDownload } from '@/utils/image'
+import emitter from '@/utils/mitt'
+import { useInfiniteScroll } from '@vueuse/core'
+import { format } from 'date-fns'
+import imagesloaded from 'imagesloaded'
+import { clone, cloneDeep, 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'
+
+const batch = ref(false) // 批量审批状态
+const selectItems = ref<any[]>([])
+const message = useMessage()
+const dialog = useDialog()
+const totalCount = ref(0)
+let _imagesload: any
 
 function setBatch(value: boolean) {
-  if (value && batch.value) {
-    batch.value = !value;
-  } else {
-    batch.value = value;
-  }
+  if (value && batch.value)
+    batch.value = !value
+  else
+    batch.value = value
+
   if (value === false) {
-    selectItems.value.forEach((item) => (item.checked = false));
-    selectItems.value.length = 0;
+    selectItems.value.forEach(item => (item.checked = false))
+    selectItems.value.length = 0
   }
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectItems.value.indexOf(item);
-  item.checked = checked;
+  const index = selectItems.value.indexOf(item)
+  item.checked = checked
 
-  if (index === -1 && checked) selectItems.value.push(item);
-  else selectItems.value.splice(index, 1);
+  if (index === -1 && checked)
+    selectItems.value.push(item)
+  else selectItems.value.splice(index, 1)
 }
 
 const showActions = computed(() => {
-  return selectItems.value.length > 0 && batch;
-});
+  return selectItems.value.length > 0 && batch
+})
 
 const taskpagination = reactive({
   pageNo: 1,
   pageSize: 10,
-});
+})
 const sortBy: SimilarityPictureSortParam = {
-  orderType: "desc",
-  orderName: "similarityScore",
-};
-const workStore = useWorkOrder();
-const selectTask = ref<any>(null);
-const overTask = ref<any>(null);
-const taskDetailInfo = ref<any>({});
-const confrimModalRef = ref(null);
-const imageRef = ref<ComponentElRef | null>();
-const listData = ref<any[]>([]);
-const loading = ref(false);
-const el = ref<HTMLDivElement | null>(null);
-const selectedSortName = ref("");
-const isFullScreen = ref(false);
-const notPassModalRef = ref(null);
-const mainImageModalRef = ref(null);
-
-let canloadMore = true;
-
-let processItems: any[] = [];
+  orderType: 'desc',
+  orderName: 'similarityScore',
+}
+const workStore = useWorkOrder()
+const selectTask = ref<any>(null)
+const overTask = ref<any>(null)
+const taskDetailInfo = ref<any>({})
+const confrimModalRef = ref(null)
+const imageRef = ref<ComponentElRef | null>()
+const listData = ref<any[]>([])
+const loading = ref(false)
+const el = ref<HTMLDivElement | null>(null)
+const selectedSortName = ref('')
+const isFullScreen = ref(false)
+const notPassModalRef = ref(null)
+const mainImageModalRef = ref(null)
+const wrapperListRef = ref<HTMLElement | undefined>(undefined)
+
+let processItems: any[] = []
 
 function validate(items: any[]) {
-  if (items.length === 0) return "至少选中一个任务";
+  if (items.length === 0)
+    return '至少选中一个任务'
 
   // for (const item of items) {
   //   const { iztrueorfalse, history, states } = item
@@ -90,355 +91,390 @@ function validate(items: any[]) {
   //     return '审批状态不合法'
   // }
 
-  return null;
+  return null
 }
 
 function forwardHandler() {
-  workStore.forward();
+  workStore.forward()
 }
 
 function backHandler() {
-  workStore.back();
+  workStore.back()
 }
 
 function reset() {
-  taskpagination.pageNo = 0;
-  taskpagination.pageSize = 20;
-  listData.value.length = 0;
-  loading.value = false;
-  canloadMore = true;
+  taskpagination.pageNo = 0
+  taskpagination.pageSize = 20
+  listData.value.length = 0
+  loading.value = false
+  canloadMore = true
 }
 
 async function refreshHandler() {
-  reset();
+  reset()
 
   useInfiniteScroll(
     el as any,
     () => {
-      loadMore();
+      loadMore()
     },
-    { distance: 10, canLoadMore: () => canloadMore }
-  );
+    { distance: 10, canLoadMore: () => canloadMore },
+  )
 }
 
 async function loadMore() {
-  if (loading.value || el.value == null) return;
+  if (loading.value || el.value == null)
+    return
 
-  const more = await featchList();
-  listData.value.push(...more);
+  const more = await featchList()
+  listData.value.push(...more)
 }
 
 async function featchList() {
-  loading.value = true;
+  loading.value = true
   try {
-    taskpagination.pageNo += 1;
+    taskpagination.pageNo += 1
     const { data, total, pageCount } = await getPictureSimilarityList({
       ...taskpagination,
       ...sortBy,
       checkDuplicateId: workStore.activeId,
       pictureId: taskDetailInfo.value.id,
-    });
+    })
 
-    totalCount.value = total;
-    canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0;
+    totalCount.value = total
+    canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0
 
-    return data;
-  } catch (error) {
-    canloadMore = false;
-    return [];
+    return data
+  }
+  catch (error) {
+    canloadMore = false
+    return []
   }
 }
 
 const layout = debounce(() => {
-  if (el.value == null) return;
+  if (el.value == null)
+    return
 
-  _imagesload = imagesloaded(".grid-item");
+  _imagesload = imagesloaded('.grid-item')
 
-  _imagesload.on("done", (instance) => {
-    if (!el.value) return;
-    loading.value = false;
-  });
+  _imagesload.on('done', (instance) => {
+    if (!el.value)
+      return
+    loading.value = false
+  })
 
-  _imagesload.on("fail", (instance) => {
-    message.error("图片错误");
-    loading.value = false;
-  });
-}, 300);
+  _imagesload.on('fail', (instance) => {
+    message.error('图片错误')
+    loading.value = false
+  })
+}, 300)
 
 const fullscreenStyles = computed<any>(() => ({
-  width: isFullScreen.value ? "100vw" : "",
-  height: isFullScreen.value ? "100vh" : "",
-  position: isFullScreen.value ? "fixed" : "",
-  top: isFullScreen.value ? "0" : "",
-  left: isFullScreen.value ? "0" : "",
-  zIndex: isFullScreen.value ? "100" : "",
-}));
+  width: isFullScreen.value ? '100vw' : '',
+  height: isFullScreen.value ? '100vh' : '',
+  position: isFullScreen.value ? 'fixed' : '',
+  top: isFullScreen.value ? '0' : '',
+  left: isFullScreen.value ? '0' : '',
+  zIndex: isFullScreen.value ? '100' : '',
+}))
 
 // 切换全屏状态
-const toggleFullScreen = () => {
-  isFullScreen.value = !isFullScreen.value;
-};
+function toggleFullScreen() {
+  isFullScreen.value = !isFullScreen.value
+}
 
 onUpdated(() => {
-  layout();
-});
+  layout()
+})
 
 watch(
   () => workStore.activeId,
   async (newValue, oldValue) => {
-    const packageid = workStore.getActiveId;
+    const packageid = workStore.getActiveId
     if (isEmpty(packageid)) {
-      listData.value.length = 0;
-      totalCount.value = 0;
-      taskDetailInfo.value = {};
-      return;
+      listData.value.length = 0
+      totalCount.value = 0
+      taskDetailInfo.value = {}
+      return
     }
-    queryDetail(packageid);
+    queryDetail(packageid)
     // const res = await getPackageTaskList(newValue, packagepagination);
     // const { data } = res;
     // taskList.value = data;
     // if (taskList.value.length > 0) handleSelect(taskList.value[0]); // 暂时注释掉
-  }
-);
+  },
+)
 
 const packageName = computed(() => {
-  const index = workStore.getCurrentIndex;
-  return workStore.getOrderList[index]?.name || "";
-});
+  const index = workStore.getCurrentIndex
+  return workStore.getOrderList[index]?.name || ''
+})
 
 async function queryDetail(checkDuplicateId: any) {
-  taskDetailInfo.value = await getTaskDetailInfo(checkDuplicateId);
-  const packageid = workStore.getActiveId;
+  taskDetailInfo.value = await getTaskDetailInfo(checkDuplicateId)
+  const packageid = workStore.getActiveId
 
   if (isEmpty(packageid)) {
-    listData.value.length = 0;
-    totalCount.value = 0;
-    return;
+    listData.value.length = 0
+    totalCount.value = 0
+    return
   }
 
-  refreshHandler();
+  refreshHandler()
 }
 // 点击任务包图片，查看详情
 async function handleSelect(item: any) {
   // taskDetailInfo.value = await getTaskDetailInfo(item.id)
-  const packageid = workStore.getActiveId;
+  const packageid = workStore.getActiveId
   if (isEmpty(packageid)) {
-    listData.value.length = 0;
-    totalCount.value = 0;
-    return;
+    listData.value.length = 0
+    totalCount.value = 0
   }
 
   // refreshHandler();
 }
 
-async function sortHandler(orderby: "similarityScore" | "createdate") {
-  selectedSortName.value = orderby;
-  sortBy.orderName = orderby;
-  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
-  refreshHandler();
+async function sortHandler(orderby: 'similarityScore' | 'createdate') {
+  selectedSortName.value = orderby
+  sortBy.orderName = orderby
+  sortBy.orderType = sortBy.orderType === 'asc' ? 'desc' : 'asc'
+  refreshHandler()
 }
 
 const propertys = computed(() => {
-  const { ocrPicture } = taskDetailInfo.value;
+  const { ocrPicture } = taskDetailInfo.value
   const v = pickBy(ocrPicture, (value, key: string) => {
-    return key.startsWith("field") && value !== null;
-  });
-  return v;
-});
+    return key.startsWith('field') && value !== null
+  })
+  return v
+})
 function overTaskHandelr(item: any) {
   if (item?.historyStates === 2 || item?.historyStates == 3) {
-    overTask.value = null;
-    return;
+    overTask.value = null
+    return
   }
 
-  if (validate([item]) == null && batch.value === false) overTask.value = item;
+  if (validate([item]) == null && batch.value === false)
+    overTask.value = item
 }
 
 function leaveTaskHandler() {
-  overTask.value = null;
+  overTask.value = null
+}
+function onEsc() {
+  if (isFullScreen.value && !(document.querySelector('.n-modal-container')))
+    isFullScreen.value = false
 }
-
 onUnmounted(() => {
-  workStore.reset();
-});
-
+  workStore.reset()
+  document.removeEventListener('keydown', onEsc)
+})
+onMounted(() => {
+  document.addEventListener('keydown', onEsc)
+})
 function immersionHandler() {
   // class="wrapper"
   // workStore.updateImmersion();
-  toggleFullScreen();
+
+  toggleFullScreen()
 }
 
 function showAction() {
-  const item = taskDetailInfo.value;
-  if (item.historyStates === 2 || item.historyStates === 3) {
-    return;
-  }
-  if (batch.value === false) overTask.value = item;
+  const item = taskDetailInfo.value
+  if (item.historyStates === 2 || item.historyStates === 3)
+    return
+
+  if (batch.value === false)
+    overTask.value = item
 }
 
 function hideAction() {
-  overTask.value = null;
+  overTask.value = null
 }
 
 function previewHandler(event: MouseEvent) {
-  event.stopImmediatePropagation();
-  event.stopPropagation();
-
+  event.stopImmediatePropagation()
+  event.stopPropagation()
   if (imageRef.value && (imageRef.value as any).src)
-    (imageRef.value as any).mergedOnClick();
+    (imageRef.value as any).mergedOnClick()
 }
 function rejectHandler() {
-  const modal = unref(notPassModalRef)! as any;
-  modal.showModal(selectItems.value);
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal(selectItems.value)
 }
 
 function singleRejectHandler(item) {
-  const modal = unref(notPassModalRef)! as any;
-  modal.showModal([item]);
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([item])
 }
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
-  const formIds: string[] = processItems.map((item) => item.id);
-  const taskIds: string[] = processItems.map((item) => item.taskId);
-  const tasknames: string[] = processItems.map((item) => item.taskname);
+  const formIds: string[] = processItems.map(item => item.id)
+  const taskIds: string[] = processItems.map(item => item.taskId)
+  const tasknames: string[] = processItems.map(item => item.taskname)
 
   const param: ApprovalParam = {
     formid: formIds,
     taskId: taskIds,
     approvd: false,
     taskComment: idOrDesc,
-    taskname: isOther ? tasknames : ["其他"],
-  };
+    taskname: isOther ? tasknames : ['其他'],
+  }
 
-  doAudit(param);
+  doAudit(param)
 }
 function handleRejectMainImage() {
-  const modal = unref(mainImageModalRef)! as any;
-  const params = cloneDeep(taskDetailInfo.value);
-  params.id = params.taskchildpictureid;
-  modal.showModal([params]);
+  const modal = unref(mainImageModalRef)! as any
+  const params = cloneDeep(taskDetailInfo.value)
+  params.id = params.taskchildpictureid
+  modal.showModal([params])
 }
 async function reloadDetailInfo() {
-  const packageid = workStore.getActiveId;
-  taskDetailInfo.value = await getTaskDetailInfo(packageid);
+  const packageid = workStore.getActiveId
+  taskDetailInfo.value = await getTaskDetailInfo(packageid)
 }
 function handleApproveMainImage(items?: any) {
-  let cloneItem: any;
+  let cloneItem: any
   if (overTask.value) {
-    cloneItem = clone(overTask.value);
-    cloneItem.id = cloneItem.taskchildpictureid;
-    processItems = [cloneItem];
+    cloneItem = clone(overTask.value)
+    cloneItem.id = cloneItem.taskchildpictureid
+    processItems = [cloneItem]
   }
-  const msg = validate(processItems);
+  const msg = validate(processItems)
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
-  const list: any = [];
+  const list: any = []
   processItems.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,
-  };
+  }
 
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
       audit(param).then(async (res) => {
-        const { code } = res;
-        if (code === "OK") {
-          message.info(res.message);
-          const packageid = workStore.getActiveId;
-          taskDetailInfo.value = await getTaskDetailInfo(packageid);
-        } else message.error(res.message);
-      });
+        const { code } = res
+        if (code === 'OK') {
+          message.info(res.message)
+          const packageid = workStore.getActiveId
+          taskDetailInfo.value = await getTaskDetailInfo(packageid)
+        }
+        else { message.error(res.message) }
+      })
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 function approvalHandler(items?: any) {
-  let cloneItem: any;
+  let cloneItem: any
   if (batch.value) {
-    processItems = selectItems.value;
-  } else if (overTask.value) {
-    cloneItem = clone(overTask.value);
-    processItems = [cloneItem];
+    processItems = selectItems.value
+  }
+  else if (overTask.value) {
+    cloneItem = clone(overTask.value)
+    processItems = [cloneItem]
   }
   //  任务包图片 => 点击 => 通过/不通过按钮
-  if (items !== undefined && !(items instanceof PointerEvent)) processItems = [items];
+  if (items !== undefined && !(items instanceof PointerEvent))
+    processItems = [items]
 
-  const msg = validate(processItems);
+  const msg = validate(processItems)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
-  const list: any = [];
+  const list: any = []
   processItems.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,
-  };
+  }
 
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      doAudit(param);
+      doAudit(param)
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function doAudit(param: any) {
   audit(param).then((res) => {
-    const { code } = res;
-    setBatch(false);
-    if (code === "OK") {
-      message.info(res.message);
-      emitter.emit("refresh");
-      refreshHandler();
-    } else message.error(res.message);
-  });
+    const { code } = res
+    setBatch(false)
+    if (code === 'OK') {
+      message.info(res.message)
+      emitter.emit('refresh')
+      refreshHandler()
+    }
+    else { message.error(res.message) }
+  })
 }
 
 function reloadList() {
-  setBatch(false);
-  refreshHandler();
+  setBatch(false)
+  refreshHandler()
+}
+function handleRejectdubiousfileyd() {
+  dialog.info({
+    title: '确认提示',
+    content: '确认将图片移入可疑文件夹吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      audit(param).then(async (res) => {
+        const { code } = res
+        if (code === 'OK') {
+          dubiousfileyd(taskDetailInfo.value.pictureId).then(() => {
+            refreshHandler()
+          })
+        }
+        else { message.error(res.message) }
+      })
+    },
+    onNegativeClick: () => { },
+  })
 }
 defineExpose({
   queryDetail,
-});
+})
 </script>
 
 <template>
@@ -457,18 +493,18 @@ defineExpose({
           </div>
           <div class="icon-wrap">
             <SvgIcon
-              size="20"
               v-if="isFullScreen"
+              size="20"
               name="power-off"
-              @click="immersionHandler"
               style="cursor: pointer"
+              @click="immersionHandler"
             />
             <SvgIcon
-              size="20"
               v-else
+              size="20"
               name="immersion-model"
-              @click="immersionHandler"
               style="cursor: pointer"
+              @click="immersionHandler"
             />
           </div>
         </div>
@@ -508,28 +544,23 @@ defineExpose({
               </div>
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
-                <span class="time-value"
-                  >{{
-                    taskDetailInfo?.submitDateTimestamp
-                      ? format(taskDetailInfo?.submitDateTimestamp, "yyyy-MM-dd HH:mm:ss")
-                      : "-"
-                  }}
+                <span class="time-value">{{
+                  taskDetailInfo?.submitDateTimestamp
+                    ? format(taskDetailInfo?.submitDateTimestamp, "yyyy-MM-dd HH:mm:ss")
+                    : "-"
+                }}
                 </span>
               </div>
             </div>
             <div class="status">
               <img
-                v-show="taskDetailInfo?.historyStates === 2"
-                class="img-status"
-                src="@/assets/images/task/pass.png"
+                v-show="taskDetailInfo?.historyStates === 2" class="img-status" src="@/assets/images/task/pass.png"
                 alt=""
-              />
+              >
               <img
-                v-show="taskDetailInfo?.historyStates === 3"
-                class="img-status"
-                src="@/assets/images/task/not_pass.png"
+                v-show="taskDetailInfo?.historyStates === 3" class="img-status" src="@/assets/images/task/not_pass.png"
                 alt=""
-              />
+              >
             </div>
             <!-- 右下信息 -->
             <div class="info img-info">
@@ -540,7 +571,7 @@ defineExpose({
                       class="icon-status"
                       src="@/assets/images/task/status.png"
                       alt=""
-                    />
+                    >
                   </span>
                 </n-gi>
                 <n-gi span="8" class="gi2">
@@ -555,12 +586,11 @@ defineExpose({
                       class="icon-status"
                       src="@/assets/images/task/similarity.png"
                       alt=""
-                    />
+                    >
                   </span>
                 </n-gi>
                 <n-gi span="8" class="gi2">
-                  <span class="value num"
-                    >{{ totalCount }}<span class="unit">张</span>
+                  <span class="value num">{{ totalCount }}<span class="unit">张</span>
                   </span>
                   <span class="label">相似匹配</span>
                 </n-gi>
@@ -579,144 +609,144 @@ defineExpose({
               />
             </div>
             <!-- 操作 -->
-            <div
-              v-show="overTask && overTask.id === taskDetailInfo.id"
-              class="action"
-              @click.stop="hideAction"
-            >
-              <SvgIcon
-                style="cursor: pointer"
-                name="t1"
-                @click.stop="handleApproveMainImage"
-              />
-              <SvgIcon
-                style="cursor: pointer; margin-left: 30px"
-                name="t2"
-                @click.stop="handleRejectMainImage"
-              />
+            <div v-show="overTask && overTask.id === taskDetailInfo.id" class="action" @click.stop="hideAction">
+              <SvgIcon v-if="[1].includes(taskDetailInfo.historyStates)" style="cursor: pointer" name="t1" @click.stop="handleApproveMainImage" />
+              <SvgIcon v-if="[1].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="handleRejectMainImage" />
+              <SvgIcon v-if="[1, 2, 3].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t9" @click.stop="handleRejectdubiousfileyd" />
             </div>
-          </div>
-          <PictureInfo :taskDetailInfo="taskDetailInfo"></PictureInfo>
-        </div>
-        <div
-          style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0"
-        >
-          <div>
-            <span
-              style="
-                font-size: 18px;
-                font-weight: Medium;
-                color: #333333;
-                font-family: PingFang SC, PingFang SC-Medium;
-              "
-              >任务包图片</span
-            >
+            <PictureInfo :task-detail-info="taskDetailInfo" />
           </div>
           <div
-            style="
+            style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0"
+          >
+            <div>
+              <span
+                style="font-size: 18px; font-weight: Medium;color: #333333;font-family: PingFang SC, PingFang SC-Medium;"
+              >任务包图片</span>
+            </div>
+            <div
+              style="
               display: flex;
               align-items: center;
               font-size: 14px;
               margin-right: 25px;
               color: #323233;
             "
-          >
-            <div style="cursor: pointer" @click="sortHandler('createdate')">
-              <span>时间排序</span>
-              <SvgIcon
-                style="margin-left: 5px"
-                name="sort"
-                size="12"
-                v-show="selectedSortName !== 'createdate'"
-              />
-              <SvgIcon
-                style="margin-left: 5px"
-                name="active-sort"
-                size="12"
-                v-show="selectedSortName === 'createdate'"
-              />
-            </div>
-            <div
-              style="margin-left: 15px; cursor: pointer"
-              @click="sortHandler('similarityScore')"
             >
-              <span>相似度排序</span>
-              <SvgIcon
-                style="margin-left: 5px"
-                name="sort"
-                size="12"
-                v-show="selectedSortName !== 'similarityScore'"
-              />
-              <SvgIcon
-                style="margin-left: 5px"
-                name="active-sort"
-                size="12"
-                v-show="selectedSortName === 'similarityScore'"
-              />
+              <div style="cursor: pointer" @click="sortHandler('createdate')">
+                <span>时间排序</span>
+                <SvgIcon
+                  v-show="selectedSortName !== 'createdate'"
+                  style="margin-left: 5px"
+                  name="sort"
+                  size="12"
+                />
+                <SvgIcon
+                  v-show="selectedSortName === 'createdate'"
+                  style="margin-left: 5px"
+                  name="active-sort"
+                  size="12"
+                />
+              </div>
+              <div
+                style="margin-left: 15px; cursor: pointer"
+                @click="sortHandler('similarityScore')"
+              >
+                <span>相似度排序</span>
+                <SvgIcon
+                  v-show="selectedSortName !== 'similarityScore'"
+                  style="margin-left: 5px"
+                  name="sort"
+                  size="12"
+                />
+                <SvgIcon
+                  v-show="selectedSortName === 'similarityScore'"
+                  style="margin-left: 5px"
+                  name="active-sort"
+                  size="12"
+                />
+              </div>
             </div>
           </div>
-        </div>
-        <div class="wrapper-list">
-          <div
-            v-for="(item, index) in listData"
-            :key="index"
-            :class="{ 'item-selected': item === selectTask }"
-            class="grid-item"
-            @click="handleSelect(item)"
-            @mouseover="overTaskHandelr(item)"
-            @mouseleave="leaveTaskHandler"
-          >
+          <div class="wrapper-list">
             <div
-              class="img-wrapper"
-              :style="{ 'background-image': `url(${item.imgurl})` }"
-            />
-            <div class="time-wrapper">
-              <div class="time">
-                <SvgIcon color="#FFF" size="16" name="camera" />
-                <span class="current-time">{{
-                  item.photoDateTimestamp
-                    ? formatToDateHMS(Number(item.photoDateTimestamp) || 0)
-                    : "-"
-                }}</span>
+              v-for="(item, index) in listData"
+              :key="index"
+              :class="{ 'item-selected': item === selectTask }"
+              class="grid-item"
+              @click="handleSelect(item)"
+              @mouseover="overTaskHandelr(item)"
+              @mouseleave="leaveTaskHandler"
+            >
+              <div
+                class="img-wrapper"
+                :style="{ 'background-image': `url(${item.imgurl})` }"
+              />
+              <div class="time-wrapper">
+                <div class="time">
+                  <SvgIcon color="#FFF" size="16" name="camera" />
+                  <span class="current-time">{{
+                    item.photoDateTimestamp
+                      ? formatToDateHMS(Number(item.photoDateTimestamp) || 0)
+                      : "-"
+                  }}</span>
+                </div>
+                <div class="time">
+                  <SvgIcon color="#FFF" size="16" name="save" />
+                  <span class="current-time">{{
+                    item.submitDateTimestamp
+                      ? formatToDateHMS(Number(item.submitDateTimestamp) || 0)
+                      : "-"
+                  }}</span>
+                </div>
               </div>
-              <div class="time">
-                <SvgIcon color="#FFF" size="16" name="save" />
-                <span class="current-time">{{
-                  item.submitDateTimestamp
-                    ? formatToDateHMS(Number(item.submitDateTimestamp) || 0)
-                    : "-"
-                }}</span>
+              <div class="check">
+                <n-checkbox
+                  v-show="batch && item.historyStates !== 2 && item.historyStates !== 3"
+                  v-model:checked="item.checked"
+                  @click.stop
+                  @update:checked="onCheckChange($event, item)"
+                />
               </div>
-            </div>
-            <div class="check">
-              <n-checkbox
-                v-show="batch && item.historyStates !== 2 && item.historyStates !== 3"
-                v-model:checked="item.checked"
-                @click.stop
-                @update:checked="onCheckChange($event, item)"
-              />
-            </div>
-            <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100 }">
-              <div class="val">
-                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0)
-                }}<span class="percent-unit">%</span>
+              <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100 }">
+                <SvgIcon size="42" :name="item.maxSimilarity == 100 ? 'error_tag' : 'tag'" />
+                <div class="val">
+                  {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0)
+                  }}<span class="percent-unit">%</span>
+                </div>
               </div>
-            </div>
 
-            <div class="pass-status" v-if="item.historyStates === 2">
-              <SvgIcon name="pass-icon" style="width: 52; height: 24px" />
-            </div>
-            <div class="pass-status" v-else-if="item.historyStates === 3">
-              <SvgIcon name="no-pass-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)"
-              />
+              <div v-if="item.historyStates === 2" class="pass-status">
+                <SvgIcon name="pass-icon" style="width: 52; height: 24px" />
+              </div>
+              <div v-else-if="item.historyStates === 3" class="pass-status">
+                <SvgIcon name="no-pass-icon" style="width: 52; height: 24px" />
+              </div>
+              <SvgIcon v-if="[1, 2, 3].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t9" @click.stop="handleRejectdubiousfileyd" />
+
+              <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)"
+                />
+                <SvgIcon v-if="[1, 2, 3].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t9" @click.stop="handleRejectdubiousfileyd" />
+              </div>
             </div>
+            <n-back-top :listen-to="wrapperListRef" :bottom="220" :visibility-height="10">
+              <div
+                style="
+        width: 100px;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        font-size: 14px;
+      "
+              >
+                回到顶部
+              </div>
+            </n-back-top>
           </div>
         </div>
       </div>
@@ -1147,16 +1177,33 @@ defineExpose({
         display: flex;
         align-items: center;
         justify-content: center;
-        width: 35px;
-        height: 18px;
+        // width: 35px;
+        // height: 18px;
         opacity: 0.9;
-        background: #6f92fd;
+        // background: #6f92fd;
         border-radius: 6px 0px 6px 0px;
         z-index: 5;
         right: 12px;
-        top: 15px;
+        top: 0;
         color: #fff;
         font-size: 14px;
+        .val {
+          position: absolute;
+    left: 0;
+    top: 0;
+    display: block;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    font-family: PingFang SC, PingFang SC-Semibold;
+    font-weight: Semibold;
+    text-align: left;
+    color: #ffffff;
+    line-height: 24px;
+        }
       }
 
       .percent-unit {
@@ -1203,6 +1250,10 @@ defineExpose({
         justify-content: center;
         background-color: rgba(0, 0, 0, 0.48);
       }
+<<<<<<< HEAD
+
+=======
+>>>>>>> test
     }
   }
 }
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index 7621a20..7fa9cb1 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-import { workPackageMap } from "@/config/workorder";
-import { useUser } from "@/store/modules/user";
-import { difference } from "lodash-es";
-import { computed, defineEmits, defineProps, onMounted, ref, watch } from "vue";
-import { VueDraggable } from "vue-draggable-plus";
+import { difference } from 'lodash-es'
+import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { workPackageMap } from '@/config/workorder'
+import { useUser } from '@/store/modules/user'
 
 const props = defineProps({
   reviewType: {
@@ -12,304 +12,319 @@ const props = defineProps({
     default: () => 1,
     require: true,
   },
-});
+})
 
-const emit = defineEmits(["onOk"]);
+const emit = defineEmits(['onOk'])
 
 // 左侧隐藏列表
-const offList = ref<any[]>([]);
+const offList = ref<any[]>([])
 // 右侧显示列表
-const onList = ref<any[]>([]);
+const onList = ref<any[]>([])
 // 固定默认列表
-const fixList = ref<any[]>([]);
-
+const fixList = ref<any[]>([])
+// 搜索关键词
+const searchKey = ref('')
+const searchFixVal = ref('')
 const allCount = computed(() => {
-  return `全部字段(共${offList.value.length - 1}个)`;
-});
-
+  return `全部字段(共${offList.value.length - 1}个)`
+})
+const showOffList = computed(() => {
+  return offList.value.filter((i) => {
+    console.log(i.name, searchKey.value, 'i.name.includes(searchKey.value)')
+    return i.name.includes(searchKey.value)
+  })
+})
+const showFixList = computed(() => {
+  return fixList.value.filter(i => i.name.includes(searchFixVal.value))
+})
 const selectCount = computed(() => {
-  return `显示字段(共${onList.value.length}个)`;
-});
+  return `显示字段(共${onList.value.length}个)`
+})
 
 function generatList() {
-  const keys = Object.keys(workPackageMap);
-  let showList: object[] = [];
-  const hideList: object[] = [];
-  const showStr = "status";
-  const showKeys = showStr.split(",").map((key: string) => key.toLowerCase());
+  const keys = Object.keys(workPackageMap)
+  let showList: object[] = []
+  const hideList: object[] = []
+  const showStr = 'status'
+  const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
 
   for (const key of keys) {
-    const name = workPackageMap[key]?.label;
-    const isDefault = workPackageMap[key]?.isDefault;
+    const name = workPackageMap[key]?.label
+    const isDefault = workPackageMap[key]?.isDefault
 
     // 系统配置为Y且不是默认配置
     if (!isDefault) {
       hideList.push({
         id: key,
-        name: name || "未配置",
+        name: name || '未配置',
         fix: isDefault,
         checked: workPackageMap[key].isDefault,
-      });
+      })
     }
   }
 
   showList = showKeys.reduce((acc, key) => {
     const config = {
       id: key,
-      name: workPackageMap[key].label || "未配置",
+      name: workPackageMap[key].label || '未配置',
       fix: workPackageMap[key].isDefault,
-    };
-    return [...acc, config];
-  }, []);
+    }
+    return [...acc, config]
+  }, [])
 
-  const fixedList = generateDefaultList();
+  const fixedList = generateDefaultList()
 
-  hideList.unshift(...fixedList);
-  showList.unshift(...fixedList);
+  hideList.unshift(...fixedList)
+  showList.unshift(...fixedList)
 
-  onList.value = showList;
-  offList.value = hideList;
-  return { showList, hideList };
+  onList.value = showList
+  offList.value = hideList
+  console.log(offList.value, 'console.log(offList.value)')
+  return { showList, hideList }
 }
 
 function generateDefaultList() {
   return Object.keys(workPackageMap).reduce((acc, key) => {
-    const { label, isDefault } = workPackageMap[key];
+    const { label, isDefault } = workPackageMap[key]
 
     if (isDefault) {
       const config = {
         id: key,
-        name: label || "未配置",
+        name: label || '未配置',
         fix: true,
         checked: true,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 }
 
-const show = ref(false);
+const show = ref(false)
 const checkAll = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
-  return onList.value.length == offList.value.length - baseNum;
-});
+    if (v.fix)
+      baseNum += 1
+  })
+  return onList.value.length == offList.value.length - baseNum
+})
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let userField = "";
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let userField = ''
   fixList.value.map((v) => {
-    userField += `${v.id},`;
-  });
+    userField += `${v.id},`
+  })
   onList.value.map((v) => {
-    userField += `${v.id},`;
-  });
-  userField = userField.slice(0, userField.length - 1);
-  savefield(props.reviewType, userInfo.id, userField);
-  e.preventDefault();
-  closeModal();
-  emit("onOk");
+    userField += `${v.id},`
+  })
+  userField = userField.slice(0, userField.length - 1)
+  savefield(props.reviewType, userInfo.id, userField)
+  e.preventDefault()
+  closeModal()
+  emit('onOk')
 }
 
 defineExpose({
   showModal,
-});
+})
 
 // generatList();
 
-const selectIds = ref<string[]>([]);
+const selectIds = ref<string[]>([])
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
 
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
 
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id);
+  const index = selectIds.value.indexOf(item.id)
 
-  item.checked = checked;
+  item.checked = checked
 
-  if (index === -1 && checked) selectIds.value.push(item.id);
-  else selectIds.value.splice(index, 1);
+  if (index === -1 && checked)
+    selectIds.value.push(item.id)
+  else selectIds.value.splice(index, 1)
 }
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id;
-  });
-});
+    return item.id
+  })
+})
 
 watch(
   () => selectIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const action = newVal > oldVal ? "add" : "remove";
-    const diff =
-      action === "add"
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff
+      = action === 'add'
         ? difference(selectIds.value, showIds.value)
-        : difference(showIds.value, selectIds.value);
+        : difference(showIds.value, selectIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
-    if (action === "add") {
+    if (action === 'add') {
       for (const item of offList.value) {
         if (!item.fix && diff.includes(item.id)) {
           onList.value.push({
             id: item.id,
-            name: item.name || "未配置",
+            name: item.name || '未配置',
             fix: item.fix || false,
-          });
+          })
         }
       }
-    } else {
-      const list = onList.value;
+    }
+    else {
+      const list = onList.value
       for (let index = 0; index < list.length; index++) {
-        const item = list[index];
+        const item = list[index]
         if (!item.fix && diff.includes(item.id)) {
-          list.splice(index, 1);
-          index--;
+          list.splice(index, 1)
+          index--
         }
       }
     }
-  }
-);
+  },
+)
 
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const diff = difference(selectIds.value, showIds.value);
+    const diff = difference(selectIds.value, showIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
     for (const item of offList.value) {
       if (!item.fix && diff.includes(item.id)) {
-        const index = selectIds.value.indexOf(item.id);
-        item.checked = false;
-        selectIds.value.splice(index, 1);
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
       }
     }
-  }
-);
+  },
+)
 
 function clearDragSource() {
   onList.value = onList.value.filter((item) => {
-    return item.fix === true;
-  });
+    return item.fix === true
+  })
 }
 
 function removeHandler(id: string) {
   let index = onList.value.findIndex((item) => {
-    return item.id === id;
-  });
-  if (index !== -1) onList.value.splice(index, 1);
+    return item.id === id
+  })
+  if (index !== -1)
+    onList.value.splice(index, 1)
 
-  index = offList.value.findIndex((v) => v.id == id);
-  offList.value[index].checked = false;
+  index = offList.value.findIndex(v => v.id == id)
+  offList.value[index].checked = false
 }
 
-const initData = () => {
-  offList.value = [];
-  onList.value = [];
-  fixList.value = [];
+function initData() {
+  offList.value = []
+  onList.value = []
+  fixList.value = []
   // offShowList.value = [];
   // onShowList.value = [];
   // fixShowList.value = [];
-  selectIds.value = [];
-};
-
-const getData = async () => {
-  initData();
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(props.reviewType); //所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(props.reviewType, userInfo.id); //当前用户选择的项目
-  const useList = res.data;
+  selectIds.value = []
+}
+
+async function getData() {
+  initData()
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(props.reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(props.reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
   /**
    * name 标题
    * id 键值
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
 
   allList.map((v) => {
-    let item = {
+    const item = {
       name: v.fieldDesc,
       id: v.name,
       fix: v.isrequired == 2,
       checked:
-        v.isrequired == 2 ||
-        Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
-        Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
-    };
-    if (item.fix) {
-      fixList.value.push(item);
-    } else {
-      offList.value.push(item);
+        v.isrequired == 2
+        || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+        || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
     }
-  });
-  offList.value.unshift(...fixList.value);
-  useList.userFieldFixed?.split(",").map((v) => {
-    let item = allList.find((v2) => v2.name == v);
+    if (item.fix)
+      fixList.value.push(item)
+    else
+      offList.value.push(item)
+  })
+  offList.value.unshift(...fixList.value)
+  useList.userFieldFixed?.split(',').map((v) => {
+    let item = allList.find(v2 => v2.name == v)
     if (item) {
       item = {
         name: item.fieldDesc,
         id: item.name,
         fix: item.isrequired == 2,
         checked: true,
-      };
-      selectIds.value.push(item.id);
-      if (!item.fix) {
-        onList.value.push(item);
       }
+      selectIds.value.push(item.id)
+      if (!item.fix)
+        onList.value.push(item)
     }
-  });
-};
+  })
+}
 
 onMounted(async () => {
-  getData();
-});
+  getData()
+})
 
 const indeterminate = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
+    if (v.fix)
+      baseNum += 1
+  })
   return (
-    onList.value.length > 0 &&
-    offList.value.length - baseNum > onList.value.length
-  );
-});
+    onList.value.length > 0
+    && offList.value.length - baseNum > onList.value.length
+  )
+})
 </script>
 
 <template>
@@ -338,7 +353,7 @@ const indeterminate = computed(() => {
               :bordered="false"
             >
               <div>
-                <n-input placeholder="搜索关键词">
+                <n-input v-model:value="searchKey" placeholder="搜索关键词">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
@@ -348,13 +363,13 @@ const indeterminate = computed(() => {
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全选"
-                      @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
+                      @update:checked="onCheckAllChange"
                     />
                   </div>
                   <div class="content">
                     <div
-                      v-for="item in offList"
+                      v-for="item in showOffList"
                       :key="item.id"
                       style="width: 170px"
                       :class="{ 'disable-check': item.fix }"
@@ -384,14 +399,14 @@ const indeterminate = computed(() => {
                 <span class="textbtnStyle" @click="clearDragSource">恢复默认</span>
               </template>
               <div>
-                <n-input placeholder="搜索关键词">
+                <n-input v-model:value="searchFixVal" placeholder="搜索关键词">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
                 </n-input>
                 <div class="draggable-ul">
                   <div
-                    v-for="item in fixList"
+                    v-for="item in showFixList"
                     :key="item.id"
                     :class="{ fix: item.fix }"
                     class="cursor-move draggable-item"
@@ -429,7 +444,9 @@ const indeterminate = computed(() => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit" style="background-color: #507AFD;"> 确定 </n-button>
+          <n-button type="info" style="background-color: #507AFD;" @click="handleSumbit">
+            确定
+          </n-button>
           <n-button secondary style="margin-left: 15px" @click="getData();closeModal();">
             取消
           </n-button>