From ed48e7d6f4b24967a353cf93f8249e354b48fd28 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 08:26:45 +0800
Subject: [PATCH 01/26] bug

---
 src/views/final/content/Content.vue | 652 ++++++++++++++--------------
 src/views/task/content/Content.vue  |   2 +-
 2 files changed, 336 insertions(+), 318 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index d0b8596..6da9fac 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from "naive-ui";
-import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
+import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
+import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
 import {
   computed,
   defineEmits,
@@ -13,9 +13,9 @@ import {
   ref,
   unref,
   watch,
-} from "vue";
-import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
-import { useRoute, useRouter } from "vue-router";
+} from 'vue'
+import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
+import { useRoute, useRouter } from 'vue-router'
 import {
   Action,
   CustomTabelModal,
@@ -24,50 +24,50 @@ import {
   RepeatModal,
   RepeatTaskTableModal,
   StatusItem,
-} from "../comp";
-import { getFinalList } from "@/api/final";
-import { audit } from "@/api/task/task";
-import SvgIcon from "@/components/Icon/SvgIcon.vue";
-import type { RowData } from "@/config/final";
-import { findKey, headRules } from "@/config/final";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useUser } from "@/store/modules/user";
-import { useFinal } from "@/store/modules/final";
-import { getViewportOffset } from "@/utils/domUtils";
-import { isBoolean } from "@/utils/is";
-import { useDictionary } from "@/store/modules/dictonary";
-import ConfrimModal from "@/views/task/modal/ConfrimModal.vue";
-import type { ApprovalParam } from "/#/api";
-import emitter from "@/utils/mitt";
-import { formatToDateHMS } from "@/utils/dateUtil";
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-
-const emit = defineEmits(["changeShow"]);
+} from '../comp'
+import { getFinalList } from '@/api/final'
+import { audit } from '@/api/task/task'
+import SvgIcon from '@/components/Icon/SvgIcon.vue'
+import type { RowData } from '@/config/final'
+import { findKey, headRules } from '@/config/final'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useUser } from '@/store/modules/user'
+import { useFinal } from '@/store/modules/final'
+import { getViewportOffset } from '@/utils/domUtils'
+import { isBoolean } from '@/utils/is'
+import { useDictionary } from '@/store/modules/dictonary'
+import NotPassed from '@/components/Approval/NotPassed.vue'
+import type { ApprovalParam } from '/#/api'
+import emitter from '@/utils/mitt'
+import { formatToDateHMS } from '@/utils/dateUtil'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+
+const emit = defineEmits(['changeShow'])
 function changeContent() {
-  emit("changeShow");
+  emit('changeShow')
 }
 
-const dicStore = useDictionary();
-const izstatusList = ref([]);
-const router = useRouter();
-const route = useRoute();
-const reviewType = 0;
+const dicStore = useDictionary()
+const izstatusList = ref([])
+const router = useRouter()
+const route = useRoute()
+const reviewType = 0
 const actionsColumns = {
-  title: "操作",
-  key: "actions",
+  title: '操作',
+  key: 'actions',
   minWidth: 200,
-  fixed: "right",
+  fixed: 'right',
   render(row) {
     return h(ListAction, {
       id: row.id,
       status: row.states,
       trigger: (action) => {
-        actionHandler(action, row);
+        actionHandler(action, row)
       },
-    });
+    })
   },
-};
-const columnsRef = ref<DataTableColumns<RowData>>([]);
+}
+const columnsRef = ref<DataTableColumns<RowData>>([])
 // const columns: DataTableColumns<RowData> = [
 //   {
 //     type: "selection",
@@ -167,410 +167,428 @@ const columnsRef = ref<DataTableColumns<RowData>>([]);
 async function getColumns() {
   columnsRef.value = [
     {
-      type: "selection",
-      fixed: "left",
+      type: 'selection',
+      fixed: 'left',
       width: 50,
     },
-  ];
-
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(reviewType); // 所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
-  const useList = res.data;
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
-  console.log(userFieldFixed, userFieldUnFixed, "userFieldUnFixed");
-  console.log(allList, "allList");
+  ]
+
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
+  console.log(userFieldFixed, userFieldUnFixed, 'userFieldUnFixed')
+  console.log(allList, 'allList')
   allList?.map((v) => {
     if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
       if (v.isrequired == 2) {
         columnsRef.value.push({
           title: v.fieldDesc,
-          fixed: "left",
+          fixed: 'left',
           key: v.name,
           width: 120,
-        });
+        })
       }
     }
 
-    if (userFieldFixed?.find((v2) => v2 == v.name)) {
+    if (userFieldFixed?.find(v2 => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
-        fixed: "left",
+        fixed: 'left',
         width: 120,
-      });
+      })
     }
-    if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
+    if (userFieldUnFixed?.find(v2 => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
         width: 120,
-      });
+      })
     }
-  });
-  columnsRef.value.push(actionsColumns as any);
-  formatColumns();
-  console.log(columnsRef.value, "columnsRef");
+  })
+  columnsRef.value.push(actionsColumns as any)
+  formatColumns()
+  console.log(columnsRef.value, 'columnsRef')
 }
 
 async function formatColumns() {
   // TODO处理特殊字段
 
-  let index;
-  index = columnsRef.value.findIndex((v) => v.title == "任务ID");
+  let index
+  index = columnsRef.value.findIndex(v => v.title == '任务ID')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "任务ID",
+      title: '任务ID',
       key: columnsRef.value[index].key, // "id"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states
-        );
+          (item: any) => item.value == row.states,
+        )
         return h(
           NButton,
           {
-            strong: true,
-            tertiary: true,
-            text: true,
-            size: "small",
-            "text-color": "#507AFD",
-            onClick: () => goDetail(row),
+            'strong': true,
+            'tertiary': true,
+            'text': true,
+            'size': 'small',
+            'text-color': '#507AFD',
+            'onClick': () => goDetail(row),
           },
-          { default: () => row.id }
-        );
+          { default: () => row.id },
+        )
       },
-    };
+    }
   }
 
-  index = columnsRef.value.findIndex((v) => v.title == "任务名称");
+  index = columnsRef.value.findIndex(v => v.title == '任务名称')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "任务名称",
+      title: '任务名称',
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    };
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "审批状态");
+  index = columnsRef.value.findIndex(v => v.title == '审批状态')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "审批状态",
+      title: '审批状态',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 120,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states
-        );
+          (item: any) => item.value == row.states,
+        )
         return h(StatusItem, {
           id: row.id,
           status: row.states,
-          label: item ? item.label : "",
-        });
+          label: item ? item.label : '',
+        })
       },
-    };
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "图片相似度");
+  index = columnsRef.value.findIndex(v => v.title == '图片相似度')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "图片相似度",
+      title: '图片相似度',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 150,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row: any) {
-        return row.similarityscore ? `${row.similarityscore}%` : "";
+        return h('div', {
+          id: row.id,
+          style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
+        }, { default: () => row.similarityscore ? `${row.similarityscore}%` : '' })
       },
-    };
+
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "提报时间");
+  index = columnsRef.value.findIndex(v => v.title == '提报时间')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "提报时间",
+      title: '提报时间',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row: any) {
-        return formatToDateHMS(row.createdate || 0);
+        return formatToDateHMS(row.createdate || 0)
       },
-    };
+    }
   }
 
-  index = columnsRef.value.findIndex((v) => v.title == "更新时间");
+  index = columnsRef.value.findIndex(v => v.title == '更新时间')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "更新时间",
+      title: '更新时间',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.updatetime ? formatToDateHMS(row.updatetime) : "";
+        return row.updatetime ? formatToDateHMS(row.updatetime) : ''
       },
-    };
+    }
   }
 }
 
-const deviceHeight = ref(600);
+const deviceHeight = ref(600)
 
 onMounted(() => {
-  emitter.on("filter-final", refreshHandler);
-  getColumns();
+  emitter.on('filter-final', refreshHandler)
+  getColumns()
 
   nextTick(() => {
-    computeListHeight();
-  });
-});
+    computeListHeight()
+  })
+})
 
 onBeforeMount(() => {
-  dicStore.fetchizstatusListt();
-});
+  dicStore.fetchizstatusListt()
+})
 
 watch(
   () => dicStore.izstatusList,
   (newval) => {
-    izstatusList.value = newval;
-  }
-);
+    izstatusList.value = newval
+  },
+)
 
 onUnmounted(() => {
-  emitter.off("filter-final", refreshHandler);
-});
+  emitter.off('filter-final', refreshHandler)
+})
 
-const tableRef = ref<InstanceType<typeof NDataTable>>();
-const rowKey = (row: RowData) => row.id;
-const loading = ref(true);
-const total = ref(0);
+const tableRef = ref<InstanceType<typeof NDataTable>>()
+const rowKey = (row: RowData) => row.id
+const loading = ref(true)
+const total = ref(0)
 const pagination = reactive({
   page: 1,
-  pageCount: 1,
+  pageCount: 10,
   pageSize: 10,
   showSizePicker: true,
   pageSizes: [
     {
-      label: "10 每页",
+      label: '10 每页',
       value: 10,
     },
     {
-      label: "15 每页",
+      label: '15 每页',
       value: 15,
     },
     {
-      label: "30 每页",
+      label: '30 每页',
       value: 30,
     },
     {
-      label: "50 每页",
+      label: '50 每页',
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-});
-const tableData = ref<Array<RowData>>([]);
-const selectionIds = ref<DataTableRowKey[]>([]);
-const dialog = useDialog();
-const message = useMessage();
-const finalStore = useFinal();
+})
+const tableData = ref<Array<RowData>>([])
+const selectionIds = ref<DataTableRowKey[]>([])
+const dialog = useDialog()
+const message = useMessage()
+const finalStore = useFinal()
 
 async function query(page: number, pageSize: number, filterId?: any) {
-  const asideParmas = unref(finalStore.getAsideValue);
+  const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterId ? { userSearchId: filterId } : asideParmas;
+  const params = filterId ? { userSearchId: filterId } : asideParmas
   const result = await getFinalList({
-    sortorder: "asc",
+    sortorder: 'asc',
     pageSize,
     currPage: page,
-    sortname: "",
+    sortname: '',
     ...params,
-  });
-  const { data, pageCount, totalCount } = result;
-  tableData.value = data;
-  total.value = totalCount;
-  pagination.page = page;
-  pagination.pageCount = pageCount;
-  loading.value = false;
+  })
+  const { data, pageCount, totalCount } = result
+  tableData.value = data
+  total.value = totalCount
+  pagination.page = page
+  pagination.pageCount = pageCount
+  loading.value = false
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value) return;
-  const { pageSize } = pagination;
-  pagination.page = currentPage;
-  await query(currentPage, pageSize);
+  if (loading.value)
+    return
+  const { pageSize } = pagination
+  pagination.page = currentPage
+  await query(currentPage, pageSize)
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value) return;
+  if (loading.value)
+    return
 
-  const { page } = pagination;
-  pagination.pageSize = currentPageSize;
+  const { page } = pagination
+  pagination.pageSize = currentPageSize
 
-  await query(page, currentPageSize);
+  await query(page, currentPageSize)
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys;
+  selectionIds.value = rowKeys
 }
 
 async function computeListHeight() {
-  const table = unref(tableRef);
-  if (!table) return;
-  const tableEl: any = table?.$el;
-  const headEl = tableEl.querySelector(".n-data-table-thead ");
-  const { bottomIncludeBody } = getViewportOffset(headEl);
-  const headerH = 64;
-  let paginationH = 2;
-  const marginH = 60;
+  const table = unref(tableRef)
+  if (!table)
+    return
+  const tableEl: any = table?.$el
+  const headEl = tableEl.querySelector('.n-data-table-thead ')
+  const { bottomIncludeBody } = getViewportOffset(headEl)
+  const headerH = 64
+  let paginationH = 2
+  const marginH = 60
   if (!isBoolean(unref(pagination))) {
     const paginationEl = tableEl.querySelector(
-      ".n-data-table__pagination"
-    ) as HTMLElement;
+      '.n-data-table__pagination',
+    ) as HTMLElement
     if (paginationEl) {
-      const offsetHeight = paginationEl.offsetHeight;
-      paginationH += offsetHeight || 0;
-    } else {
-      paginationH += 28;
+      const offsetHeight = paginationEl.offsetHeight
+      paginationH += offsetHeight || 0
+    }
+    else {
+      paginationH += 28
     }
   }
-  let height = bottomIncludeBody - (headerH + paginationH + marginH);
-  const maxHeight = 800;
-  height = maxHeight && maxHeight < height ? maxHeight : height;
-  deviceHeight.value = height;
+  let height = bottomIncludeBody - (headerH + paginationH + marginH)
+  const maxHeight = 800
+  height = maxHeight && maxHeight < height ? maxHeight : height
+  deviceHeight.value = height
 }
 
-useWindowSizeFn(computeListHeight);
+useWindowSizeFn(computeListHeight)
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
-});
+  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
+})
 
-query(pagination.page, pagination.pageSize);
+query(pagination.page, pagination.pageSize)
 
-const customTabelRef = ref(null);
-const importExcelRef = ref(null);
-const rejectModalRef = ref(null);
-const repeatModalRef = ref(null);
-const repeatTaskTableModalRef = ref(null);
+const customTabelRef = ref(null)
+const importExcelRef = ref(null)
+const notPassModalRef = ref(null) // 不通过
+const repeatModalRef = ref(null)
+const repeatTaskTableModalRef = ref(null)
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any;
-  modal.showModal();
+  const modal = unref(modalRef)! as any
+  modal.showModal()
 }
 
-const popover = ref<ComponentRef | null>(null);
+const popover = ref<ComponentRef | null>(null)
 
 function importHandler() {
-  (popover.value as any).setShow(false);
-  showModal(importExcelRef);
+  (popover.value as any).setShow(false)
+  showModal(importExcelRef)
 }
 
 function exportHandler() {
-  loading.value = true;
-  import("@/utils/exportExcel").then((excel) => {
+  loading.value = true
+  import('@/utils/exportExcel').then((excel) => {
     const tHeader = [
-      "任务Id",
-      "任务名称",
-      "审批节点",
-      "审批状态",
-      "图片相似度",
-      "提报时间",
-      "更新时间",
-    ];
+      '任务Id',
+      '任务名称',
+      '审批节点',
+      '审批状态',
+      '图片相似度',
+      '提报时间',
+      '更新时间',
+    ]
     const filterVal = [
-      "id",
-      "name",
-      "approvalnode",
-      "approvalstatus",
-      "similarity",
-      "uptime",
-      "updatetime",
-    ];
-    const list = tableData.value;
-    const data = formatJson(filterVal, list);
+      'id',
+      'name',
+      'approvalnode',
+      'approvalstatus',
+      'similarity',
+      'uptime',
+      'updatetime',
+    ]
+    const list = tableData.value
+    const data = formatJson(filterVal, list)
     excel.export_json_to_excel({
       header: tHeader,
       data,
-      filename: "data",
+      filename: 'data',
       autoWidth: true,
-      bookType: "xlsx",
-    });
-    loading.value = false;
-  });
+      bookType: 'xlsx',
+    })
+    loading.value = false
+  })
 }
 
 function formatJson(filterVal, jsonDataList) {
-  return jsonDataList.map((v) =>
+  return jsonDataList.map(v =>
     filterVal.map((j) => {
-      return v[j];
-    })
-  );
+      return v[j]
+    }),
+  )
 }
 
 function sucessHandler(excelData) {
   const data = excelData.content.map((item) => {
-    const obj = {};
+    const obj = {}
     Object.keys(item).forEach((key) => {
-      const k = findKey(columns, key);
-      obj[k] = item[key];
-    });
-    return obj;
-  });
+      const k = findKey(columns, key)
+      obj[k] = item[key]
+    })
+    return obj
+  })
 
-  tableData.value = data;
+  tableData.value = data
 }
 
 function commitHandler(columns) {
-  columnsRef.value = [...columns, actionsColumns];
-  formatColumns();
+  columnsRef.value = [...columns, actionsColumns]
+  formatColumns()
 }
 
 function actionHandler(action: any, row: any) {
-  const { key } = action;
+  const { key } = action
   switch (key) {
-    case "view":
-      goDetail(row);
-      break;
-    case "reset":
-      resetHandler();
-      break;
-    case "approval":
-      approvalHandler(row);
-      break;
-    case "reject":
-      rejectHandler(row);
-      break;
+    case 'view':
+      goDetail(row)
+      break
+    case 'reset':
+      resetHandler()
+      break
+    case 'approval':
+      approvalHandler(row)
+      break
+    case 'reject':
+      rejectHandler(row)
+      break
     default:
-      break;
+      break
   }
 }
 
 // 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
@@ -587,151 +605,151 @@ function validate(items: any[]) {
   //     return '审批人不一致'
   // }
 
-  return null;
+  return null
 }
 
 function goDetail(row) {
-  router.push({ name: "final-detail", query: { id: row.id, packageid: row.packageid } });
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
 }
 
 function resetHandler() {
   dialog.info({
-    title: "确认提示",
-    content: "确认重置当前选中的任务的审批吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认重置当前选中的任务的审批吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function getSelectItems() {
-  return tableData.value.filter((item) => selectionIds.value.includes(item.id));
+  return tableData.value.filter(item => selectionIds.value.includes(item.id))
 }
 
 function approvalHandler(row) {
   // const items = getSelectItems()
-  const items = [row];
-  const msg = validate(items);
+  const items = [row]
+  const msg = validate(items)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      approval(items);
+      approval(items)
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function batchApproval() {
-  const items = getSelectItems();
-  const msg = validate(items);
+  const items = getSelectItems()
+  const msg = validate(items)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      approval(items);
+      approval(items)
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function approval(items) {
-  const formIds: string[] = items.map((item) => item.id);
-  const taskIds: string[] = items.map((item) => item.taskId);
-  const tasknames: string[] = items.map((item) => item.taskname);
+  const formIds: string[] = items.map(item => item.id)
+  const taskIds: string[] = items.map(item => item.taskId)
+  const tasknames: string[] = items.map(item => item.taskname)
 
   const param: ApprovalParam = {
     formid: formIds,
     taskId: taskIds,
     approvd: true,
-    taskComment: "approval",
+    taskComment: 'approval',
     taskname: tasknames,
-  };
+  }
 
-  doAudit(param);
+  doAudit(param)
 }
 
 function rejectHandler(row) {
   // const items = getSelectItems()
-  const items = [row];
-  const msg = validate(items);
+  const items = [row]
+  const msg = validate(items)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
-  const modal = unref(rejectModalRef)! as any;
-  modal.showModal();
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal()
 }
 
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
-  const items = getSelectItems();
-  const formIds: string[] = items.map((item) => item.id);
-  const taskIds: string[] = items.map((item) => item.fromtaskid);
-  const tasknames: string[] = items.map((item) => item.fromtaskname);
+  const items = getSelectItems()
+  const formIds: string[] = items.map(item => item.id)
+  const taskIds: string[] = items.map(item => item.fromtaskid)
+  const tasknames: string[] = items.map(item => item.fromtaskname)
 
   const param: ApprovalParam = {
     formid: formIds,
     taskId: taskIds,
     approvd: false,
     taskComment: idOrDesc,
-    taskname: isOther ? tasknames : ["其他"],
-  };
+    taskname: isOther ? tasknames : ['其他'],
+  }
 
-  doAudit(param);
+  doAudit(param)
 }
 
 function doAudit(param: any) {
   audit(param).then((res) => {
-    const { code } = res;
-    if (code === "OK") reload();
-    else message.error(res.message);
-  });
+    const { code } = res
+    if (code === 'OK')
+      reload()
+    else message.error(res.message)
+  })
 }
 
 function reload() {
-  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps;
-  query(page!, pageSize!);
+  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
+  query(page!, pageSize!)
 }
 
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler();
+    refreshHandler()
   },
-  { deep: true }
-);
+  { deep: true },
+)
 
 function reset() {
-  pagination.page = 1;
-  pagination.pageCount = 1;
-  pagination.pageSize = 1;
+  pagination.page = 1
+  pagination.pageCount = 1
 }
 
 async function refreshHandler(searchId?: any) {
-  reset();
-  query(pagination.page, pagination.pageSize, searchId);
+  reset()
+  query(pagination.page, pagination.pageSize, searchId)
 }
 </script>
 
@@ -743,7 +761,9 @@ async function refreshHandler(searchId?: any) {
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
+          小结查重
+        </NButton>
         <div class="btn" @click="batchApproval">
           <SvgIcon style="margin-right: 6px" size="14" name="tf" />
           批量审批
@@ -761,19 +781,13 @@ async function refreshHandler(searchId?: any) {
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >批量导入数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">批量导入数据</span>
             </li>
             <li @click="exportHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >导出待审数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
             </li>
             <li>
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >导出全部数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
             </li>
           </ul>
         </n-popover>
@@ -823,10 +837,11 @@ async function refreshHandler(searchId?: any) {
       :on-success="sucessHandler"
       :header-config="headRules"
     />
-    <ConfrimModal ref="rejectModalRef" @commit="reject" />
+    <NotPassed ref="notPassModalRef" @success="reloadList" />
+
     <RepeatModal
       ref="repeatModalRef"
-      @reject="showModal(rejectModalRef)"
+      @reject="showModal(notPassModalRef)"
       @viewrepeat="showModal(repeatTaskTableModalRef)"
     />
     <RepeatTaskTableModal ref="repeatTaskTableModalRef" />
@@ -834,6 +849,9 @@ async function refreshHandler(searchId?: any) {
 </template>
 
 <style lang="less" scoped>
+.color-red{
+  color: #FF4E4F!important;
+}
 .wrapper {
   display: flex;
   flex: 1;
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 73016c1..697b41a 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -342,7 +342,7 @@ function reloadList() {
   <div class="wrapper">
     <div class="wrapper-header">
       <div class="left">
-        <span class="font">任务ID：{{ currentTaskId }}</span>
+        <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
         <SvgIcon
           size="22"
           class="forward"

From 26481b68e855acf23151dccbc6e87ce75572a971 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 09:05:01 +0800
Subject: [PATCH 02/26] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 14cae00..7cfe6f4 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -428,8 +428,8 @@ function reloadList() {
               </div>
             </div>
             <div class="status">
-              <img v-show="taskDetailInfo?.states === 3" class="img-status" src="@/assets/images/task/pass.png" alt="">
-              <img v-show="taskDetailInfo?.states === 5" class="img-status" src="@/assets/images/task/not_pass.png"
+              <img v-show="taskDetailInfo?.states === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
+              <img v-show="taskDetailInfo?.states === 3" class="img-status" src="@/assets/images/task/not_pass.png"
                 alt="">
             </div>
             <!-- 右下信息 -->

From de6505bfb9dc826bdc8abe50767666639f2eb74f Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 09:07:53 +0800
Subject: [PATCH 03/26] =?UTF-8?q?feat:=20=E4=B8=BB=E5=9B=BE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E9=80=9A=E8=BF=87=E6=88=96=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=90=8E=EF=BC=8C=E7=A6=81=E6=AD=A2=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 7cfe6f4..e6b6f41 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -269,7 +269,10 @@ function immersionHandler() {
 }
 
 function showAction() {
-  const item = taskDetailInfo.value;
+  const item = taskDetailInfo.value;  
+  if (item.states === 2 || item.states === 3) {
+    return
+  }
   if (batch.value === false) overTask.value = item;
 }
 

From 55533ff3f98c5c2754d57a71889dadf757dad35d Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 12:34:53 +0800
Subject: [PATCH 04/26] =?UTF-8?q?feat:=20=E7=94=9F=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=A9=BA=E5=80=BC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 10dac90..aec4360 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -63,7 +63,7 @@ onMounted(async () => {
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
         <li v-else-if="item.id === 'createTime'">
-          生成时间：{{ format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
+          生成时间：{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
         </li>
         <li v-else class="ellipsis" v-if="listItem[item.id]">
           <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}

From 2fcde4358f400cf7ea9b4f5d4ba9b1634e9c1bc4 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 12:59:11 +0800
Subject: [PATCH 05/26] bug

---
 src/views/final/content/Content.vue | 120 ++++++++++++++++------------
 src/views/task/aside/ListItem.vue   |   5 +-
 src/views/task/aside/TaskList.vue   | 112 +++++++++++++-------------
 src/views/task/content/Content.vue  |  16 ++--
 4 files changed, 140 insertions(+), 113 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 6da9fac..126413c 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -248,6 +248,19 @@ async function formatColumns() {
     }
   }
 
+  index = columnsRef.value.findIndex(v => v.title == '所属项目')
+  if (index > -1) {
+    columnsRef.value[index] = {
+      title: '所属项目',
+      key: columnsRef.value[index].key, // "fromtaskname"
+      fixed: columnsRef.value[index].fixed || undefined,
+      width: 200,
+      ellipsis: {
+        tooltip: true,
+      },
+    }
+  }
+
   index = columnsRef.value.findIndex(v => v.title == '任务名称')
   if (index > -1) {
     columnsRef.value[index] = {
@@ -575,10 +588,10 @@ function actionHandler(action: any, row: any) {
       resetHandler()
       break
     case 'approval':
-      approvalHandler(row)
+      singleApproval(row)
       break
     case 'reject':
-      rejectHandler(row)
+      rejectHandler([row])
       break
     default:
       break
@@ -630,26 +643,24 @@ function getSelectItems() {
   return tableData.value.filter(item => selectionIds.value.includes(item.id))
 }
 
-function approvalHandler(row) {
-  // const items = getSelectItems()
-  const items = [row]
-  const msg = validate(items)
-
-  if (msg !== null) {
-    message.error(msg)
-    return
+// 单个审批通过
+function singleApproval(row) {
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: [
+      {
+        formId: row.id,
+        taskId: row.taskId,
+        taskName: row.fromTaskName,
+      },
+    ],
   }
-
-  dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      approval(items)
-    },
-    onNegativeClick: () => {},
-  })
+  doAudit(param)
 }
 
 function batchApproval() {
@@ -673,26 +684,25 @@ function batchApproval() {
   })
 }
 
-function approval(items) {
-  const formIds: string[] = items.map(item => item.id)
-  const taskIds: string[] = items.map(item => item.taskId)
-  const tasknames: string[] = items.map(item => item.taskname)
+// function approval(items) {
+//   const formIds: string[] = items.map(item => item.id)
+//   const taskIds: string[] = items.map(item => item.taskId)
+//   const tasknames: string[] = items.map(item => item.taskname)
 
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: true,
-    taskComment: 'approval',
-    taskname: tasknames,
-  }
+//   const param: ApprovalParam = {
+//     formid: formIds,
+//     taskId: taskIds,
+//     approvd: true,
+//     taskComment: 'approval',
+//     taskname: tasknames,
+//   }
 
-  doAudit(param)
-}
+//   doAudit(param)
+// }
 
-function rejectHandler(row) {
-  // const items = getSelectItems()
-  const items = [row]
-  const msg = validate(items)
+// 审核不通过
+function rejectHandler(list) {
+  const msg = validate(list)
 
   if (msg !== null) {
     message.error(msg)
@@ -700,7 +710,7 @@ function rejectHandler(row) {
   }
 
   const modal = unref(notPassModalRef)! as any
-  modal.showModal()
+  modal.showModal(list)
 }
 
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
@@ -720,15 +730,6 @@ function reject(idOrDesc: string, backId: string, isOther: boolean) {
   doAudit(param)
 }
 
-function doAudit(param: any) {
-  audit(param).then((res) => {
-    const { code } = res
-    if (code === 'OK')
-      reload()
-    else message.error(res.message)
-  })
-}
-
 function reload() {
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
@@ -751,6 +752,27 @@ async function refreshHandler(searchId?: any) {
   reset()
   query(pagination.page, pagination.pageSize, searchId)
 }
+
+// 审核通过
+function doAudit(param: any) {
+  dialog.info({
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      audit(param).then((res) => {
+        const { code } = res
+        if (code === 'OK') {
+          message.success('审核成功')
+          reload()
+        }
+        else { message.error(res.message) }
+      })
+    },
+    onNegativeClick: () => {},
+  })
+}
 </script>
 
 <template>
@@ -837,7 +859,7 @@ async function refreshHandler(searchId?: any) {
       :on-success="sucessHandler"
       :header-config="headRules"
     />
-    <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <NotPassed ref="notPassModalRef" @success="reload" />
 
     <RepeatModal
       ref="repeatModalRef"
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index 473aec1..d2ac772 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -53,7 +53,10 @@ const svgName = computed(() => {
             "
           >{{ listItem.statshisText }}</span>
         </li>
-        <li v-else-if="item.id === 'createdate'">
+        <li v-else-if="item.id === 'finishTime'">
+          提报时间：{{ format(listItem.finishTime, "yyyy-MM-dd HH:mm:ss") }}
+        </li>
+        <li v-else-if="item.id === '提报时间'">
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
         <li v-else class="ellipsis">
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index 2f94104..a53597e 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -1,119 +1,121 @@
 <script lang="ts" setup>
-import { useInfiniteScroll } from "@vueuse/core";
-import { onMounted, onUnmounted, reactive, ref, watch, defineProps } from "vue";
-import ListItem from "./ListItem.vue";
-import emitter from "@/utils/mitt";
-import { useTaskStore } from "@/store/modules/task";
-
-const taskStore = useTaskStore();
-const data = ref<any[]>([]);
-const activeId = ref("");
-const el = ref<HTMLDivElement | null>(null);
-const keyword = ref("");
-const canloadMore = ref(true);
-const isLoading = ref(false);
+import { useInfiniteScroll } from '@vueuse/core'
+import { defineProps, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import ListItem from './ListItem.vue'
+import emitter from '@/utils/mitt'
+import { useTaskStore } from '@/store/modules/task'
 
 defineProps({
   showFieldList: {
     type: Array,
     default: () => [],
   },
-});
-
+})
+const taskStore = useTaskStore()
+const data = ref<any[]>([])
+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: 100,
-});
+  pageSize: 30,
+})
 
 function selectHandler(id: string, index: number) {
-  taskStore.setActive(index);
+  taskStore.setActive(index)
 }
 
 useInfiniteScroll(
   el as any,
   () => {
-    loadMore();
+    loadMore()
   },
-  { distance: 10, interval: 1500, canLoadMore: () => canloadMore.value }
-);
+  { 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();
-    data.value.push(...more);
-  } finally {
-    isLoading.value = false;
+    const more = await fetchList()
+    data.value.push(...more)
+  }
+  finally {
+    isLoading.value = false
   }
 }
 
+// 获取左侧列表
 async function fetchList() {
   try {
-    pagination.pageNo += 1;
-    const result = await taskStore.fetchApprovalList(pagination);
-    const { data, pageCount } = result;
-    canloadMore.value = pageCount >= pagination.pageNo;
-    return data || [];
-  } catch (error) {
-    canloadMore.value = false;
-    return [];
+    pagination.pageNo += 1
+    const result = await taskStore.fetchApprovalList(pagination)
+    const { data, pageCount } = result
+    canloadMore.value = pageCount >= pagination.pageNo
+    return data || []
+  }
+  catch (error) {
+    canloadMore.value = false
+    return []
   }
 }
 
 watch(
   () => taskStore.activeId,
   (newVal) => {
-    activeId.value = newVal;
-  }
-);
+    activeId.value = newVal
+  },
+)
 
 function reset() {
-  pagination.pageNo = 0;
-  pagination.pageSize = 100;
-  canloadMore.value = true;
-  data.value.length = 0;
+  pagination.pageNo = 0
+  pagination.pageSize = 100
+  canloadMore.value = true
+  data.value.length = 0
 
-  taskStore.reset();
+  taskStore.reset()
 }
 
 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 },
+  )
 }
 
 onMounted(() => {
-  emitter.on("refresh", refreshHandler);
-});
+  emitter.on('refresh', refreshHandler)
+})
 
 onUnmounted(() => {
-  emitter.off("refresh", refreshHandler);
-});
+  emitter.off('refresh', refreshHandler)
+})
 
 async function refreshHandler() {
-  search("");
+  search('')
 }
 
 defineExpose({
   search,
-});
+})
 </script>
 
 <template>
   <n-spin :show="isLoading">
     <div ref="el" class="list">
       <ListItem
-        :showFieldList="showFieldList"
         v-for="(item, index) in data"
         :key="item.id"
+        :show-field-list="showFieldList"
         :selected="activeId === item.id"
         :list-item="item"
         @click="selectHandler(item.id, index)"
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 697b41a..af5d094 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -490,13 +490,13 @@ function reloadList() {
           </n-grid>
         </div>
         <div class="time">
-          <div v-if="taskDetailInfo?.ocrPicture?.photoDateTimestamp" class="time-item">
+          <div class="time-item">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp) || 0) }}</span>
+            <span>{{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp)) : '-' }}</span>
           </div>
-          <div v-if="taskDetailInfo?.ocrPicture?.submitDateTimestamp" class="time-item time-item2">
+          <div class="time-item time-item2">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp) || 0) }}</span>
+            <span>{{ taskDetailInfo?.ocrPicture?.submitDateTimestamp ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp)) : '-' }}</span>
           </div>
         </div>
         <div style="display: none">
@@ -544,13 +544,13 @@ function reloadList() {
                 <img v-if="item.historyStates === 2" 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 v-if="item.photoDateTimestamp" class="time-item">
+                  <div class="time-item">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="camera-time" />
-                    <span>{{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}</span>
+                    <span>{{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp)) : '-' }}</span>
                   </div>
-                  <div v-if="item.submitDateTimestamp" class="time-item time-item2">
+                  <div class="time-item time-item2">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="submit-time" />
-                    <span>{{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}</span>
+                    <span>{{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
                   </div>
                 </div>
                 <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">

From de6e957668dda1fce0fc0f05bd11e0cd940a3e54 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 13:45:45 +0800
Subject: [PATCH 06/26] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 39 +++++++++++++------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index e6b6f41..f506e49 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -312,12 +312,7 @@ function approvalHandler(items?: any) {
     processItems = selectItems.value
   }
   else if (overTask.value) {
-    //  主图点击 => 点击 => 通过/不通过按钮
     cloneItem = clone(overTask.value)
-    // 接口问题，暂时先这样处理
-    // if (!cloneItem.taskId) {
-    //   cloneItem.taskId = "taskIdtaskIdtaskIdtaskIdtaskId"
-    // }
     processItems = [cloneItem]
   }
   //  任务包图片 => 点击 => 通过/不通过按钮
@@ -331,31 +326,37 @@ function approvalHandler(items?: any) {
     return
   }
 
+  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: '',
+    flowTaskInfoList: list,
+  }
+
   dialog.info({
     title: '确认提示',
     content: '确认给该任务审批为【通过】吗?',
     positiveText: '确定',
     negativeText: '取消',
     onPositiveClick: () => {
-      approval()
+      doAudit(param)
     },
     onNegativeClick: () => { },
   })
 }
-function approval() {
-  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: true,
-    taskComment: 'approval',
-    taskname: tasknames,
-  }
 
-  doAudit(param)
-}
 function doAudit(param: any) {
   audit(param).then((res) => {
     const { code } = res

From cd26cebeb6d59b6779cd023d6fa2f90f6f41b6c8 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 14:11:02 +0800
Subject: [PATCH 07/26] =?UTF-8?q?feat:=20=E6=B2=89=E6=B5=B8=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/power-off.svg          | 17 +++++++++++++++++
 src/views/worksheet/content/Content.vue |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/icons/power-off.svg

diff --git a/src/assets/icons/power-off.svg b/src/assets/icons/power-off.svg
new file mode 100644
index 0000000..9ec7596
--- /dev/null
+++ b/src/assets/icons/power-off.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>沉浸模式-开启</title>
+    <g id="图审审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="沉浸模式1.1" transform="translate(-1375.000000, -32.000000)" fill-rule="nonzero">
+            <g id="更多操作" transform="translate(1370.000000, 27.000000)">
+                <g id="沉浸模式-开启" transform="translate(5.000000, 5.000000)">
+                    <polygon id="路径" fill-opacity="0" fill="#FFFFFF" points="0 0 20 0 20 20 0 20"></polygon>
+                    <g id="编组" transform="translate(2.000000, 2.000000)" fill="#507AFD">
+                        <path d="M8,16 C3.59999999,16 0,12.4444444 0,8.09876544 C0,6.22222223 0.700000007,4.34567902 2,2.86419753 C2.40000001,2.4691358 3,2.37037037 3.4,2.76543209 C3.8,3.16049383 3.89999999,3.75308642 3.5,4.14814814 C2.5,5.23456791 2,6.61728395 2,8.09876544 C2,11.3580247 4.70000001,14.0246914 8,14.0246914 C11.3,14.0246914 14,11.3580247 14,8.09876544 C14,6.61728395 13.5,5.23456791 12.5,4.14814816 C12.1,3.75308642 12.2,3.16049383 12.6,2.76543211 C13,2.37037037 13.6,2.46913581 14,2.86419755 C15.3,4.34567903 16,6.12345681 16,8.09876545 C16,12.4444444 12.4,16 8,16 Z" id="路径"></path>
+                        <path d="M8.99999999,5.92592592 C8.99999999,6.41975308 8.6,6.91358025 7.99999999,6.91358025 L7.99999999,6.91358025 C7.4,6.91358025 6.99999999,6.51851852 6.99999999,5.92592592 L6.99999999,0.987654328 C6.99999999,0.493827172 7.4,0 7.99999999,0 L7.99999999,0 C8.49999999,0 8.99999999,0.395061734 8.99999999,0.987654328 L8.99999999,5.92592592 Z" id="路径"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index f506e49..43d6ec2 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -389,7 +389,8 @@ function reloadList() {
             批量审批
           </div>
           <div class="icon-wrap">
-            <SvgIcon size="20" name="immersion-model" @click="immersionHandler" />
+            <SvgIcon size="20" v-if="isFullScreen" name="power-off" @click="immersionHandler" style="cursor: pointer;"/>
+            <SvgIcon size="20" v-else name="immersion-model" @click="immersionHandler" style="cursor: pointer;"/>
           </div>
         </div>
 

From 8370576e217b3fbf099f90e9750e619fa04fbb5d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 15:12:40 +0800
Subject: [PATCH 08/26] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BA=A4=E4=BA=92=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=90=9C=E7=B4=A2=E9=99=90=E5=88=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/index.vue        | 185 ++++++++++--------
 src/views/final/comp/FilterModal.vue          |  50 ++---
 src/views/home/aside/comp/Action.vue          |  19 +-
 src/views/home/aside/comp/AdvanceFilter.vue   | 120 ++++++++----
 .../home/aside/comp/modals/FilterModal.vue    |  32 ++-
 5 files changed, 230 insertions(+), 176 deletions(-)

diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index a6f42c2..71b411d 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -1,20 +1,29 @@
 <script lang="ts">
-import { useDialog, useMessage } from 'naive-ui'
-import { defineComponent, inject, onMounted, reactive, ref, toRefs, unref, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import QuillModal from './QuillModal.vue'
-import RecycleModal from './RecycleModal.vue'
-import SearchModal from './SearchModal.vue'
-import ShortcutModal from './ShortcutModal.vue'
-import UserSettings from './UserSettings.vue'
-import { msgPolling } from '@/api/message/message'
-import { getImgUrl } from '@/utils/urlUtils'
-import { useUser } from '@/store/modules/user'
-import { useTaskStore } from '@/store/modules/task'
-
-const taskStore = useTaskStore()
+import { useDialog, useMessage } from "naive-ui";
+import {
+  defineComponent,
+  inject,
+  onMounted,
+  reactive,
+  ref,
+  toRefs,
+  unref,
+  watch,
+} from "vue";
+import { useRoute, useRouter } from "vue-router";
+import QuillModal from "./QuillModal.vue";
+import RecycleModal from "./RecycleModal.vue";
+import SearchModal from "./SearchModal.vue";
+import ShortcutModal from "./ShortcutModal.vue";
+import UserSettings from "./UserSettings.vue";
+import { msgPolling } from "@/api/message/message";
+import { getImgUrl } from "@/utils/urlUtils";
+import { useUser } from "@/store/modules/user";
+import { useTaskStore } from "@/store/modules/task";
+
+const taskStore = useTaskStore();
 export default defineComponent({
-  name: 'PageHeader',
+  name: "PageHeader",
   components: {
     UserSettings,
     QuillModal,
@@ -30,139 +39,137 @@ 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(() => {
-      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);
+    });
 
     return {
       ...toRefs(state),
@@ -183,9 +190,9 @@ export default defineComponent({
       getMessage,
       handleDragOver,
       handleDragLeave,
-    }
+    };
   },
-})
+});
 </script>
 
 <template>
@@ -207,8 +214,16 @@ export default defineComponent({
         v-for="item in iconList"
         :key="item.icon"
         class="layout-header-trigger layout-header-trigger-min"
-        @dragover.prevent="(e) => { handleDragOver(e, item) }"
-        @dragleave.prevent="(e) => { handleDragLeave(e, item) }"
+        @dragover.prevent="
+          (e) => {
+            handleDragOver(e, item);
+          }
+        "
+        @dragleave.prevent="
+          (e) => {
+            handleDragLeave(e, item);
+          }
+        "
       >
         <div class="back" @click="item.handle">
           <SvgIcon :name="item.icon" size="18" />
@@ -326,9 +341,7 @@ export default defineComponent({
   }
 
   .layout-header-left {
-    ::v-deep(
-        .n-breadcrumb .n-breadcrumb-item:last-child .n-breadcrumb-item__link
-      ) {
+    ::v-deep(.n-breadcrumb .n-breadcrumb-item:last-child .n-breadcrumb-item__link) {
       color: #515a6e;
     }
   }
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 9ac92c5..8ed15f8 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -146,32 +146,32 @@ function rowProps(row: RowData) {
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
+  console.log(rowKeys, selectionIds.value, "handleCheck");
   selectionIds.value = rowKeys;
 }
 
-function select(key: number) {
+function select(key: number, id: string) {
   switch (key) {
     case 1:
-      editSelection();
+      editSelection(id);
       break;
     case 2:
-      deleteSelection();
+      deleteSelection(id);
       break;
     default:
       break;
   }
 }
 
-function editSelection() {
+function editSelection(id = "") {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
+  // const $message = window["$message"];
+  // if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
+  //   $message.error("请选中一条过滤");
+  //   return;
+  // }
 
-  if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
-    $message.error("请选中一条过滤");
-    return;
-  }
-
-  const selectedId = selectionIds.value[0];
+  const selectedId = id;
   const selectedFilter = tableData.value.find((item: any) => {
     return item.id === selectedId;
   });
@@ -180,12 +180,12 @@ function editSelection() {
   closeModal();
 }
 
-function deleteSelection() {
+function deleteSelection(id = "") {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
-
   if (selectionIds.value.length === 0) {
-    $message.error("至少选中一条过滤");
+    deleteCondition({ ids: id }).then(() => {
+      query(pagination.page, pagination.pageSize);
+    });
     return;
   }
 
@@ -335,12 +335,19 @@ const showSearch = computed(() => {
             <div class="del_btn">
               <n-button icon-placement="left" size="medium">
                 <template #icon>
-                  <SvgIcon  name="delete-history" size="16" />
+                  <SvgIcon name="delete-history" size="16" />
                 </template>
-                删除</n-button>
+                删除</n-button
+              >
             </div>
             <div class="msg">
-              <span>已选中 <span style="color:#507afd;font-size:16px">{{ selectionIds.length }}</span> 项</span>
+              <span
+                >已选中
+                <span style="color: #507afd; font-size: 16px">{{
+                  selectionIds.length
+                }}</span>
+                项</span
+              >
               <a @click="selectionIds = []">清空</a>
             </div>
           </div>
@@ -400,11 +407,10 @@ const showSearch = computed(() => {
       width: 300px;
       border: 1px solid gray;
     }
-    .del_btn{
-
+    .del_btn {
     }
-    .msg{
-      a{
+    .msg {
+      a {
         margin-left: 30px;
         cursor: pointer;
         color: #507afd;
diff --git a/src/views/home/aside/comp/Action.vue b/src/views/home/aside/comp/Action.vue
index a0e1560..af0ad94 100644
--- a/src/views/home/aside/comp/Action.vue
+++ b/src/views/home/aside/comp/Action.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import type { DropdownMixedOption } from 'naive-ui/es/dropdown/src/interface'
-import type { PropType } from 'vue'
+import type { DropdownMixedOption } from "naive-ui/es/dropdown/src/interface";
+import type { PropType } from "vue";
 
-defineOptions({ name: 'Action' })
+defineOptions({ name: "Action" });
 
-defineProps({
+const props = defineProps({
   options: {
     type: Array as PropType<DropdownMixedOption[]>,
     default: null,
@@ -12,18 +12,21 @@ defineProps({
   },
   select: {
     type: Function as PropType<Function>,
-    default: () => { },
+    default: () => {},
   },
   id: {
     type: String,
-    default: '',
+    default: "",
   },
-})
+});
+const fun = (key) => {
+  props.select(key, props.id);
+};
 </script>
 
 <template>
   <div :data-id="id">
-    <n-dropdown trigger="hover" :options="options" @select="(select as any)">
+    <n-dropdown trigger="hover" :options="options" @select="fun">
       <SvgIcon name="more-hor" size="20" />
     </n-dropdown>
   </div>
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 5308db4..95a4234 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -17,7 +17,10 @@ const props = defineProps({
     required: true,
   },
 });
-
+const ruleForm = reactive({
+  keyword: "",
+});
+const ruleformRef = ref();
 const emit = defineEmits<{
   (e: "show-filter"): void;
   (e: "show-custom"): void;
@@ -27,7 +30,7 @@ const emit = defineEmits<{
 
 const data = ref<FilterEntity[]>([]);
 const unData = ref<FilterEntity[]>([]);
-const loading =  ref(false);
+const loading = ref(false);
 const canloadMore = true;
 const el = ref<HTMLDivElement | null>(null);
 const popover = ref<ComponentRef | null>(null);
@@ -74,8 +77,8 @@ useInfiniteScroll(
   },
   { distance: 10, interval: 300, canLoadMore: () => false }
 );
-const showClick =async () => {
-  getSearchedList('')
+const showClick = async () => {
+  getSearchedList("");
 };
 
 async function loadMore() {
@@ -92,7 +95,7 @@ async function featchList() {
   loading.value = true;
   try {
     const searchParam: FilterSearchParam = {
-      search_searchname: { value: keyword.value, op: "like", type: "string" },
+      search_searchname: { value: ruleForm.keyword, op: "like", type: "string" },
     };
     const result = await getConditionList(pagination, searchParam, props.type);
     const { data } = result;
@@ -121,11 +124,8 @@ function generateFilterEntityList(data) {
       };
     });
 
-    const reg = new RegExp(keyword.value, "gi");
-    const hilightText = searchname.replace(
-      reg,
-      `<span>${keyword.value}</span>`
-    );
+    const reg = new RegExp(ruleForm.keyword, "gi");
+    const hilightText = searchname.replace(reg, `<span>${ruleForm.keyword}</span>`);
 
     return {
       id,
@@ -134,7 +134,7 @@ function generateFilterEntityList(data) {
       isDefaultFilter: false,
       filterList: list,
       reorder,
-      searchname
+      searchname,
     };
   });
 
@@ -143,12 +143,17 @@ function generateFilterEntityList(data) {
 
 function selectHandler(item: FilterEntity) {
   (popover.value as any).setShow(false);
-  currentlySelectedAdvanced.value = item.searchname
+  currentlySelectedAdvanced.value = item.searchname;
   emit("select", item.id);
 }
 
 const inputHandler = debounce((word) => {
-  getSearchedList(word)
+  ruleForm.keyword = word;
+  ruleformRef.value.validate();
+  if (word.length < 2 && word) {
+    return;
+  }
+  getSearchedList(word);
 }, 300);
 
 function getSearchedList(word) {
@@ -157,7 +162,7 @@ function getSearchedList(word) {
   } else {
     pagination.pageSize = 10;
   }
-  keyword.value = word;
+  ruleForm.keyword = word;
   featchList().then((list) => {
     let dataArr: FilterEntity[] = [];
     let unDataArr: FilterEntity[] = [];
@@ -195,10 +200,26 @@ function favoriteHandler(event: MouseEvent, item: any) {
       }
     });
 
-    inputHandler(keyword.value);
+    inputHandler(ruleForm.keyword);
   }
 }
 
+const rules = {
+  keyword: [
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (value.length >= 2) {
+          return true;
+        } else {
+          return new Error("搜索关键字最少为两个");
+        }
+      },
+    },
+  ],
+};
+
 function unFavoriteHandler(event: MouseEvent, item) {
   event.stopImmediatePropagation();
   event.stopPropagation();
@@ -208,7 +229,7 @@ function unFavoriteHandler(event: MouseEvent, item) {
   if (!isDefaultFilter) {
     item.favorite = false;
     unfavorite(id);
-    inputHandler(keyword.value);
+    inputHandler(ruleForm.keyword);
   }
 }
 
@@ -233,29 +254,37 @@ const moveEnd = () => {
       >
         <template #trigger>
           <div class="wrapper-left-dropdown" @click="showClick">
-            <span style="font-size: 20px;color: #333333;font-weight: Medium;">{{currentlySelectedAdvanced}}</span>
-            <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" />
+            <span style="font-size: 20px; color: #333333; font-weight: Medium">{{
+              currentlySelectedAdvanced
+            }}</span>
+            <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" color="#999999"/>
           </div>
         </template>
         <n-spin :show="loading">
           <div class="wrapper-left-popover">
-            <n-input
-              :style="{ '--n-border': '0px' }"
-              placeholder="请输入关键词"
-              @input="inputHandler"
-            >
-              <template #prefix>
-                <SvgIcon size="14px" name="magnifying-1" />
-              </template>
-              <template #suffix>
-                <SvgIcon
-                  size="14px"
-                  style="cursor: pointer"
-                  name="setting"
-                  @click="emit('show-filter')"
-                />
-              </template>
-            </n-input>
+            <n-form :rules="rules" ref="ruleformRef" :model="ruleForm">
+              <n-form-item path="keyword">
+                <n-input
+                  :style="{ '--n-border': '0px' }"
+                  placeholder="请输入关键字"
+                  @input="inputHandler"
+                  :value="ruleForm.keyword"
+                  :minlength="2"
+                >
+                  <template #prefix>
+                    <SvgIcon size="14px" name="magnifying-1" />
+                  </template>
+                  <template #suffix>
+                    <SvgIcon
+                      size="14px"
+                      style="cursor: pointer"
+                      name="setting"
+                      @click="emit('show-filter')"
+                    />
+                  </template>
+                </n-input>
+              </n-form-item>
+            </n-form>
 
             <ul ref="el" class="wrapper-left-list">
               <li
@@ -264,23 +293,28 @@ const moveEnd = () => {
                 style="display: flex; align-items: center"
                 @click="selectHandler(item)"
               >
-                <SvgIcon  name="drag" size="18" color="#333333" style="margin-right:3px"/>
+                <SvgIcon
+                  name="drag"
+                  size="18"
+                  color="#333333"
+                  style="margin-right: 3px"
+                />
                 <SvgIcon
                   v-if="item.favorite && !item.isDefaultFilter"
                   name="favorite-fill"
                   color="#fd9b0a"
                   size="18"
-                  style="margin-right:3px"
+                  style="margin-right: 3px"
                   @click="unFavoriteHandler($event, item)"
                 />
                 <SvgIcon
                   v-else-if="!item.favorite && !item.isDefaultFilter"
                   name="favorite-unfill"
                   size="18"
-                  style="margin-right:3px"
+                  style="margin-right: 3px"
                   @click="favoriteHandler($event, item)"
                 />
-                <div v-html="item.name" style="color: #333333;"/>
+                <div v-html="item.name" style="color: #333333" />
               </li>
               <!-- filter=".draggable-li[draggable='false']" -->
               <VueDraggable
@@ -298,14 +332,14 @@ const moveEnd = () => {
                   class="cursor-move draggable-li fix"
                   :draggable="true"
                 >
-                  <SvgIcon  name="drag" size="18" style="margin-right:3px"/>
+                  <SvgIcon name="drag" size="18" style="margin-right: 3px" />
                   <SvgIcon
                     v-if="item.favorite && !item.isDefaultFilter"
                     name="favorite-fill"
                     color="#fd9b0a"
                     size="18"
                     fill="#666666"
-                    style="cursor: pointer!important;margin-right:3px;"
+                    style="cursor: pointer !important; margin-right: 3px"
                     @click="unFavoriteHandler($event, item)"
                   />
                   <SvgIcon
@@ -313,10 +347,10 @@ const moveEnd = () => {
                     name="favorite-unfill"
                     size="18"
                     fill="#666666"
-                    style="cursor: pointer!important;margin-right:3px;"
+                    style="cursor: pointer !important; margin-right: 3px"
                     @click="favoriteHandler($event, item)"
                   />
-                  <div v-html="item.name" style="color: #333333;"/>
+                  <div v-html="item.name" style="color: #333333" />
                 </li>
               </VueDraggable>
             </ul>
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 597e2cc..397fc78 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -148,43 +148,41 @@ function handleCheck(rowKeys: DataTableRowKey[]) {
   selectionIds.value = rowKeys;
 }
 
-function select(key: number) {
+function select(key: number, id: string) {
   switch (key) {
     case 1:
-      editSelection();
+      editSelection(id);
       break;
     case 2:
-      deleteSelection();
+      deleteSelection(id);
       break;
     default:
       break;
   }
 }
 
-function editSelection() {
+function editSelection(id) {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
-
-  if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
-    $message.error("请选中一条过滤");
-    return;
-  }
-
-  const selectedId = selectionIds.value[0];
+  // const $message = window["$message"];
+  // if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
+  //   $message.error("请选中一条过滤");
+  //   return;
+  // }
+  const selectedId = id;
   const selectedFilter = tableData.value.find((item: any) => {
     return item.id === selectedId;
   });
 
   emit("editFilter", selectedFilter);
-  closeModal();
+  // closeModal();
 }
 
-function deleteSelection() {
+function deleteSelection(id = '') {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
-
   if (selectionIds.value.length === 0) {
-    $message.error("至少选中一条过滤");
+    deleteCondition({ ids: id }).then(() => {
+      query(pagination.page, pagination.pageSize);
+    });
     return;
   }
 

From 161be236bcb6ffd373a03881478aa8f40db11fd8 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 15:47:44 +0800
Subject: [PATCH 09/26] =?UTF-8?q?feat:=20=E6=89=B9=E9=87=8F=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=88=A0=E9=99=A4=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue  | 16 +++++++++++-----
 src/views/worksheet/content/Content.vue |  9 +++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index aec4360..bf855f4 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
-            {{ listItem.name }}
+            <span class="list-item-title" :title="listItem.name">{{ listItem.name }} </span>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
           </span>
         </div>
@@ -104,15 +104,21 @@ onMounted(async () => {
     }
 
     .list-item-header-name {
-      width: 226px;
+      width: 250px;
       font-size: 16px;
       font-family: PingFang SC, PingFang SC-Medium;
       font-weight: 700;
       color: #333333;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
       margin-bottom: 0 0 8px 8px;
+      display: flex;
+      justify-content: space-between;
+      .list-item-title{
+        width: 200px;
+        display: inline-block;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
 
     &-name {
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 43d6ec2..8cdbce5 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -21,7 +21,7 @@ import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "v
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { ApprovalParam, SimilarityPictureSortParam } from "/#/api";
 
-const batch = ref(false);
+const batch = ref(false); // 批量审批状态
 const selectItems = ref<any[]>([]);
 const message = useMessage();
 const dialog = useDialog();
@@ -370,7 +370,8 @@ function doAudit(param: any) {
 }
 
 function reloadList() {
-  loadMore()
+  setBatch(false)
+  refreshHandler()
 }
 </script>
 
@@ -479,7 +480,7 @@ function reloadList() {
           <!-- 右侧任务 标题信息 -->
           <div class="right">
             <n-scrollbar style="max-height: 100%">
-              <span class="task-name">任务ID：{{ taskDetailInfo.taskname }}</span>
+              <span class="task-name" :title="taskDetailInfo.taskname">任务ID：{{ taskDetailInfo.taskname }}</span>
               <div class="tags">
                 <div class="tag tag-submiting" v-if="taskDetailInfo.states == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.states]
                 }}</div>
@@ -576,7 +577,7 @@ function reloadList() {
               </div>
             </div>
             <div class="check">
-              <n-checkbox v-show="batch" v-model:checked="item.checked" @click.stop
+              <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">

From 05c518ec67767b961a2a61ea1b2f7b9e130a613d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 15:50:51 +0800
Subject: [PATCH 10/26] =?UTF-8?q?feat:=20=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=8F=8A=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/FilterModal.vue          |  1 +
 .../home/aside/comp/modals/FilterModal.vue    | 31 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 8ed15f8..4c13bf5 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -74,6 +74,7 @@ const columns: DataTableColumns<RowData> = [
   {
     title: "创建时间",
     key: "createtime",
+    sorter: (row1, row2) => new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
   },
   {
     title: "更新者",
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 397fc78..f119d1f 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -43,6 +43,23 @@ interface RowData {
   updatetime: string;
 }
 
+const sortData = (row) => {
+  console.log("sortData", row);
+  if (row.order == "descend") {
+    tableData.value.sort(
+      (a, b) =>
+        new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime()
+    );
+  } else if (row.order == "ascend") {
+    tableData.value.sort(
+      (a, b) =>
+        new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime()
+    );
+  } else {
+    tableData.value.sort((a, b) => Number((a as any).reorder) - Number((b as any).reorder));
+  }
+};
+
 const columns: DataTableColumns<RowData> = [
   {
     type: "selection",
@@ -73,6 +90,12 @@ const columns: DataTableColumns<RowData> = [
     title: "创建时间",
     key: "createtime",
     width: 180,
+    sorter: (row1, row2) => {
+      // tableData.value.sort(
+      //   (a, b) => new Date(a?.createtime).getTime() - new Date(b?.createtime).getTime()
+      // );
+      return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime();
+    },
   },
   {
     title: "更新者",
@@ -177,7 +200,7 @@ function editSelection(id) {
   // closeModal();
 }
 
-function deleteSelection(id = '') {
+function deleteSelection(id = "") {
   // eslint-disable-next-line dot-notation
   if (selectionIds.value.length === 0) {
     deleteCondition({ ids: id }).then(() => {
@@ -272,7 +295,6 @@ defineExpose({
   showModal,
 });
 
-
 const inputHandler = debounce((word) => {
   keyword.value = word;
   query(1, 5);
@@ -340,7 +362,7 @@ const inputHandler = debounce((word) => {
               @update:page="handlePageChange"
               @update-page-size="handlePageSizeChange"
               @update:checked-row-keys="handleCheck"
-
+              @update:sorter="sortData"
             />
           </div>
         </div>
@@ -418,4 +440,7 @@ const inputHandler = debounce((word) => {
     }
   }
 }
+::v-deep(.n-data-table .n-data-table-th){
+  font-weight: bold !important;
+}
 </style>

From a45916ebd0d64089e14912eaf0a6d444fe54136c Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 16:00:37 +0800
Subject: [PATCH 11/26] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E9=98=BB=E5=A1=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 8cdbce5..4d2d7f0 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -496,7 +496,7 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">图片大小
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo &&
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo?.imgSize&&
                   (taskDetailInfo?.pictureInfo?.imgSize / 1000).toFixed(2) }}KB</span>
               </div>
               <div class="property">
@@ -522,8 +522,7 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">创建时间
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo &&
-                  format(taskDetailInfo?.pictureInfo?.createTime, 'yyyy-MM-dd HH:mm:ss') }}</span>
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo.createTime }}</span>
               </div>
               <div class="property">
                 <span class="property-name top" style=" color: #666666">提报时间

From 8f499e6343070539fc9115d9c8ebe53cee643e30 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 16:01:48 +0800
Subject: [PATCH 12/26] bug

---
 src/components/Approval/NotPassed.vue |  6 +--
 src/views/task/aside/Aside.vue        | 10 ++++-
 src/views/task/aside/ListItem.vue     |  3 --
 src/views/task/aside/TaskList.vue     |  6 +++
 src/views/task/content/Content.vue    | 61 ++++++++++++---------------
 src/views/task/index.vue              | 11 ++++-
 6 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index e2d4031..04bad76 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -4,9 +4,7 @@ import { useMessage } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 import { audit } from '@/api/task/task'
 
-const emit = defineEmits<{
-  (e: 'success')
-}>()
+const emit = defineEmits(['success'])
 const message = useMessage()
 const loading = ref(false)
 
@@ -104,7 +102,7 @@ async function handleSumbit(e: MouseEvent) {
           const { code } = res
           if (code === 'OK') {
             message.success('审核成功')
-            emit('success')
+            emit('success', param)
             closeModal()
           }
           else { message.error(res.message) }
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index c8a8ab4..17d1790 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -20,7 +20,7 @@ import emitter from '@/utils/mitt'
 const CustomFieldModalRef = ref(null)
 const collapse = ref(false)
 const taskStore = useTaskStore()
-const taskListRef = ref<HTMLDivElement | null>(null)
+const taskListRef: any = ref(null)
 // 展示字段
 const showFieldList = ref<any[]>([])
 
@@ -144,6 +144,14 @@ function editFilter(filter: any) {
   modal.showModal()
   modal.edit(filter)
 }
+
+function setAsideItemName(text) {
+  taskListRef.value.setStatusName(text)
+}
+
+defineExpose({
+  setAsideItemName,
+})
 </script>
 
 <template>
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index d2ac772..f81bf6e 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -53,9 +53,6 @@ const svgName = computed(() => {
             "
           >{{ listItem.statshisText }}</span>
         </li>
-        <li v-else-if="item.id === 'finishTime'">
-          提报时间：{{ format(listItem.finishTime, "yyyy-MM-dd HH:mm:ss") }}
-        </li>
         <li v-else-if="item.id === '提报时间'">
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index a53597e..eb88cf6 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -104,8 +104,14 @@ async function refreshHandler() {
   search('')
 }
 
+function setStatusName(text) {
+  const index = taskStore.getCurrentIndex
+  data.value[index].statshisText = text
+}
+
 defineExpose({
   search,
+  setStatusName,
 })
 </script>
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index af5d094..af253a2 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -19,6 +19,7 @@ import { isEmpty } from '@/utils'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 
+const emit = defineEmits(['setAsideItemName'])
 const batch = ref(false)
 const selectItems = ref<any[]>([])
 const message = useMessage()
@@ -43,11 +44,8 @@ function setBatch(value: boolean) {
 
   batch.value = value
 
-  if (value === false) {
-    selectItems.value.forEach(item => (item.checked = false))
-    selectItems.value.length = 0
-    selectItems.value.length = 0
-  }
+  if (value === false)
+    selectItems.value = []
 }
 
 function onCheckChange(checked: any, item: any) {
@@ -94,6 +92,12 @@ function handleKeydown(event) {
   // 在这里执行右箭头的逻辑
 }
 
+// 从store里面获取任务id
+function currentTaskId() {
+  const index = taskStore.getCurrentIndex
+  return taskStore.getApprovalList[index]?.id || ''
+}
+
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
   if (items.length === 0)
@@ -169,36 +173,22 @@ function approvalHandler(items?: any) {
 }
 
 function rejectHandler(items?: any) {
-  // let cloneItem: any
-  // if (batch.value) {
-  //   processItems = selectItems.value
-  // }
-  // else if (overTask.value) {
-  //   cloneItem = clone(overTask.value)
-  //   processItems = [cloneItem]
-  // }
-
-  // if (items !== undefined && !(items instanceof PointerEvent))
-  //   processItems = items
-
-  // const msg = validate(processItems)
-
-  // if (msg !== null) {
-  //   message.error(msg)
-  //   return
-  // }
-
   const modal = unref(notPassModalRef)! as any
   modal.showModal(selectItems.value)
 }
 
+function singleRejectHandler() {
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([taskDetailInfo.value])
+}
+
 function doAudit(param: any) {
   audit(param).then((res) => {
     const { code } = res
-    setBatch(false)
     if (code === 'OK') {
       message.success('审核成功')
-      reloadList()
+      setBatch(false)
+      reloadList(param, '通过')
     }
 
     else { message.error(res.message) }
@@ -273,12 +263,6 @@ async function getImgList() {
   }
 }
 
-// 从store里面获取任务id
-const currentTaskId = computed(() => {
-  const index = taskStore.getCurrentIndex
-  return taskStore.getApprovalList[index]?.id || ''
-})
-
 function overTaskHandle() {
   const item = taskDetailInfo.value
   if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
@@ -333,7 +317,14 @@ async function getDetail() {
   getImgList()
 }
 
-function reloadList() {
+function reloadList(param, text) {
+  // 修改左侧状态
+  const id = currentTaskId()
+  const hasCurrentId = param.flowTaskInfoList.find(item => item.formId === id)
+
+  if (hasCurrentId)
+    emit('setAsideItemName', text)
+
   getDetail()
 }
 </script>
@@ -434,7 +425,7 @@ function reloadList() {
             width="168"
             height="48"
             name="r7"
-            @click.stop="rejectHandler"
+            @click.stop="singleRejectHandler"
           />
         </div>
         <div class="check">
@@ -575,7 +566,7 @@ function reloadList() {
         <History :data="taskDetailInfo" />
       </n-tab-pane>
     </n-tabs>
-    <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <NotPassed ref="notPassModalRef" @success="(param) => reloadList(param, '不通过')" />
     <BatchModal
       ref="batchModalRef"
       @reject="rejectHandler"
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 25c07dd..46dd531 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -1,15 +1,22 @@
 <script lang="ts" setup>
+import { ref } from 'vue'
 import Aside from './aside/Aside.vue'
 import Content from './content/Content.vue'
+
+const asideRef: any = ref(null)
+
+function setAsideItemName(text) {
+  asideRef.value.setAsideItemName(text)
+}
 </script>
 
 <template>
   <div class="main">
     <!-- 侧边 -->
-    <Aside />
+    <Aside ref="asideRef" />
 
     <!-- 内容 -->
-    <Content />
+    <Content @set-aside-item-name="setAsideItemName" />
   </div>
 </template>
 

From ff11552fc67086b1f3ff97fe1599a30a0ecb6976 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 16:06:56 +0800
Subject: [PATCH 13/26] =?UTF-8?q?fix:=202819=20=E3=80=90AI=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=91=E5=90=8D=E5=AD=97=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=EF=BC=8C=E5=8F=98=E6=88=90=E5=9B=BE=E5=AE=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/user/user.ts               | 2 +-
 src/router/modules/worksheet.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mock/user/user.ts b/mock/user/user.ts
index 22854ed..ff5816e 100644
--- a/mock/user/user.ts
+++ b/mock/user/user.ts
@@ -23,7 +23,7 @@ const adminInfo = {
       value: 'task-main',
     },
     {
-      label: 'AI工单',
+      label: '图审审批管理',
       value: 'worksheet-main',
     },
   ],
diff --git a/src/router/modules/worksheet.ts b/src/router/modules/worksheet.ts
index 8a46a38..d80eb8d 100644
--- a/src/router/modules/worksheet.ts
+++ b/src/router/modules/worksheet.ts
@@ -1,5 +1,5 @@
-import type { RouteRecordRaw } from 'vue-router'
 import { Layout } from '@/router/constant'
+import type { RouteRecordRaw } from 'vue-router'
 
 /**
  * @param name 路由名称, 必须设置,且不能重名
@@ -19,7 +19,7 @@ const routes: Array<RouteRecordRaw> = [
     redirect: '/worksheet',
     component: Layout,
     meta: {
-      title: 'AI工单',
+      title: '图审审批管理',
       permissions: ['worksheet-main'],
       svgname: 'worksheet',
       svgsize: 22,
@@ -30,7 +30,7 @@ const routes: Array<RouteRecordRaw> = [
         path: 'worksheet',
         name: 'worksheet-main',
         meta: {
-          title: 'AI工单',
+          title: '图审审批管理',
         },
         component: () => import('@/views/worksheet/index.vue'),
       },

From ac5aeb5c0511f1b861911dc66dbf54fd455dd1f5 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 18:28:04 +0800
Subject: [PATCH 14/26] =?UTF-8?q?feat:=20bug=E4=BF=AE=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8F=B3=E4=BE=A7=E8=A1=A8=E6=A0=BC=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue        | 563 ++++++++++++----------
 src/views/task/content/TaskTable.vue      |  20 +-
 src/views/task/modal/CustomFieldModal.vue |   5 +-
 3 files changed, 314 insertions(+), 274 deletions(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 697b41a..357c89d 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -1,103 +1,103 @@
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue'
-import { chunk, clone } from 'lodash-es'
-import { useDialog, useMessage } from 'naive-ui'
-import { useRoute } 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 { 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 batch = ref(false)
-const selectItems = ref<any[]>([])
-const message = useMessage()
-const dialog = useDialog()
-const notPassModalRef = ref(null)
-const batchModalRef = 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()
+import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from "vue";
+import { chunk, clone } from "lodash-es";
+import { useDialog, useMessage } from "naive-ui";
+import { useRoute } 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 {
+  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 batch = ref(false);
+const selectItems = ref<any[]>([]);
+const message = useMessage();
+const dialog = useDialog();
+const notPassModalRef = ref(null);
+const batchModalRef = 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 sortBy: any = {
-  orderType: 'desc',
-  orderName: 'similarityScore',
-}
+  orderType: "desc",
+  orderName: "similarityScore",
+};
 
 function setBatch(value: boolean) {
-  if (totalCount.value === 0)
-    return
+  if (totalCount.value === 0) return;
 
-  batch.value = value
+  batch.value = value;
 
   if (value === false) {
-    selectItems.value.forEach(item => (item.checked = false))
-    selectItems.value.length = 0
-    selectItems.value.length = 0
+    selectItems.value.forEach((item) => (item.checked = false));
+    selectItems.value.length = 0;
+    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 taskStore = useTask()
-const overTask = ref<any>(null)
-const taskDetailInfo = ref<any>({})
-const taskDetailPictureList = ref<any[]>([])
-const userStore = useUser()
-const imageRef = ref<ComponentElRef | null>()
-let processItems: any[] = []
+});
+const taskStore = useTask();
+const overTask = ref<any>(null);
+const taskDetailInfo = ref<any>({});
+const taskDetailPictureList = ref<any[]>([]);
+const userStore = useUser();
+const imageRef = ref<ComponentElRef | null>();
+let processItems: any[] = [];
 
 onMounted(() => {
-  window.addEventListener('keydown', handleKeydown)
+  window.addEventListener("keydown", handleKeydown);
   if (route.query.id) {
-    taskId.value = route.query.id
-    packageId.value = route.query.packageid
-    getDetail()
+    taskId.value = route.query.id;
+    packageId.value = route.query.packageid;
+    getDetail();
   }
-})
+});
 
 // 键盘左右箭头快捷切换
 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();
   // 在这里执行右箭头的逻辑
 }
 
 // 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
@@ -114,58 +114,56 @@ 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
+  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 rejectHandler(items?: any) {
@@ -188,153 +186,157 @@ function rejectHandler(items?: any) {
   //   return
   // }
 
-  const modal = unref(notPassModalRef)! as any
-  modal.showModal(selectItems.value)
+  const modal = unref(notPassModalRef)! as any;
+  modal.showModal(selectItems.value);
 }
 
 function doAudit(param: any) {
   audit(param).then((res) => {
-    const { code } = res
-    setBatch(false)
-    if (code === 'OK') {
-      message.success('审核成功')
-      reloadList()
+    const { code } = res;
+    setBatch(false);
+    if (code === "OK") {
+      message.success("审核成功");
+      reloadList();
+    } else {
+      message.error(res.message);
     }
-
-    else { message.error(res.message) }
-  })
+  });
 }
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
 
 function forwardHandler() {
-  taskStore.forward()
+  taskStore.forward();
 }
 
 function backHandler() {
-  taskStore.back()
+  taskStore.back();
 }
 
 async function handleDragEnd(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('加入成功')
-      getTableData()
+    const res = await dubiousfileyd({ pictureid: item.pictureid });
+    if (res.code === "OK") {
+      message.success("加入成功");
+      getTableData();
+    } else {
+      message.error(res.message);
     }
-    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)) {
       const item = {
         label: v.fieldDesc,
         value: taskDetailInfo.value.ocrPicture[v.name],
         key: v.name,
-      }
-      listData.push(item)
+        blue: blueList.includes(v.fieldDesc),
+      };
+      listData.push(item);
     }
-  })
-  taskTableData.value = chunk(listData, 2)
+  });
+  taskTableData.value = chunk(listData, 2);
 }
 
 async function getImgList() {
   if (!isEmpty(taskDetailInfo.value.ocrPicture.id)) {
-    const { data, total } = await getSimilarityList(
-      {
-        ...taskpagination,
-        ...sortBy,
-        pictureId: taskDetailInfo.value.ocrPicture.id,
-      },
-    )
-    taskDetailPictureList.value = data
-    totalCount.value = total
-  }
-  else {
-    taskDetailPictureList.value.length = 0
-    totalCount.value = 0
+    const { data, total } = await getSimilarityList({
+      ...taskpagination,
+      ...sortBy,
+      pictureId: taskDetailInfo.value.ocrPicture.id,
+    });
+    taskDetailPictureList.value = data;
+    totalCount.value = total;
+  } else {
+    taskDetailPictureList.value.length = 0;
+    totalCount.value = 0;
   }
 }
 
 // 从store里面获取任务id
 const currentTaskId = computed(() => {
-  const index = taskStore.getCurrentIndex
-  return taskStore.getApprovalList[index]?.id || ''
-})
+  const index = taskStore.getCurrentIndex;
+  return taskStore.getApprovalList[index]?.id || "";
+});
 
 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
+  overTask.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()
+  taskStore.updateImmersion();
 }
 
 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],
   () => {
-    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 reloadList() {
-  getDetail()
+  getDetail();
 }
 </script>
 
@@ -343,24 +345,11 @@ function reloadList() {
     <div class="wrapper-header">
       <div class="left">
         <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
-        <SvgIcon
-          size="22"
-          class="forward"
-          name="arrow-left"
-          @click="backHandler"
-        />
-        <SvgIcon
-          size="22"
-          class="back"
-          name="arrow-right"
-          @click="forwardHandler"
-        />
+        <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
+        <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
       </div>
       <div class="right">
-        <div
-          v-show="!showActions"
-          style="display: flex; align-items: center"
-        >
+        <div v-show="!showActions" style="display: flex; align-items: center">
           <div class="btn" @click="setBatch(true)">
             <SvgIcon style="margin-right: 6px" size="22" name="batch" />
             批量审批
@@ -391,11 +380,7 @@ function reloadList() {
             </ul>
           </n-popover> -->
           <div class="icon-wrap">
-            <SvgIcon
-              size="20"
-              name="immersion-model"
-              @click="immersionHandler"
-            />
+            <SvgIcon size="20" name="immersion-model" @click="immersionHandler" />
           </div>
         </div>
         <div v-show="showActions" class="batch">
@@ -405,9 +390,19 @@ function reloadList() {
             </template>
             返回
           </n-button>
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <img
+            class="btn-approval btn-left"
+            src="@/assets/images/task/btn-not-pass.png"
+            alt=""
+            @click.stop="rejectHandler"
+          />
           <SvgIcon size="24" name="vs" />
-          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="approvalHandler">
+          <img
+            class="btn-approval"
+            src="@/assets/images/task/btn-pass.png"
+            alt=""
+            @click.stop="approvalHandler"
+          />
         </div>
       </div>
     </div>
@@ -447,44 +442,50 @@ function reloadList() {
         </div>
 
         <div class="status">
-          <img v-show="taskDetailInfo?.userapprove?.statshis === 2" 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="">
+          <img
+            v-show="taskDetailInfo?.userapprove?.statshis === 2"
+            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
-            v-show="taskDetailInfo?.iztrueorfalse === 0"
-            size="128"
-            name="jia"
-          />
+          <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
         </div>
         <div class="mark">
-          <SvgIcon
-            v-show="taskDetailInfo?.iztrueorfalse === 1"
-            size="128"
-            name="zhen"
-          />
+          <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 1" size="128" name="zhen" />
         </div>
         <div class="big-mark" />
         <div class="info img-info">
           <n-grid x-gap="12" y-gap="10" :cols="12">
             <n-gi span="4" class="gi1">
               <span>
-                <img class="icon-status" src="@/assets/images/task/status.png" alt="">
+                <img class="icon-status" src="@/assets/images/task/status.png" alt="" />
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
-              <span class="value">{{ TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] }}</span>
+              <span class="value">{{
+                TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis]
+              }}</span>
               <span class="label">审批状态</span>
             </n-gi>
             <n-gi span="4" class="gi1">
               <span>
-                <img class="icon-status" src="@/assets/images/task/similarity.png" alt="">
+                <img
+                  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>
+              <span class="value num">{{ totalCount }}<span class="unit">张</span> </span>
               <span class="label">相似匹配</span>
             </n-gi>
           </n-grid>
@@ -492,11 +493,18 @@ function reloadList() {
         <div class="time">
           <div v-if="taskDetailInfo?.ocrPicture?.photoDateTimestamp" class="time-item">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp) || 0) }}</span>
+            <span>{{
+              formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp) || 0)
+            }}</span>
           </div>
-          <div v-if="taskDetailInfo?.ocrPicture?.submitDateTimestamp" class="time-item time-item2">
+          <div
+            v-if="taskDetailInfo?.ocrPicture?.submitDateTimestamp"
+            class="time-item time-item2"
+          >
             <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp) || 0) }}</span>
+            <span>{{
+              formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp) || 0)
+            }}</span>
           </div>
         </div>
         <div style="display: none">
@@ -520,16 +528,16 @@ function reloadList() {
               />
             </div>
             <div class="list">
-              <div
-                v-for="(item) in taskDetailPictureList"
-                :key="item.id"
-                class="item"
-              >
+              <div v-for="item in taskDetailPictureList" :key="item.id" class="item">
                 <div
                   draggable="true"
                   class="img-wrapper"
                   :style="{ 'background-image': `url(${item.imgUrl})` }"
-                  @dragend="(event) => { handleDragEnd(event, item) }"
+                  @dragend="
+                    (event) => {
+                      handleDragEnd(event, item);
+                    }
+                  "
                 />
                 <div class="small-mark" />
                 <div class="check">
@@ -541,19 +549,36 @@ function reloadList() {
                   />
                 </div>
 
-                <img v-if="item.historyStates === 2" 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="">
+                <img
+                  v-if="item.historyStates === 2"
+                  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 v-if="item.photoDateTimestamp" class="time-item">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="camera-time" />
-                    <span>{{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}</span>
+                    <span>{{
+                      formatToDateHMS(Number(item.photoDateTimestamp) || 0)
+                    }}</span>
                   </div>
                   <div v-if="item.submitDateTimestamp" class="time-item time-item2">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="submit-time" />
-                    <span>{{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}</span>
+                    <span>{{
+                      formatToDateHMS(Number(item.submitDateTimestamp) || 0)
+                    }}</span>
                   </div>
                 </div>
-                <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
+                <div
+                  :class="{ 'percent-red': item.similarityScore === 100 }"
+                  class="percent"
+                >
                   {{ item.similarityScore }}<span class="percent-unit">%</span>
                 </div>
               </div>
@@ -566,7 +591,11 @@ function reloadList() {
 
     <n-tabs type="line" animated>
       <n-tab-pane name="task-info" tab="任务信息">
-        <TaskTable :data="taskDetailInfo" :task-table-data="taskTableData" @show-modal="showActionsModal" />
+        <TaskTable
+          :data="taskDetailInfo"
+          :task-table-data="taskTableData"
+          @show-modal="showActionsModal"
+        />
       </n-tab-pane>
       <n-tab-pane name="picture-info" tab="图片信息">
         <PictureTable :data="taskDetailInfo" />
@@ -576,12 +605,12 @@ function reloadList() {
       </n-tab-pane>
     </n-tabs>
     <NotPassed ref="notPassModalRef" @success="reloadList" />
-    <BatchModal
-      ref="batchModalRef"
-      @reject="rejectHandler"
-      @approval="approvalHandler"
+    <BatchModal ref="batchModalRef" @reject="rejectHandler" @approval="approvalHandler" />
+    <CustomSettingModal
+      ref="CustomSettingModalRef"
+      :review-type="3"
+      @on-ok="getTableData"
     />
-    <CustomSettingModal ref="CustomSettingModalRef" :review-type="3" @on-ok="getTableData" />
   </div>
 </template>
 
@@ -593,7 +622,7 @@ function reloadList() {
   color: #666666;
 }
 ::v-deep(.n-tabs-tab--active .n-tabs-tab__label) {
-  color: #507AFD;
+  color: #507afd;
   font-size: 16px;
   font-weight: 500;
 }
@@ -612,49 +641,48 @@ function reloadList() {
   }
 }
 
-.icon-wrap{
+.icon-wrap {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 30px;
   height: 30px;
-  background: rgba(80,122,253,.1);
+  background: rgba(80, 122, 253, 0.1);
   border-radius: 8px;
   margin-left: 10px;
   cursor: pointer;
 }
 
-.img-info{
-  .icon-status{
+.img-info {
+  .icon-status {
     width: 32px;
     height: 32px;
   }
 
-  .label{
+  .label {
     font-size: 11px;
     font-family: PingFang SC, PingFang SC-Medium;
     font-weight: 500;
     color: #ffffff;
   }
 
-  .value{
+  .value {
     font-size: 15px;
     font-family: PingFang SC, PingFang SC-Semibold;
     font-weight: 600;
     color: #ffffff;
   }
 
-  .num{
+  .num {
     font-size: 18px;
     font-family: PingFang SC, PingFang SC-Semibold;
     font-weight: 600;
     color: #ffffff;
   }
 
-  .unit{
+  .unit {
     font-size: 11px;
   }
-
 }
 .wrapper {
   display: flex;
@@ -717,13 +745,13 @@ function reloadList() {
         display: flex;
         align-items: center;
 
-        .btn-approval{
+        .btn-approval {
           width: 68px;
           height: 28px;
           cursor: pointer;
         }
 
-        .btn-left{
+        .btn-left {
           margin-left: 16px;
         }
       }
@@ -749,10 +777,15 @@ function reloadList() {
       border-radius: 8px;
       position: relative;
 
-      .big-mark{
+      .big-mark {
         width: 100%;
         height: 151px;
-        background: linear-gradient(180deg,rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.00) 29%, rgba(3,0,0,0.73));
+        background: linear-gradient(
+          180deg,
+          rgba(0, 0, 0, 0) 0%,
+          rgba(0, 0, 0, 0) 29%,
+          rgba(3, 0, 0, 0.73)
+        );
         position: absolute;
         left: 0;
         bottom: 0;
@@ -806,7 +839,7 @@ function reloadList() {
         left: 16px;
         bottom: 16px;
 
-        .time-item{
+        .time-item {
           display: flex;
           align-items: center;
           font-size: 14px;
@@ -816,12 +849,12 @@ function reloadList() {
           margin-bottom: 4px;
         }
 
-        .time-item2{
+        .time-item2 {
           margin-bottom: 0;
         }
 
-        .svg-time{
-          margin-right: 5px
+        .svg-time {
+          margin-right: 5px;
         }
       }
 
@@ -837,20 +870,20 @@ function reloadList() {
         justify-content: center;
       }
 
-      .check{
+      .check {
         position: absolute;
         z-index: 3;
         left: 2%;
         top: 2%;
       }
 
-      .status{
+      .status {
         position: absolute;
         z-index: 3;
         left: 0;
         top: 0;
 
-        .img-status{
+        .img-status {
           width: 133px;
           height: 129px;
         }
@@ -859,12 +892,12 @@ function reloadList() {
 
     .right {
       flex: 0.5;
-      background: #F6F9FD;
+      background: #f6f9fd;
       border-radius: 8px;
       margin-left: 20px;
       padding: 24px;
 
-      .right-card{
+      .right-card {
         padding: 3px;
       }
 
@@ -893,10 +926,14 @@ function reloadList() {
         // overflow: hidden;
         margin: 0px 16px 27px 0px;
 
-        .small-mark{
+        .small-mark {
           width: 100%;
           height: 36px;
-          background: linear-gradient(180deg,rgba(0,0,0,0.01), rgba(0,0,0,0.44) 88%);
+          background: linear-gradient(
+            180deg,
+            rgba(0, 0, 0, 0.01),
+            rgba(0, 0, 0, 0.44) 88%
+          );
           border-radius: 0px 8px 8px 8px;
           position: absolute;
           left: 0;
@@ -904,7 +941,7 @@ function reloadList() {
           z-index: 0;
         }
 
-        .tag-status{
+        .tag-status {
           width: 46px;
           height: 22px;
           position: absolute;
@@ -917,7 +954,7 @@ function reloadList() {
           z-index: 3;
           left: 3px;
           bottom: 3px;
-          .time-item{
+          .time-item {
             display: flex;
             align-items: center;
             font-size: 10px;
@@ -928,12 +965,12 @@ function reloadList() {
             line-height: 12px;
           }
 
-          .time-item2{
+          .time-item2 {
             margin-bottom: 0;
           }
 
-          .svg-time{
-            margin-right: 5px
+          .svg-time {
+            margin-right: 5px;
           }
         }
 
@@ -973,12 +1010,12 @@ function reloadList() {
         font-size: 14px;
       }
 
-      .percent-unit{
+      .percent-unit {
         font-size: 8px;
-        margin-top: 4px
+        margin-top: 4px;
       }
 
-      .percent-red{
+      .percent-red {
         background: #ff4e4f;
       }
     }
diff --git a/src/views/task/content/TaskTable.vue b/src/views/task/content/TaskTable.vue
index a0d4a18..cda8791 100644
--- a/src/views/task/content/TaskTable.vue
+++ b/src/views/task/content/TaskTable.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import { ref, watch } from "vue";
+
 defineProps({
   data: {
     type: Object as PropType<any>,
@@ -8,19 +10,17 @@ defineProps({
     type: Array as any,
     default: () => [[]],
   },
-})
-const emit = defineEmits(['showModal'])
+});
+const emit = defineEmits(["showModal"]);
 function showActionsModal() {
-  emit('showModal')
+  emit("showModal");
 }
 </script>
 
 <template>
   <div class="info-header">
     <div class="left_box">
-      <div class="title">
-        填报信息
-      </div>
+      <div class="title">填报信息</div>
     </div>
     <div class="right_box" @click="showActionsModal">
       自定义设置
@@ -32,13 +32,13 @@ function showActionsModal() {
       <th v-if="item && item[0]">
         {{ item[0].label }}
       </th>
-      <td v-if="item && item[0]" :class="item.blue ? 'blue' : ''">
+      <td v-if="item && item[0]" :class="item[0].blue ? 'blue' : ''">
         {{ item[0].value }}
       </td>
       <th v-if="item && item.length > 1">
         {{ item[1].label }}
       </th>
-      <td v-if="item && item.length > 1" :class="item.blue ? 'blue' : ''">
+      <td v-if="item && item.length > 1" :class="item[1].blue ? 'blue' : ''">
         {{ item[1].value }}
       </td>
     </tr>
@@ -81,8 +81,8 @@ function showActionsModal() {
     font-family: PingFang SC, PingFang SC-Regular;
     color: #666666;
 
-    .icon{
-      margin-left: 7px
+    .icon {
+      margin-left: 7px;
     }
   }
 }
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index a0d9228..e92f8a0 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -251,7 +251,10 @@ function removeHandler(id: string) {
   let index = onList.value.findIndex((item) => {
     return item.id === id;
   });
-  if (index !== -1) onList.value.splice(index, 1);
+  if (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;

From 0837afc5453e47bcb15d4e4bc6cfbfc93770fee2 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 19:28:27 +0800
Subject: [PATCH 15/26] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E7=BB=88?=
 =?UTF-8?q?=E5=AE=A1=E7=95=8C=E9=9D=A2=E5=92=8C=E4=B8=80=E9=94=AE=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D=E7=95=8C=E9=9D=A2=E7=9A=84=E6=96=B0=E5=BB=BA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E7=AA=9724=E5=B0=8F=E6=97=B6=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/NewFilterModal.vue       |   6 +-
 .../home/aside/comp/modals/NewFilterModal.vue |   6 +-
 src/views/worksheet/modal/ApprovalModal.vue   | 116 +++++++++---------
 3 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index ae1e823..3b9a219 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -150,7 +150,7 @@ function unformatValue(searchfield: string, searchvalue: any) {
 function createCondition() {
   formValue.conditions.push({
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   })
 }
@@ -227,7 +227,7 @@ function leaveHandler() {
   formValue.conditions = [
     {
       type: null,
-      operator: null,
+      operator: 'eq',
       result: null,
     },
   ]
@@ -269,7 +269,7 @@ defineExpose({
             <n-form-item path="name" label="标题">
               <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
             </n-form-item>
-            <n-form-item path="logic" label="逻辑关系">
+            <n-form-item path="logic" label="逻辑关系" v-show="false">
               <n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
             </n-form-item>
             <n-form-item
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 8dc60d6..1c4dda4 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -158,7 +158,7 @@ function unformatValue(searchfield: string, searchvalue: any) {
 function createCondition() {
   formValue.conditions.push({
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   })
 }
@@ -260,7 +260,7 @@ function leaveHandler() {
   formValue.conditions = [
     {
       type: null,
-      operator: null,
+      operator: 'eq',
       result: null,
     },
   ]
@@ -302,7 +302,7 @@ defineExpose({
             <n-form-item path="name" label="标题">
               <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
             </n-form-item>
-            <n-form-item path="logic" label="逻辑关系">
+            <n-form-item path="logic" label="逻辑关系" v-show="false">
               <n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
             </n-form-item>
             <n-form-item
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 5f60991..55f0fa9 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -1,101 +1,104 @@
 <script lang="ts" setup>
-import { reactive, ref, toRefs } from 'vue'
-import { format } from 'date-fns'
-import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
-import { aiApprovaltools, aiApprovaltoolsClearmark } from '@/api/work/work'
+import { onMounted, reactive, ref, toRefs } from "vue";
+import { format } from "date-fns";
+import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
+import { aiApprovaltools, aiApprovaltoolsClearmark } from "@/api/work/work";
+import { getToolsCount } from "@/api/home/main";
 
 const emit = defineEmits<{
-  (e: 'reject', params: any)
-  (e: 'notPass', params: any)
-}>()
+  (e: "reject", params: any);
+  (e: "notPass", params: any);
+}>();
 
-const dialog = useDialog()
+const dialog = useDialog();
 
 const state: any = reactive({
   detail: {},
-  taskId: '',
-})
-const { detail } = toRefs(state)
+  taskId: "",
+});
+const { detail } = toRefs(state);
 const cardStyle = {
-  'width': '450px',
-  '--n-padding-bottom': '10px',
-  '--n-padding-left': '0px',
-}
+  width: "450px",
+  "--n-padding-bottom": "10px",
+  "--n-padding-left": "0px",
+};
 
-const show = ref(false)
+const show = ref(false);
 
 function showModal(id) {
-  console.log(id)
-  state.taskId = id
-  getDetail(id)
+  console.log(id);
+  state.taskId = id;
+  getDetail(id);
 }
 
 async function getDetail(id) {
-  const res = await aiApprovaltools({ taskid: id })
-  if (res.code === 'OK') {
-    state.detail = res.data
-    show.value = true
+  const res = await aiApprovaltools({ taskid: id });
+  if (res.code === "OK") {
+    state.detail = res.data;
+    show.value = true;
   }
 
-  console.log(res)
+  console.log(res);
 }
 
 async function clearMark() {
-  const res = await aiApprovaltoolsClearmark({ taskid: state.taskId })
-  if (res.code === 'OK')
-    closeModal()
+  const res = await aiApprovaltoolsClearmark({ taskid: state.taskId });
+  if (res.code === "OK") closeModal();
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 
 async function reject() {
   // emit('reject', { a: 'todo' })
   // closeModal()
   dialog.info({
-    title: '确认提示',
-    content: '确认设置成假吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认设置成假吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
-      clearMark()
+      clearMark();
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 async function viewRepeat(e: MouseEvent) {
-  emit('notPass', {
+  emit("notPass", {
     id: state.taskId,
     detail: state.detail,
-  })
-  e.preventDefault()
-  closeModal()
+  });
+  e.preventDefault();
+  closeModal();
+}
+
+async function getShowStatus() {
+  const res = await getToolsCount();
+  if (!JSON.parse(res.message)) {
+    show.value = true;
+  }
 }
+onMounted(() => {
+  getShowStatus();
+});
 
 defineExpose({
   showModal,
-})
+});
 </script>
 
 <template>
   <n-modal v-model:show="show" transform-origin="center" class="modal_wrap">
     <div class="wrapper">
       <div class="closed">
-        <SvgIcon
-          style="cursor: pointer"
-          name="cut-down"
-          width="32"
-          @click="closeModal"
-        />
+        <SvgIcon style="cursor: pointer" name="cut-down" width="32" @click="closeModal" />
       </div>
       <div class="wrapper-hearder">
-        <div class="wrapper-title">
-          智能AI审批工具
-        </div>
+        <div class="wrapper-title">智能AI审批工具</div>
         <div class="wrapper-mark">
           {{ detail.tenantusername }}
         </div>
@@ -105,25 +108,20 @@ defineExpose({
           <div v-for="i in 1" :key="i" class="item">
             <div class="imgwrapper" />
             <div class="content">
-              <div class="task_id">
-                任务ID：{{ detail.taskid }}
-              </div>
+              <div class="task_id">任务ID：{{ detail.taskid }}</div>
               <div class="tag_box">
-                <div class="tag_item">
-                  基线任务
-                </div>
-                <div class="tag_item error">
-                  相似图片({{ detail.similarcount }})
-                </div>
+                <div class="tag_item">基线任务</div>
+                <div class="tag_item error">相似图片({{ detail.similarcount }})</div>
               </div>
               <div class="time_box">
-                {{ format(detail.createtime, 'yyyy-MM-dd HH:mm:ss') }}
+                {{ format(detail.createtime, "yyyy-MM-dd HH:mm:ss") }}
               </div>
             </div>
           </div>
         </n-scrollbar>
         <div class="mark_text">
-          智能识别：{{ detail.similarComplete }}张图片来源于网络，建议将图片标记为假，或 快速审批不通过！
+          智能识别：{{ detail.similarComplete }}张图片来源于网络，建议将图片标记为假，或
+          快速审批不通过！
         </div>
         <div class="footer">
           <SvgIcon

From 1b61fcabb92afdd2e4d985a6d078c39f2a04d012 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 19:34:49 +0800
Subject: [PATCH 16/26] bug

---
 src/api/task/task.ts                    |  8 ++++++--
 src/views/task/aside/TaskList.vue       |  8 ++++++--
 src/views/task/content/Content.vue      | 27 ++++++++++++++++++++++---
 src/views/task/content/PictureTable.vue | 27 ++++++++++++++++---------
 4 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/api/task/task.ts b/src/api/task/task.ts
index 5dc1654..572e5f7 100644
--- a/src/api/task/task.ts
+++ b/src/api/task/task.ts
@@ -7,11 +7,15 @@ import { ContentTypeEnum } from '@/enums/httpEnum'
  * 获取审核列表
  * @returns
  */
-export async function getApprovalList(page: PageParam) {
+export async function getApprovalList(page: any) {
   const res = await http.request({
     url: `/flow/task/listalldata`,
     method: 'get',
-    params: { pageSize: page.pageSize, currPage: page.pageNo },
+    params: {
+      pageSize: page.pageSize,
+      currPage: page.pageNo,
+      keyword: page.keyword,
+    },
   })
 
   const { data: { list, totalCount } } = res
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index eb88cf6..5044a60 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -37,6 +37,7 @@ useInfiniteScroll(
 )
 
 async function loadMore() {
+  console.log(77888)
   if (isLoading.value || el.value == null)
     return
   isLoading.value = true
@@ -53,7 +54,10 @@ async function loadMore() {
 async function fetchList() {
   try {
     pagination.pageNo += 1
-    const result = await taskStore.fetchApprovalList(pagination)
+    const result = await taskStore.fetchApprovalList({
+      ...pagination,
+      keyword: keyword.value,
+    })
     const { data, pageCount } = result
     canloadMore.value = pageCount >= pagination.pageNo
     return data || []
@@ -73,7 +77,7 @@ watch(
 
 function reset() {
   pagination.pageNo = 0
-  pagination.pageSize = 100
+  pagination.pageSize = 30
   canloadMore.value = true
   data.value.length = 0
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index af253a2..52766bf 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -303,9 +303,11 @@ function previewHandler(event: MouseEvent) {
 watch(
   () => [taskStore.activeId],
   () => {
-    packageId.value = taskStore.getPackageid
-    taskId.value = taskStore.getActiveId
-    getDetail()
+    if (!isEmpty(taskStore.getActiveId)) {
+      packageId.value = taskStore.getPackageid
+      taskId.value = taskStore.getActiveId
+      getDetail()
+    }
   },
 )
 
@@ -456,6 +458,9 @@ function reloadList(param, text) {
           />
         </div>
         <div class="big-mark" />
+        <div class="preview" @click="previewHandler">
+          <SvgIcon size="16" name="zoom-out" />
+        </div>
         <div class="info img-info">
           <n-grid x-gap="12" y-gap="10" :cols="12">
             <n-gi span="4" class="gi1">
@@ -740,6 +745,22 @@ function reloadList(param, text) {
       border-radius: 8px;
       position: relative;
 
+      .preview {
+        position: absolute;
+        right: 10px;
+        top: 10px;
+        z-index: 3;
+        width: 30px;
+        height: 30px;
+        background: rgba(255, 255, 255, 0.20);
+        border-radius: 6px;
+        backdrop-filter: blur(10px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+      }
+
       .big-mark{
         width: 100%;
         height: 151px;
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index d2fa022..68d0512 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -19,35 +19,42 @@ defineProps({
     <tr>
       <th>图片名称</th>
       <td class="blue">
-        {{ data?.ocrPicture?.imgname }}
+        {{ data?.pictureInfo?.imgname }}
       </td>
       <th>图片格式</th>
-      <td class="blue" />
+      <td class="blue">
+        {{ data?.pictureInfo?.imgFormat }}
+      </td>
     </tr>
     <tr>
       <th>图片大小</th>
-      <td />
+      <td class="blue">
+        {{ (data?.pictureInfo?.imgSize / 1024).toFixed(2) }}kb
+      </td>
       <th>图片尺寸</th>
-      <td />
+      <td class="blue">
+        {{ data?.pictureInfo?.imgMeasure }}
+      </td>
     </tr>
     <tr>
       <th>上传时间</th>
-      <td> {{ data?.ocrPicture?.uptime }}</td>
+      <td> {{ data?.pictureInfo?.uploadTime }}</td>
       <th>生成时间</th>
-      <td> {{ data?.ocrPicture?.gentime }}</td>
+      <td> {{ data?.pictureInfo?.createTime }}</td>
     </tr>
     <tr>
       <th>标记时间</th>
-      <td />
+      <td> {{ data?.pictureInfo?.tagTime }}</td>
+
       <th>色彩空间</th>
-      <td>{{ data?.ocrPicture?.space }}</td>
+      <td>{{ data?.pictureInfo?.imgSpace }}</td>
     </tr>
     <tr>
       <th>
         来源
       </th>
       <td colspan="3">
-        {{ data?.ocrPicture?.source }}
+        {{ data?.pictureInfo?.source }}
       </td>
     </tr>
   </table>
@@ -125,7 +132,7 @@ td {
 }
 
 .blue {
-  color: #507afd;
+  // color: #507afd;
 }
 
 .black {

From d4ee5d73b766af7b002ce75daa2f7fcec1f05de4 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 23:48:06 +0800
Subject: [PATCH 17/26] =?UTF-8?q?fix:=20=E6=96=87=E5=AD=97=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E9=95=BF=E5=BA=A6=E5=A2=9E=E5=8A=A0popver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue  | 10 +++++++---
 src/views/worksheet/content/Content.vue |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index bf855f4..00db5f3 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -45,7 +45,9 @@ onMounted(async () => {
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
-            <span class="list-item-title" :title="listItem.name">{{ listItem.name }} </span>
+            <n-ellipsis style="max-width: 226px">
+             {{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}
+            </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
           </span>
         </div>
@@ -111,8 +113,10 @@ onMounted(async () => {
       color: #333333;
       margin-bottom: 0 0 8px 8px;
       display: flex;
-      justify-content: space-between;
-      .list-item-title{
+      justify-content: flex-start;
+      align-items: center;
+
+      .list-item-title {
         width: 200px;
         display: inline-block;
         white-space: nowrap;
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 4d2d7f0..b26ca8a 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -480,7 +480,7 @@ function reloadList() {
           <!-- 右侧任务 标题信息 -->
           <div class="right">
             <n-scrollbar style="max-height: 100%">
-              <span class="task-name" :title="taskDetailInfo.taskname">任务ID：{{ taskDetailInfo.taskname }}</span>
+              <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
               <div class="tags">
                 <div class="tag tag-submiting" v-if="taskDetailInfo.states == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.states]
                 }}</div>

From f3e7bd4c4b442e20f8485956c546c659ca0856a1 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 23:51:47 +0800
Subject: [PATCH 18/26] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E4=BB=BB=E5=8A=A1=E5=8C=85=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 00db5f3..8a3c4f6 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -46,7 +46,7 @@ onMounted(async () => {
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             <n-ellipsis style="max-width: 226px">
-             {{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}
+             {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
           </span>

From 1fa07621a5d16eb3111ff5f1db912dc81dabf1c0 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 00:07:45 +0800
Subject: [PATCH 19/26] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E6=8A=A5=E4=BA=BA=E6=8F=90=E6=8A=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue  | 2 +-
 src/views/worksheet/content/Content.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 8a3c4f6..f80514d 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
-            <n-ellipsis style="max-width: 226px">
+            <n-ellipsis style="max-width: 180px">
              {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index b26ca8a..7bacc6a 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -517,7 +517,7 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">提报人
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.source || "-" }}</span>
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.upname || "-" }}</span>
               </div>
               <div class="property">
                 <span class="property-name top" style=" color: #666666">创建时间
@@ -527,8 +527,8 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">提报时间
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.uploadTime &&
-                  format(taskDetailInfo?.pictureInfo?.uploadTime, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.submitDateTimestamp &&
+                  format(taskDetailInfo?.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
               </div>
               <div v-for="key in Object.keys(propertys)" :key="key" class="property">
                 <span class="property-name">{{ fieldMap[key] }}</span>

From 331b75636b8f7b27ab226e5d43f81db4f4ab18f6 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 01:28:55 +0800
Subject: [PATCH 20/26] =?UTF-8?q?feat:=20=E8=A7=A3=E6=95=A3=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/main.ts                        | 13 ++++++++
 src/views/home/content/Content.vue          |  5 ---
 src/views/worksheet/aside/ListItem.vue      | 36 +++++++++++++++------
 src/views/worksheet/aside/WorkSheetList.vue | 30 +++++++++++++----
 4 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/api/home/main.ts b/src/api/home/main.ts
index bd661e2..5f70458 100644
--- a/src/api/home/main.ts
+++ b/src/api/home/main.ts
@@ -180,6 +180,19 @@ export async function oneClickCheck(params: Partial<CheckParam> = { search_histo
     params
   })
 }
+/**
+ * 解散任务包
+ * @param 
+ * @returns
+ */
+ export async function deletePackage(params) {
+
+  return http.request({
+    url: `/ocr/ocrTaskPackage/deletePackage`,
+    method: 'get',
+    params
+  })
+}
 /**
  * 任务完成——创建任务包前——获取图片列表
  * @param 
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 8ebdf46..52595ad 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -236,11 +236,6 @@ async function tasksLoadingCloseCallback() {
 	checkingTaskModal.showModal()
 }
 
-async function showLoginSuccessModal() {
-  const modal = LoginSuccessModalRef.value as any
-  // modal.showModal()
-}
-
 async function commitHandler(settingParam) {
   const params = {
     name: settingParam.packagename,
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index f80514d..cb9350c 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
 import { format } from 'date-fns';
-import { computed, onMounted } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { PackageListItem } from "/#/workorder";
+
 defineOptions({ name: "ListItem" });
+const emit = defineEmits(['dismisClick'])
 
 const props = defineProps({
   selected: {
@@ -21,19 +23,22 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  mouseOverTask: {
+    type: Array,
+    default: () => [],
+  },
 });
-console.log(props.dicts, "dicts");
+const isDismissTask = ref(false)
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
-function getValueByLabel(label) {
-  const result = props.dicts.filter(item => item.name === label)
-  if (result.length === 0) {
-    return ""
-  } else {
-    return props.dicts.filter(item => item.name === label)[0].fieldDesc
-  }
+
+
+function handleDismissTask() {
+  isDismissTask.value = true
+  emit('dismisClick',  props.mouseOverTask.id)
 }
+
 onMounted(async () => {
 })
 </script>
@@ -46,9 +51,15 @@ onMounted(async () => {
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             <n-ellipsis style="max-width: 180px">
-             {{ listItem.name }}
+              {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
+            <n-popover placement="bottom" trigger="hover" >
+              <template #trigger>
+                <span class="dismiss-task-pack"  v-show="mouseOverTask?.id" style="cursor: pointer;" @click.stop="handleDismissTask">...</span>
+              </template>
+              <span>解散任务包</span>
+            </n-popover>
           </span>
         </div>
       </div>
@@ -105,6 +116,11 @@ onMounted(async () => {
       margin-bottom: 6px
     }
 
+    .dismiss-task-pack {
+      position: absolute;
+      right: 15px;
+    }
+
     .list-item-header-name {
       width: 250px;
       font-size: 16px;
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 39cb0b7..4292eb4 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -1,9 +1,11 @@
 <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 { reactive, ref, unref, watch } from 'vue'
+import { useMessage } from 'naive-ui'
+import { reactive, ref, watch } from 'vue'
 import ApprovalModal from '../modal/ApprovalModal.vue'
 import ListItem from './ListItem.vue'
 import type { PackageListItem } from '/#/workorder'
@@ -33,11 +35,7 @@ const pagination = reactive({
 
 const approvalModalRef = ref(null)
 const notPassedRef: any = ref(null)
-
-function showModal(modalRef: any, id) {
-  const modal = unref(modalRef)! as any
-  modal.showModal(id)
-}
+const overTask = ref<any>(null);
 
 function selectHandler(id: string, index: number) {
   workStore.setActive(index)
@@ -125,7 +123,21 @@ async function search(word: string) {
     { distance: 10, canLoadMore: () => canloadMore.value },
   )
 }
-
+function overTaskHandelr(item: any) {
+  overTask.value = item
+}
+function leaveTaskHandler() {
+  overTask.value = null;
+}
+const message = useMessage()
+function dismisClick(packageId:string) {
+  deletePackage({packageId: packageId}).then((res) => {
+    if(res.code==="OK"){
+      message.success("解散任务包成功")
+      loadMore()
+    }
+  })
+}
 defineExpose({
   search,
 })
@@ -143,7 +155,11 @@ defineExpose({
         :list-item="item"
         :show-field-list="showFieldList"
         :dicts="dicts"
+        :mouse-over-task="overTask"
         @click="selectHandler(item.id, index)"
+        @mouseover="overTaskHandelr(item)"  
+        @mouseleave="leaveTaskHandler"
+        @dismisClick="dismisClick"
       />
     </div>
   </n-spin>

From 938e53ed44352c51dccfd67e0abd064c839dee8e Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 01:42:12 +0800
Subject: [PATCH 21/26] =?UTF-8?q?=E6=9A=82=E5=AD=98=E7=BB=88=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/column.svg         |  18 +++++
 src/views/final/content/Content.vue | 110 +++++++++++++++-------------
 src/views/task/content/Content.vue  |   2 +-
 3 files changed, 77 insertions(+), 53 deletions(-)
 create mode 100644 src/assets/icons/column.svg

diff --git a/src/assets/icons/column.svg b/src/assets/icons/column.svg
new file mode 100644
index 0000000..954e360
--- /dev/null
+++ b/src/assets/icons/column.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>自定义列</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-1986.000000, -6758.000000)">
+            <g id="自定义列" transform="translate(1986.000000, 6758.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <path d="M36.9854854,42.6064492 C37.5377701,42.6064492 37.9854854,43.0541645 37.9854854,43.6064492 L37.9854854,56 C37.9854854,56.5522847 37.5377701,57 36.9854854,57 L33.9854854,57 C33.4332006,57 32.9854854,56.5522847 32.9854854,56 L32.985,52.303 L7,52.3032246 C6.44771525,52.3032246 6,51.8555094 6,51.3032246 L6,48.3032246 C6,47.7509399 6.44771525,47.3032246 7,47.3032246 L32.985,47.303 L32.9854854,43.6064492 C32.9854854,43.0541645 33.4332006,42.6064492 33.9854854,42.6064492 L36.9854854,42.6064492 Z M54.4637884,47.3032246 C55.0160731,47.3032246 55.4637884,47.7509399 55.4637884,48.3032246 L55.4637884,51.3032246 C55.4637884,51.8555094 55.0160731,52.3032246 54.4637884,52.3032246 L44.6371044,52.3032246 C44.0848196,52.3032246 43.6371044,51.8555094 43.6371044,51.3032246 L43.6371044,48.3032246 C43.6371044,47.7509399 44.0848196,47.3032246 44.6371044,47.3032246 L54.4637884,47.3032246 Z M29.8824782,24.8032246 C30.4347629,24.8032246 30.8824782,25.2509399 30.8824782,25.8032246 L30.882,29.5 L57,29.5 C57.5522847,29.5 58,29.9477153 58,30.5 L58,33.5 C58,34.0522847 57.5522847,34.5 57,34.5 L30.882,34.5 L30.8824782,38.1967754 C30.8824782,38.7490601 30.4347629,39.1967754 29.8824782,39.1967754 L26.8824782,39.1967754 C26.3301934,39.1967754 25.8824782,38.7490601 25.8824782,38.1967754 L25.8824782,25.8032246 C25.8824782,25.2509399 26.3301934,24.8032246 26.8824782,24.8032246 L29.8824782,24.8032246 Z M19.2308592,29.5 C19.7831439,29.5 20.2308592,29.9477153 20.2308592,30.5 L20.2308592,33.5 C20.2308592,34.0522847 19.7831439,34.5 19.2308592,34.5 L7,34.5 C6.44771525,34.5 6,34.0522847 6,33.5 L6,30.5 C6,29.9477153 6.44771525,29.5 7,29.5 L19.2308592,29.5 Z M36.9854854,7 C37.5377701,7 37.9854854,7.44771525 37.9854854,8 L37.9854854,20.3935508 C37.9854854,20.9458355 37.5377701,21.3935508 36.9854854,21.3935508 L33.9854854,21.3935508 C33.4332006,21.3935508 32.9854854,20.9458355 32.9854854,20.3935508 L32.985,16.696 L7,16.6967754 C6.44771525,16.6967754 6,16.2490601 6,15.6967754 L6,12.6967754 C6,12.1444906 6.44771525,11.6967754 7,11.6967754 L32.985,11.696 L32.9854854,8 C32.9854854,7.44771525 33.4332006,7 33.9854854,7 L36.9854854,7 Z M54.4637884,11.6967754 C55.0160731,11.6967754 55.4637884,12.1444906 55.4637884,12.6967754 L55.4637884,15.6967754 C55.4637884,16.2490601 55.0160731,16.6967754 54.4637884,16.6967754 L44.6371044,16.6967754 C44.0848196,16.6967754 43.6371044,16.2490601 43.6371044,15.6967754 L43.6371044,12.6967754 C43.6371044,12.1444906 44.0848196,11.6967754 44.6371044,11.6967754 L54.4637884,11.6967754 Z" id="形状结合" fill="#666666" fill-rule="nonzero" mask="url(#mask-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 126413c..73cd966 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -46,7 +46,7 @@ const emit = defineEmits(['changeShow'])
 function changeContent() {
   emit('changeShow')
 }
-
+const checkedRowKeys = ref([])
 const dicStore = useDictionary()
 const izstatusList = ref([])
 const router = useRouter()
@@ -170,6 +170,10 @@ async function getColumns() {
       type: 'selection',
       fixed: 'left',
       width: 50,
+      disabled(row: any) {
+        console.log(row)
+        return row.states !== 2
+      },
     },
   ]
 
@@ -663,43 +667,34 @@ function singleApproval(row) {
   doAudit(param)
 }
 
+// 批量通过
 function batchApproval() {
-  const items = getSelectItems()
-  const msg = validate(items)
+  const items: any = getSelectItems()
+  const list: any = []
+  items.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromtaskname,
+    })
+  })
 
-  if (msg !== null) {
-    message.error(msg)
-    return
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
   }
-
-  dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      approval(items)
-    },
-    onNegativeClick: () => {},
-  })
+  console.log(param)
+  reload()
+  checkedRowKeys.value = []
+  console.log(selectionIds.value)
+  // doAudit(param)
 }
 
-// function approval(items) {
-//   const formIds: string[] = items.map(item => item.id)
-//   const taskIds: string[] = items.map(item => item.taskId)
-//   const tasknames: string[] = items.map(item => item.taskname)
-
-//   const param: ApprovalParam = {
-//     formid: formIds,
-//     taskId: taskIds,
-//     approvd: true,
-//     taskComment: 'approval',
-//     taskname: tasknames,
-//   }
-
-//   doAudit(param)
-// }
-
 // 审核不通过
 function rejectHandler(list) {
   const msg = validate(list)
@@ -713,24 +708,8 @@ function rejectHandler(list) {
   modal.showModal(list)
 }
 
-function reject(idOrDesc: string, backId: string, isOther: boolean) {
-  const items = getSelectItems()
-  const formIds: string[] = items.map(item => item.id)
-  const taskIds: string[] = items.map(item => item.fromtaskid)
-  const tasknames: string[] = items.map(item => item.fromtaskname)
-
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: false,
-    taskComment: idOrDesc,
-    taskname: isOther ? tasknames : ['其他'],
-  }
-
-  doAudit(param)
-}
-
 function reload() {
+  selectionIds.value = []
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
 }
@@ -786,10 +765,21 @@ function doAudit(param: any) {
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
-        <div class="btn" @click="batchApproval">
+        <div class="batch">
+          <NButton text @click="setBatch(false)">
+            <template #icon>
+              <SvgIcon name="revoke" />
+            </template>
+            返回
+          </NButton>
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <SvgIcon size="24" name="vs" />
+          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+        </div>
+        <!-- <div class="btn" @click="batchApproval">
           <SvgIcon style="margin-right: 6px" size="14" name="tf" />
           批量审批
-        </div>
+        </div> -->
         <n-popover
           ref="popover"
           :style="{ padding: '0px' }"
@@ -839,6 +829,7 @@ function doAudit(param: any) {
     <div class="wrapper-content">
       <NDataTable
         ref="tableRef"
+        v-model:checked-row-keys="checkedRowKeys"
         remote
         :columns="columnsRef"
         :scroll-x="1250"
@@ -874,6 +865,21 @@ function doAudit(param: any) {
 .color-red{
   color: #FF4E4F!important;
 }
+
+.batch {
+  display: flex;
+  align-items: center;
+
+  .btn-approval{
+    width: 68px;
+    height: 28px;
+    cursor: pointer;
+  }
+
+  .btn-left{
+    margin-left: 16px;
+  }
+}
 .wrapper {
   display: flex;
   flex: 1;
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 52766bf..0dbd088 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -212,7 +212,7 @@ async function handleDragEnd(event, item) {
   // 可以在这里添加拖拽结束后的逻辑
   const flag = taskStore.getInFile
   if (flag) {
-    const res = await dubiousfileyd({ pictureid: item.pictureid })
+    const res = await dubiousfileyd({ pictureid: item.pictureId })
     if (res.code === 'OK') {
       message.success('加入成功')
       getTableData()

From 70e1ac6df09f5aa3b94eb3433ad157a2c075fc41 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 01:53:40 +0800
Subject: [PATCH 22/26] =?UTF-8?q?feat:=20=E4=B8=8D=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E7=BA=A2=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 7bacc6a..92f7c19 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -914,8 +914,8 @@ function reloadList() {
       }
 
       .tag-passed {
-        color: #02C984;
-        border: 1px solid #02C984;
+        color: #ff7575;
+        border: 1px solid #ff7575;
       }
 
       .tag-approved {

From 53b98dc6a6340eb2c8b2b432c2a6fe55a5227d8c Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 01:55:33 +0800
Subject: [PATCH 23/26] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=80=92=E5=BA=8F=E6=AD=A3=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 92f7c19..dbee369 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -53,7 +53,7 @@ const taskpagination = reactive({
   pageSize: 10,
 });
 const sortBy: SimilarityPictureSortParam = {
-  orderType: "asc",
+  orderType: "desc",
   orderName: "similarityScore",
 };
 const workStore = useWorkOrder();
@@ -234,7 +234,7 @@ async function handleSelect(item: any) {
 async function sortHandler(orderby: "similarityScore" | "createdate") {
   selectedSortName.value = orderby;
   sortBy.orderName = orderby;
-  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
+  sortBy.orderType = sortBy.orderType === "desc" ? "desc" : "asc";
   refreshHandler();
 }
 

From 852b9aad2c6667948484434dc0fa8f4da7b114df Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 02:29:41 +0800
Subject: [PATCH 24/26] bug

---
 src/components/Approval/NotPassed.vue   | 20 +++++++---
 src/views/final/content/Content.vue     | 50 ++++++++++---------------
 src/views/task/content/PictureTable.vue |  2 +-
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index 04bad76..b2e53a5 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -30,8 +30,8 @@ const rules = {
 }
 
 const formData = reactive({
-  disposeTypeId: '',
-  failCauseId: '',
+  disposeTypeId: '262403670085013522',
+  failCauseId: '260402999231251188',
   comment: '',
 })
 
@@ -149,7 +149,7 @@ async function selectChange(id) {
               <n-select v-model:value="formData.failCauseId" filterable :options="failCauseOptions" @change="selectChange" />
             </n-form-item>
             <n-form-item v-show="showOther" class="form-item-area" label="" path="">
-              <n-input v-model:value="formData.comment" type="textarea" placeholder="备注内容" />
+              <n-input v-model:value="formData.comment" placeholder-class="pl" type="textarea" placeholder="备注内容" />
             </n-form-item>
           </div>
         </n-form>
@@ -157,9 +157,9 @@ async function selectChange(id) {
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确认
+            确定
           </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button secondary class="btn" style="margin-left:15px" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -219,6 +219,7 @@ async function selectChange(id) {
   .form-item-area{
     margin-top: -30px;
   }
+
 }
 
 ::v-deep(.n-card__content) {
@@ -234,4 +235,13 @@ async function selectChange(id) {
   margin-top: 0px;
   margin-bottom: 0px;
 }
+
+::v-deep(.n-input__placeholder) {
+  color: #333333!important;
+}
+
+.btn{
+  border: 1px solid #cad2dd;
+  background-color: #fff;
+}
 </style>
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 73cd966..c6a36dc 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -171,7 +171,6 @@ async function getColumns() {
       fixed: 'left',
       width: 50,
       disabled(row: any) {
-        console.log(row)
         return row.states !== 2
       },
     },
@@ -606,22 +605,6 @@ function actionHandler(action: any, row: any) {
 function validate(items: any[]) {
   if (items.length === 0)
     return '至少选中一个任务'
-
-  // const useInfo = userStore.getUserInfo
-  // const username = useInfo.loginname
-
-  // for (const item of items) {
-  //   const { iztrueorfalse, states, assignee } = item
-  //   if (iztrueorfalse === null)
-  //     return '未判别真假'
-
-  //   else if (states !== 2)
-  //     return '审批状态不合法'
-
-  //   else if (assignee !== username)
-  //     return '审批人不一致'
-  // }
-
   return null
 }
 
@@ -670,6 +653,13 @@ function singleApproval(row) {
 // 批量通过
 function batchApproval() {
   const items: any = getSelectItems()
+  const msg = validate(items)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+  console.log(items)
   const list: any = []
   items.forEach((item) => {
     list.push({
@@ -688,17 +678,19 @@ function batchApproval() {
     failCauseName: '',
     flowTaskInfoList: list,
   }
-  console.log(param)
-  reload()
-  checkedRowKeys.value = []
-  console.log(selectionIds.value)
-  // doAudit(param)
+
+  doAudit(param)
+}
+
+// 批量不通过
+function batchReject() {
+  const items: any = getSelectItems()
+  rejectHandler(items)
 }
 
 // 审核不通过
 function rejectHandler(list) {
   const msg = validate(list)
-
   if (msg !== null) {
     message.error(msg)
     return
@@ -710,6 +702,8 @@ function rejectHandler(list) {
 
 function reload() {
   selectionIds.value = []
+  checkedRowKeys.value = []
+
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
 }
@@ -766,13 +760,7 @@ function doAudit(param: any) {
           小结查重
         </NButton>
         <div class="batch">
-          <NButton text @click="setBatch(false)">
-            <template #icon>
-              <SvgIcon name="revoke" />
-            </template>
-            返回
-          </NButton>
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
           <SvgIcon size="24" name="vs" />
           <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
         </div>
@@ -822,7 +810,7 @@ function doAudit(param: any) {
       <SvgIcon
         style="cursor: pointer"
         size="18"
-        name="setting"
+        name="column"
         @click="showModal(customTabelRef)"
       />
     </div>
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index 68d0512..36ce636 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -19,7 +19,7 @@ defineProps({
     <tr>
       <th>图片名称</th>
       <td class="blue">
-        {{ data?.pictureInfo?.imgname }}
+        {{ data?.pictureInfo?.imgName }}
       </td>
       <th>图片格式</th>
       <td class="blue">

From ef6acbbafc9ea1852f66f5eb35636da2cb048519 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 08:58:24 +0800
Subject: [PATCH 25/26] =?UTF-8?q?fix:=202613=20=E4=B8=BB=E9=A1=B5=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=A2=99=E5=B1=95=E7=A4=BA=E6=8E=92=E5=BA=8F=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 52595ad..b3064fa 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -450,14 +450,14 @@ function cancel(val) {
               <SvgIcon class="gap" name="arrow-botton" size="14" />
             </div>
           </n-popselect>
-          <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('pictureResult')">
-            <span>相似度排序</span>
-            <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
-          </div>
           <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('fromuptime')">
             <span>时间排序</span>
             <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
           </div>
+          <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('pictureResult')">
+            <span>相似度排序</span>
+            <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+          </div>
         </div>
         <span style="font-size: 16px;color:#494949">共 <span style="color:#7899fd;font-weight: 500;">{{ totalCount
         }}</span> 项</span>

From b7284f3c6c70dcd82ae57a40ec2449ea1a4a8908 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 09:15:12 +0800
Subject: [PATCH 26/26] =?UTF-8?q?fix:=202798=20=E3=80=90=E5=9B=BE=E5=AE=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86=E3=80=91=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=89=B9=E6=8C=89=E9=92=AE=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=A4=8D=E9=80=89=E6=A1=86=E5=90=8E=E5=86=8D=E7=82=B9?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=BA=94=E8=AF=A5=E5=85=B3=E9=97=AD=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index dbee369..678d613 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -29,7 +29,11 @@ const totalCount = ref(0);
 let _imagesload: any;
 
 function setBatch(value: boolean) {
-  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;