From ed48e7d6f4b24967a353cf93f8249e354b48fd28 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 08:26:45 +0800
Subject: [PATCH] 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"