From 6af37bf71df3e38abd8d72b7fd7f86a0a8285e24 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 18:22:03 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E6=96=87=E5=AD=97=E5=A4=AA?=
 =?UTF-8?q?=E9=95=BF=E6=98=BE=E7=A4=BA=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 | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index acb324e..39d46f5 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -36,7 +36,7 @@ const popconfirmTarget: any = ref(null)
 const popconfirmRef: any = ref(null)
 
 function handleDismissTask() {
-  emit('dismisClick',  props.mouseOverTask.id)
+  emit('dismisClick', props.mouseOverTask.id)
   popconfirmRef.value[0]?.setShow(false); // 关闭 popconfirm
 }
 
@@ -69,21 +69,21 @@ onMounted(async () => {
       </div>
       <ul v-else class="list-item-detail">
         <li v-if="item.id === 'statshisText'">
-          审批状态：<span class="list-item-status" :class="listItem.statshisText === '通过'
+          审批状态：<n-ellipsis style="max-width: 170px"><span class="list-item-status" :class="listItem.statshisText === '通过'
             ? 'list-item-success'
             : listItem.statshisText === '不通过'
               ? 'list-item-error'
               : 'list-item-watting'
             ">{{ listItem.statshisText }}</span>
-        </li>
+          </n-ellipsis></li>
         <li v-else-if="item.id === 'createdate'">
-          提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
+          提交时间：<n-ellipsis style="max-width: 170px">{{ listItem.createdate && format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
         </li>
         <li v-else-if="item.id === 'createTime'">
-          生成时间：{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
+          生成时间：<n-ellipsis style="max-width: 170px">{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
         </li>
         <li v-else class="ellipsis" v-if="listItem[item.id]">
-          <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}
+          <span class="label">{{ item.name }}：</span><n-ellipsis style="max-width: 170px">{{ listItem[item.id] }}</n-ellipsis>
         </li>
       </ul>
     </div>
@@ -185,6 +185,5 @@ onMounted(async () => {
     position: absolute;
     bottom: 0px;
   }
-}
-</style>
+}</style>
 ../types

From afc7b81d9925a952c1f41567bd8123dc34678396 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 18:30:30 +0800
Subject: [PATCH 02/11] =?UTF-8?q?fix:=202872=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=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E4=BB=BB=E5=8A=A1=E5=8C=85=E6=98=BE=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8E=EF=BC=8C=E5=B7=A6=E4=BE=A7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9C=AA=E5=B1=95=E7=A4=BA=E5=AF=B9=E5=BA=94=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
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 39d46f5..c6febe5 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -82,7 +82,7 @@ onMounted(async () => {
         <li v-else-if="item.id === 'createTime'">
           生成时间：<n-ellipsis style="max-width: 170px">{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
         </li>
-        <li v-else class="ellipsis" v-if="listItem[item.id]">
+        <li v-else class="ellipsis">
           <span class="label">{{ item.name }}：</span><n-ellipsis style="max-width: 170px">{{ listItem[item.id] }}</n-ellipsis>
         </li>
       </ul>

From 8507763b45720397e960923959cae6d72b87ebd9 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 18:32:58 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E5=B0=8F=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/final/index.ts                        |  38 +-
 src/views/final/comp/RepeatModal.vue          |  11 +-
 src/views/final/comp/RepeatTaskTableModal.vue | 416 ++++++++++++------
 src/views/final/content/Content.vue           |  52 ++-
 4 files changed, 357 insertions(+), 160 deletions(-)

diff --git a/src/api/final/index.ts b/src/api/final/index.ts
index e7249f8..10d4f30 100644
--- a/src/api/final/index.ts
+++ b/src/api/final/index.ts
@@ -30,11 +30,11 @@ export async function getFinalList(params: FinalParam) {
     params: notEmptyParams,
   })
 
-  const { data: { list, totalPage,totalCount } } = res
+  const { data: { list, totalPage, totalCount } } = res
   return {
     pageCount: totalPage,
     data: list,
-    totalCount
+    totalCount,
   }
 }
 
@@ -62,3 +62,37 @@ export async function repetitionTask() {
     method: 'get',
   })
 }
+
+/**
+ * 获取审核列表
+ * @returns
+ */
+export async function getRepeatList(params: FinalParam) {
+  const notEmptyParams = pickBy(params, notEmpty)
+
+  Object.keys(notEmptyParams).forEach((key) => {
+    const val = notEmptyParams[key]
+
+    if (key === 'izuptime') {
+      const start = formatToDate2(val[0])
+      const end = formatToDate2(val[1])
+      notEmptyParams[key] = `${start}-${end}`
+    }
+
+    if (Array.isArray(notEmptyParams[key]))
+      notEmptyParams[key] = val.join(',')
+  })
+
+  const res = await http.request({
+    url: `/flow/task/repetitionTaskList`,
+    method: 'get',
+    params: notEmptyParams,
+  })
+
+  const { data: { list, totalPage, totalCount } } = res
+  return {
+    pageCount: totalPage,
+    data: list,
+    totalCount,
+  }
+}
diff --git a/src/views/final/comp/RepeatModal.vue b/src/views/final/comp/RepeatModal.vue
index 8ae0db5..d0ed920 100644
--- a/src/views/final/comp/RepeatModal.vue
+++ b/src/views/final/comp/RepeatModal.vue
@@ -22,6 +22,7 @@ const { detail, total } = toRefs(state)
 const show = ref(false)
 
 function showModal(id) {
+  state.total = 0
   getDetail(id)
 }
 
@@ -45,7 +46,13 @@ function closeModal() {
 }
 
 async function reject() {
-  emit('reject', { a: 'todo' })
+  const list = []
+  state.detail.forEach((items) => {
+    items.repeatedTaskList.forEach((item) => {
+      list.push(item)
+    })
+  })
+  emit('reject', list)
   closeModal()
 }
 
@@ -157,7 +164,7 @@ defineExpose({
     border-radius: 8px;
     padding: 16px;
     padding-top: 0;
-    margin: 45px 12px 35px 38px;
+    margin: 25px 12px 35px 38px;
 
     .imgwrapper {
       width: 160px;
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index d0f6d99..0b62d37 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -1,101 +1,156 @@
 <script lang="ts" setup>
-import { computed, h, reactive, ref, unref } from "vue";
-import { NDataTable, useDialog } from "naive-ui";
-import type { DataTableColumns, DataTableRowKey } from "naive-ui";
-import Action from "../comp/Action.vue";
-import { RejectModal } from "./index";
-import type { RowData } from "@/config/final";
-import { getFinalList } from "@/api/final";
-import type { ApprovalParam } from "/#/api";
-import { audit } from "@/api/task/task";
+import {
+  computed,
+  defineEmits,
+  h,
+  nextTick,
+  onBeforeMount,
+  onMounted,
+  onUnmounted,
+  reactive,
+  ref,
+  unref,
+  watch,
+} from 'vue'
+import { NDataTable, useDialog, useMessage } from 'naive-ui'
+import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
+import {
+  ListAction,
+  StatusItem,
+} from '../comp'
+import { RejectModal } from './index'
+import { useDictionary } from '@/store/modules/dictonary'
+import type { RowData } from '@/config/final'
+import { getFinalList, getRepeatList } from '@/api/final'
+import { formatToDateHMS } from '@/utils/dateUtil'
+import { audit } from '@/api/task/task'
+import NotPassed from '@/components/Approval/NotPassed.vue'
 
 const emit = defineEmits<{
-  (e: "commit", columns: any[]);
-}>();
-
-const show = ref(false);
+  (e: 'commit', columns: any[])
+}>()
+const dicStore = useDictionary()
+const message = useMessage()
+const show = ref(false)
+const izstatusList = ref([])
+const dialog = useDialog()
+const checkedRowKeys = ref([])
+
+onBeforeMount(() => {
+  dicStore.fetchizstatusListt()
+})
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  e.preventDefault();
-  closeModal();
+  e.preventDefault()
+  closeModal()
 }
 
 defineExpose({
   showModal,
-});
+})
 
 const columns: DataTableColumns<RowData> = [
   {
-    type: "selection",
-    fixed: "left",
+    type: 'selection',
+    fixed: 'left',
     width: 50,
+    disabled(row: any) {
+      return row.states !== 2
+    },
   },
   {
-    title: "任务Id",
-    key: "id",
-    fixed: "left",
-    width: 100,
+    title: '任务Id',
+    key: 'id',
+    fixed: 'left',
+    width: 180,
+    ellipsis: {
+      tooltip: true,
+    },
   },
   {
-    title: "任务名称",
-    key: "fromtaskname",
-    fixed: "left",
-    width: 200,
+    title: '任务名称',
+    key: 'fromtaskname',
+    fixed: 'left',
+    width: 150,
+    ellipsis: {
+      tooltip: true,
+    },
   },
   {
-    title: "审批节点",
-    key: "approvalnode",
+    title: '审批节点',
+    key: 'approvalnode',
     width: 100,
   },
   {
-    title: "审批状态",
-    key: "states",
-    width: 100,
+    title: '审批状态',
+    key: 'states',
+    width: 120,
+    render(row) {
+      const item: any = izstatusList.value.find(
+        (item: any) => item.value == row.states,
+      )
+      return h(StatusItem, {
+        id: row.id,
+        status: row.states,
+        label: item ? item.label : '',
+      })
+    },
   },
   {
-    title: "图片相似度",
-    key: "similarity",
+    title: '图片相似度',
+    key: 'similarityscore',
     width: 100,
+    render(row: any) {
+      return h('div', {
+        id: row.id,
+        style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
+      }, { default: () => row.similarityscore ? `${row.similarityscore}%` : '' })
+    },
   },
   {
-    title: "提报时间",
-    key: "fromuptime",
+    title: '提报时间',
+    key: 'fromuptime',
     width: 200,
+    render(row: any) {
+      return formatToDateHMS(row.createdate || 0)
+    },
   },
   {
-    title: "更新时间",
-    key: "updatetime",
+    title: '更新时间',
+    key: 'updatetime',
     width: 200,
   },
   {
-    title: "操作",
-    key: "actions",
+    title: '操作',
+    key: 'actions',
     width: 200,
-    fixed: "right",
+    fixed: 'right',
     render(row) {
-      return h(Action, {
+      return h(ListAction, {
         id: row.id,
         status: row.states,
-        trigger: actionHandler,
-      });
+        trigger: (action) => {
+          actionHandler(action, row)
+        },
+      })
     },
   },
-];
-
-const rejectModalRef = ref(null);
-const columnsRef = ref(columns);
-const tableRef = ref<InstanceType<typeof NDataTable>>();
-const rowKey = (row: RowData) => row.id;
-const loading = ref(true);
-const total = ref(0);
+]
+const notPassModalRef = ref(null) // 不通过弹窗
+const rejectModalRef = ref(null)
+const columnsRef = ref(columns)
+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,
@@ -103,136 +158,211 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: "10 每页",
+      label: '10 每页',
       value: 10,
     },
     {
-      label: "15 每页",
+      label: '15 每页',
       value: 15,
     },
     {
-      label: "30 每页",
+      label: '30 每页',
       value: 30,
     },
     {
-      label: "50 每页",
+      label: '50 每页',
       value: 50,
     },
   ],
   showQuickJumper: true,
-  prefix:()=>`共 ${total.value} 条数据`
-});
-const tableData = ref<Array<RowData>>([]);
-const selectionIds = ref<DataTableRowKey[]>([]);
+  prefix: () => `共 ${total.value} 条数据`,
+})
+const tableData = ref<Array<RowData>>([])
+const selectionIds = ref<DataTableRowKey[]>([])
 
-const deviceHeight = ref(600);
+const deviceHeight = ref(500)
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
-});
+  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
+})
 
 async function query(page: number, pageSize: number) {
-  const result = await getFinalList({
-    sortorder: "asc",
-    pageSize: 10,
+  const result = await getRepeatList({
+    sortorder: 'asc',
+    pageSize: pagination.pageSize,
     currPage: 1,
-    sortname: "",
-  });
-  const { data, pageCount,totalCount } = result;
-  total.value = totalCount;
-  tableData.value = data;
-  pagination.page = page;
-  pagination.pageCount = pageCount;
-  loading.value = false;
+    sortname: '',
+  })
+  console.log(666666)
+  console.log(result)
+
+  const { data, pageCount, totalCount } = result
+  total.value = totalCount
+  tableData.value = data
+  pagination.page = page
+  pagination.pageCount = pageCount
+  loading.value = false
 }
 
+watch(
+  () => dicStore.izstatusList,
+  (newval) => {
+    izstatusList.value = newval
+  },
+)
+
 async function handlePageChange(currentPage) {
-  if (loading.value) return;
-  pagination.page = currentPage;
-  const { pageSize } = pagination;
-  await query(currentPage, pageSize);
+  if (loading.value)
+    return
+  pagination.page = currentPage
+  const { pageSize } = pagination
+  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
 }
 
-function actionHandler(action: any) {
-  const { key } = action;
+function validate(items: any[]) {
+  if (items.length === 0)
+    return '至少选中一个任务'
+  return null
+}
+
+function actionHandler(action: any, row: any) {
+  const { key } = action
   switch (key) {
-    case "view":
-      break;
-    case "reset":
-      resetHandler();
-      break;
-    case "approval":
-      approvalHandler();
-      break;
-    case "reject":
-      (rejectModalRef.value as any).showModal();
-      break;
+    case 'view':
+      break
+    case 'reset':
+      // resetHandler()
+      break
+    case 'approval':
+      singleApproval(row)
+      break
+    case 'reject':
+      rejectHandler([row])
+      break
     default:
-      break;
+      break
   }
 }
 
-const dialog = useDialog();
+function getSelectItems() {
+  return tableData.value.filter(item => selectionIds.value.includes(item.id))
+}
 
-function resetHandler() {
-  dialog.info({
-    title: "确认提示",
-    content: "确认重置当前选中的任务的审批吗?",
-    positiveText: "确定",
-    negativeText: "取消",
-    onPositiveClick: async () => {
-      // TODO：需要支持重置
-      // const result = await resetApproval()
-    },
-    onNegativeClick: () => {},
-  });
+// 单个审批通过
+function singleApproval(row) {
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: [
+      {
+        formId: row.id,
+        taskId: row.taskId,
+        taskName: row.fromTaskName,
+      },
+    ],
+  }
+  doAudit(param)
 }
 
-function approvalHandler() {
+// 批量通过
+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({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromtaskname,
+    })
+  })
+
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
+  }
+
+  doAudit(param)
+}
+
+// 批量不通过
+function batchReject() {
+  const items: any = getSelectItems()
+  rejectHandler(items)
+}
+
+// 审核通过
+function doAudit(param: any) {
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      // TODO：调用批量审批接口
+      audit(param).then((res) => {
+        const { code } = res
+        if (code === 'OK') {
+          message.success('审核成功')
+          reload()
+        }
+        else { message.error(res.message) }
+      })
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
-function rejectHandler(idOrDesc: string, isOther: boolean) {
-  // TODO:实现批量拒绝
-  // const param: ApprovalParam = {
-  //   formid: '',
-  //   taskId: '',
-  //   approvd: false,
-  //   taskComment: '',
-  // }
-  // if (isOther)
-  //   param.taskComment = idOrDesc
-  // else
-  //   param.taskComment = idOrDesc
-  // audit(param)
+// 审核不通过
+function rejectHandler(list) {
+  const msg = validate(list)
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal(list)
 }
+query(pagination.page, pagination.pageSize)
 
-query(pagination.page, pagination.pageSize);
+function reload() {
+  selectionIds.value = []
+  checkedRowKeys.value = []
+}
 </script>
 
 <template>
   <div>
+    <NotPassed ref="notPassModalRef" @success="reload" />
+
     <n-modal v-model:show="show" transform-origin="center">
       <n-card
         class="cardstyle"
@@ -248,9 +378,15 @@ query(pagination.page, pagination.pageSize);
               <span :style="{ 'margin-left': '18px' }">任务信息</span>
             </div>
           </div>
+          <div class="batch">
+            <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>
           <div class="wrapper-content">
             <NDataTable
               ref="tableRef"
+              v-model:checked-row-keys="checkedRowKeys"
               remote
               :columns="columnsRef"
               :scroll-x="1250"
@@ -267,7 +403,9 @@ query(pagination.page, pagination.pageSize);
         </div>
         <template #footer>
           <div class="wrapper-footer">
-            <n-button type="info" @click="handleSumbit"> 确认 </n-button>
+            <n-button type="info" @click="handleSumbit">
+              确认
+            </n-button>
             <n-button secondary style="margin-left: 15px" @click="closeModal">
               取消
             </n-button>
@@ -280,6 +418,18 @@ query(pagination.page, pagination.pageSize);
 </template>
 
 <style lang="less" scoped>
+.batch {
+  display: flex;
+  align-items: center;
+  margin-top: 27px;
+
+  .btn-approval{
+    width: 68px;
+    height: 28px;
+    cursor: pointer;
+  }
+
+}
 .wrapper {
   display: flex;
   flex-direction: column;
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index c6a36dc..cd56c0c 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -505,7 +505,7 @@ query(pagination.page, pagination.pageSize)
 
 const customTabelRef = ref(null)
 const importExcelRef = ref(null)
-const notPassModalRef = ref(null) // 不通过
+const notPassModalRef = ref(null) // 不通过弹窗
 const repeatModalRef = ref(null)
 const repeatTaskTableModalRef = ref(null)
 
@@ -682,6 +682,12 @@ function batchApproval() {
   doAudit(param)
 }
 
+// 小结批量不通过
+function repeatBatchReject(items) {
+  console.log(items)
+  rejectHandler(items)
+}
+
 // 批量不通过
 function batchReject() {
   const items: any = getSelectItems()
@@ -700,6 +706,27 @@ function rejectHandler(list) {
   modal.showModal(list)
 }
 
+// 审核通过
+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: () => {},
+  })
+}
+
 function reload() {
   selectionIds.value = []
   checkedRowKeys.value = []
@@ -725,27 +752,6 @@ 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>
@@ -842,7 +848,7 @@ function doAudit(param: any) {
 
     <RepeatModal
       ref="repeatModalRef"
-      @reject="showModal(notPassModalRef)"
+      @reject="repeatBatchReject"
       @viewrepeat="showModal(repeatTaskTableModalRef)"
     />
     <RepeatTaskTableModal ref="repeatTaskTableModalRef" />

From 712580631a48c93b931aede47198573757ecad15 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 18:54:27 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=A2=9E=E5=8A=A0=E6=B2=89=E6=B5=B8=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 7b4e457..e0c9fe3 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -77,6 +77,17 @@ const taskDetailPictureList = ref<any[]>([])
 const userStore = useUser()
 const imageRef = ref<ComponentElRef | null>()
 let processItems: any[] = []
+const isFullScreen = ref(false);
+
+const fullscreenStyles = computed<any>(() => ({
+  'width': isFullScreen.value ? '100vw' : '',
+  'height': isFullScreen.value ? '100vh' : '',
+  'position': isFullScreen.value ? 'fixed' : '',
+  'top': isFullScreen.value ? '0' : '',
+  'left': isFullScreen.value ? '0' : '',
+  'zIndex': isFullScreen.value ? '9999' : '',
+}));
+
 
 onMounted(() => {
   window.addEventListener('keydown', handleKeydown)
@@ -299,9 +310,13 @@ onUnmounted(() => {
 })
 
 function immersionHandler() {
-  taskStore.updateImmersion()
+  // taskStore.updateImmersion()
+  toggleFullScreen();
 }
-
+// 切换全屏状态
+const toggleFullScreen = () => {
+  isFullScreen.value = !isFullScreen.value;
+};
 function previewHandler(event: MouseEvent) {
   event.stopImmediatePropagation()
   event.stopPropagation()
@@ -342,7 +357,7 @@ function reloadList(param, text) {
 </script>
 
 <template>
-  <div class="wrapper">
+  <div class="wrapper fullscreen-container" :style="fullscreenStyles">
     <div class="wrapper-header">
       <div class="left">
         <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
@@ -381,7 +396,8 @@ function reloadList(param, text) {
             </ul>
           </n-popover> -->
           <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>
         <div v-show="showActions" class="batch">
@@ -607,6 +623,12 @@ function reloadList(param, text) {
 </template>
 
 <style lang="less" scoped>
+.fullscreen-container {
+  /* 可添加其他样式 */
+  width: 100vw;
+  height: 100vh;
+  margin: 0px !important;
+}
 ::v-deep(.n-tabs-tab__label) {
   font-size: 14px;
   font-family: PingFang SC, PingFang SC-Regular;

From 8281a4719d70ad591c9220a02860a71252238033 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 22:42:23 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E7=BB=88=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  8 +++++++
 src/api/final/index.ts                        | 21 +++----------------
 src/views/final/comp/RepeatTaskTableModal.vue | 21 ++++++++++---------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 94c93f7..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,8 +21,11 @@ declare module 'vue' {
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
+    NEllipsis: typeof import('naive-ui')['NEllipsis']
+    NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
+    NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -31,6 +34,7 @@ declare module 'vue' {
     NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
+    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
     NProgress: typeof import('naive-ui')['NProgress']
@@ -40,7 +44,11 @@ declare module 'vue' {
     NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
+    NTabPane: typeof import('naive-ui')['NTabPane']
+    NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
+    NTimeline: typeof import('naive-ui')['NTimeline']
+    NTimelineItem: typeof import('naive-ui')['NTimelineItem']
     NTooltip: typeof import('naive-ui')['NTooltip']
     NUpload: typeof import('naive-ui')['NUpload']
     NUploadDragger: typeof import('naive-ui')['NUploadDragger']
diff --git a/src/api/final/index.ts b/src/api/final/index.ts
index 10d4f30..fab2e62 100644
--- a/src/api/final/index.ts
+++ b/src/api/final/index.ts
@@ -68,31 +68,16 @@ export async function repetitionTask() {
  * @returns
  */
 export async function getRepeatList(params: FinalParam) {
-  const notEmptyParams = pickBy(params, notEmpty)
-
-  Object.keys(notEmptyParams).forEach((key) => {
-    const val = notEmptyParams[key]
-
-    if (key === 'izuptime') {
-      const start = formatToDate2(val[0])
-      const end = formatToDate2(val[1])
-      notEmptyParams[key] = `${start}-${end}`
-    }
-
-    if (Array.isArray(notEmptyParams[key]))
-      notEmptyParams[key] = val.join(',')
-  })
-
   const res = await http.request({
     url: `/flow/task/repetitionTaskList`,
     method: 'get',
-    params: notEmptyParams,
+    params,
   })
 
-  const { data: { list, totalPage, totalCount } } = res
+  const { data: { records, totalPage, totalCount } } = res
   return {
     pageCount: totalPage,
-    data: list,
+    data: records,
     totalCount,
   }
 }
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 0b62d37..00947ed 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -40,10 +40,6 @@ onBeforeMount(() => {
   dicStore.fetchizstatusListt()
 })
 
-function showModal() {
-  show.value = true
-}
-
 function closeModal() {
   show.value = false
 }
@@ -53,10 +49,6 @@ async function handleSumbit(e: MouseEvent) {
   closeModal()
 }
 
-defineExpose({
-  showModal,
-})
-
 const columns: DataTableColumns<RowData> = [
   {
     type: 'selection',
@@ -190,7 +182,7 @@ async function query(page: number, pageSize: number) {
   const result = await getRepeatList({
     sortorder: 'asc',
     pageSize: pagination.pageSize,
-    currPage: 1,
+    pageNo: 1,
     sortname: '',
   })
   console.log(666666)
@@ -351,12 +343,21 @@ function rejectHandler(list) {
   const modal = unref(notPassModalRef)! as any
   modal.showModal(list)
 }
-query(pagination.page, pagination.pageSize)
+// query(pagination.page, pagination.pageSize)
+function showModal() {
+  query(pagination.page, pagination.pageSize)
+
+  show.value = true
+}
 
 function reload() {
   selectionIds.value = []
   checkedRowKeys.value = []
 }
+
+defineExpose({
+  showModal,
+})
 </script>
 
 <template>

From ceb024784be107bd51cff0332862805085b224af Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:12:11 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=BB=84=E4=BB=B6props=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=AD=9B=E9=80=89=E5=80=BC=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/aside.ts                           |   2 +-
 src/config/final.ts                           |  89 ++++
 .../home/aside/comp/modals/FilterModal.vue    |  15 +-
 .../home/aside/comp/modals/NewFilterModal.vue |   2 +
 src/views/task/aside/Aside.vue                |  21 +-
 src/views/task/modal/CustomFieldModal.vue     |  19 +-
 src/views/task/modal/NewFilterModal.vue       | 380 ++++++++++++++++++
 7 files changed, 507 insertions(+), 21 deletions(-)
 create mode 100644 src/views/task/modal/NewFilterModal.vue

diff --git a/src/config/aside.ts b/src/config/aside.ts
index 5ba3b4d..7b6b5b7 100644
--- a/src/config/aside.ts
+++ b/src/config/aside.ts
@@ -8,7 +8,7 @@ export interface AsideEntity {
   inFilterList?: boolean// 是否出现在过滤配置选项中(这个名字不好，为false代表只用于客户端的显示配置，不作为参数传递给服务器端)
   render?: boolean// 是否作为单独组件渲染
   key: string
-  component: Component
+  component?: Component
 }
 
 // 客户端配置
diff --git a/src/config/final.ts b/src/config/final.ts
index 17fe255..d9b2970 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -129,3 +129,92 @@ export const asideMap: Recordable<AsideEntity> = {
     inFilterList: false,
   },
 }
+
+
+// 审批添加筛选配置 (左侧)
+export const asideTaskMap: Recordable<AsideEntity> = {
+  izstatus: {
+    label: '审批状态',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izstatus'
+  },
+  izuptime: {
+    label: '提报时间',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izuptime'
+  },
+  izupuser: {
+    label: '提报人',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izupuser'
+  },
+  izprojecttype: {
+    label: '任务类型',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izprojecttype'
+  },
+  iztaskrrom: {
+    label: '任务来源',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'iztaskrrom'
+  },
+  izcustomname: {
+    label: '拜访客户',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izcustomname'
+  },
+  izcustomtype: {
+    label: '客户类型',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izcustomtype'
+  },
+  izproject: {
+    label: '所属项目',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izproject'
+  },
+  izvisitpro: {
+    label: '拜访省份/直辖市',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izvisitpro'
+  },
+  izcustomlevel: {
+    label: '客户级别',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izcustomlevel'
+  },
+  izprojecttype: {
+    label: '项目类别',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izprojecttype'
+  },
+  izproductname: {
+    label: '产品名称',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izproductname'
+  },
+  izvisitcity: {
+    label: '拜访城市',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izvisitcity'
+  },
+  izfirm: {
+    label: '厂商',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izfirm'
+  }
+}
\ No newline at end of file
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index f119d1f..d12ad9a 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -20,6 +20,13 @@ import type { FilterSearchParam } from "/#/api";
 
 defineOptions({ name: "FilterModal" });
 
+const props = defineProps({
+  type: {
+    type: Number,
+    default: () => 0,
+  },
+});
+
 const emit = defineEmits<{
   (e: "showNewFilter"): void;
   (e: "editFilter", filter: any): void;
@@ -56,7 +63,9 @@ const sortData = (row) => {
         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));
+    tableData.value.sort(
+      (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
+    );
   }
 };
 
@@ -142,7 +151,7 @@ async function query(page: number, pageSize: number) {
   const searchParam: FilterSearchParam = {
     search_searchname: { value: keyword.value, op: "like", type: "string" },
   };
-  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 0);
+  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, props.type);
   const { data, pageCount, total: totalCount } = result;
   tableData.value = data;
   pagination.page = page;
@@ -440,7 +449,7 @@ const inputHandler = debounce((word) => {
     }
   }
 }
-::v-deep(.n-data-table .n-data-table-th){
+::v-deep(.n-data-table .n-data-table-th) {
   font-weight: bold !important;
 }
 </style>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 4793d0d..7b1212e 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -210,6 +210,8 @@ watch(() => dicStore.relationTypeList, (newval) => {
 })
 
 function showModal() {
+  const list = generateAllData(configStore.systemConfig)
+  typeOptions.value = list
   show.value = true
 }
 
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 17d1790..8212a5a 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -1,21 +1,19 @@
 <script lang="ts" setup>
 import { debounce } from 'lodash-es'
-import { computed, inject, onMounted, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, onBeforeMount, onMounted, ref, shallowRef, unref, watch } from 'vue'
 import CustomFieldModal from '../modal/CustomFieldModal.vue'
 import AdvanceFilter from '../../home/aside/comp/AdvanceFilter.vue'
 import {
   FilterModalVue,
-  NewFilterModalVue,
 } from '../../home/aside/comp/modals'
+import NewFilterModalVue from '../modal/NewFilterModal.vue'
 import TaskList from './TaskList.vue'
 import type { AsideEntity } from '@/config/aside'
-
 import { useUser } from '@/store/modules/user'
 import { getAllfieldList, getfieldList } from '@/api/home/filter'
-
 import { useTaskStore } from '@/store/modules/task'
-
 import emitter from '@/utils/mitt'
+import { useConfig } from '@/store/modules/asideConfig'
 
 const CustomFieldModalRef = ref(null)
 const collapse = ref(false)
@@ -87,8 +85,8 @@ async function getshowFieldList() {
    * fix 是否默认
    * checked 是否选中
    */
-  if (useList.userFieldFixed) {
-    useList.userFieldFixed?.split(',').map((v) => {
+  if (useList?.userFieldFixed) {
+    useList?.userFieldFixed?.split(',').map((v) => {
       let item = allList.find(v2 => v2.name == v)
       if (item) {
         item = {
@@ -103,7 +101,7 @@ async function getshowFieldList() {
   }
   else {
     // 若为首次获取 则赋默认值
-    allList.map((v) => {
+    allList?.map((v) => {
       if (v.isrequired == 2) {
         const item = {
           name: v.fieldDesc,
@@ -144,7 +142,11 @@ function editFilter(filter: any) {
   modal.showModal()
   modal.edit(filter)
 }
-
+const configStore = useConfig()
+onBeforeMount(async () => {
+  configStore.fetchConfig()
+  configStore.fetchCustomConfig()
+})
 function setAsideItemName(text) {
   taskListRef.value.setStatusName(text)
 }
@@ -231,6 +233,7 @@ defineExpose({
       ref="filterModalRef"
       @edit-filter="editFilter"
       @show-new-filter="showModal(newFilterModalRef)"
+      :type="2"
     />
     <!-- 新增过滤 -->
     <NewFilterModalVue ref="newFilterModalRef" />
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index e92f8a0..3bb4fd0 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -94,14 +94,14 @@ function generateDefaultList() {
 }
 
 const show = ref(false);
-const checkAll = computed(()=>{
+const checkAll = computed(() => {
   let baseNum = 0;
   offList.value.map((v) => {
     if (v.fix) {
       baseNum += 1;
     }
   });
-  return onList.value.length == offList.value.length-baseNum
+  return onList.value.length == offList.value.length - baseNum;
 });
 
 function showModal() {
@@ -274,11 +274,11 @@ const getData = async (type = "") => {
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  const userFieldFixed = useList?.userFieldFixed?.split(",");
+  const userFieldUnFixed = useList?.userFieldUnFixed?.split(",");
   if (!type || type == "off") {
     offList.value = [];
-    allList.map((v) => {
+    allList?.map((v) => {
       let item = {
         name: v.fieldDesc,
         id: v.name,
@@ -297,7 +297,7 @@ const getData = async (type = "") => {
     offList.value.unshift(...fixList.value);
   }
   if (!type || type == "on") {
-    useList.userFieldFixed?.split(",").map((v) => {
+    useList?.userFieldFixed?.split(",").map((v) => {
       let item = allList.find((v2) => v2.name == v);
       if (item) {
         item = {
@@ -327,7 +327,10 @@ const indeterminate = computed(() => {
       baseNum += 1;
     }
   });
-  return onShowList.value.length > 0 && offShowList.value.length - baseNum > onShowList.value.length;
+  return (
+    onShowList.value.length > 0 &&
+    offShowList.value.length - baseNum > onShowList.value.length
+  );
 });
 const queryData = (value, type) => {
   if (value) {
@@ -433,7 +436,7 @@ const queryData = (value, type) => {
                   </template>
                 </n-input>
                 <div class="draggable-title">系统默认</div>
-                <div class="draggable-ul" style="border-bottom:none">
+                <div class="draggable-ul" style="border-bottom: none">
                   <div
                     v-for="item in fixShowList"
                     :key="item.id"
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
new file mode 100644
index 0000000..d6e8cf2
--- /dev/null
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -0,0 +1,380 @@
+<script lang="ts" setup>
+import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
+import { computed, onBeforeMount, reactive, ref, unref, watch } from 'vue'
+import { asideTaskMap as asideMap } from '@/config/final'
+import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
+import type { FilterCondition } from '/#/api'
+import { addCondition, updateCondition } from '@/api/home/filter'
+import { formatToDate2, formatToDate3 } from '@/utils/dateUtil'
+
+type Status = 'edit' | 'new'
+
+const show = ref(false)
+const configStore = useConfig()
+const dicStore = useDictionary()
+const currentStatus = ref<Status>('new')
+let currentEditId: string | null = null
+
+const modalTitle = computed(() => {
+  return currentStatus.value === 'new' ? '新建过滤条件' : '编辑过滤条件'
+})
+
+const cardStyle = {
+  'width': '800px',
+  '--n-padding-bottom': '10px',
+  '--n-padding-left': '10px',
+}
+
+const noBorderInput = {
+  '--n-border': '0px',
+  '--n-border-hover': '0px',
+  '--n-border-pressed': '0px',
+}
+
+const formItemStyle = {
+  '--n-label-height': '0px',
+  '--n-feedback-height': '8px',
+}
+
+interface FormType {
+  name: string | null
+  logic: string | null
+  conditions: Condition[]
+}
+
+interface Condition {
+  type: string | null
+  operator: string | null
+  result: any
+}
+
+interface Option {
+  label: string
+  value: string
+}
+
+const rules: FormRules = {
+  name: {
+    required: true,
+    message: '请输入过滤条件名称',
+    trigger: 'blur',
+  },
+  logic: {
+    required: true,
+    message: '请选择逻辑关系',
+    trigger: 'blur',
+  },
+  conditions: {
+    required: true,
+    validator(rule: FormItemRule, value: Condition[]) {
+      for (const item of value) {
+        const { type, operator, result } = item
+
+        if (type === null || operator === null || result === null)
+          return new Error('请选择过滤条件')
+      }
+      return true
+    },
+    trigger: ['input', 'blur'],
+  },
+}
+
+const formRef = ref<FormInst | null>(null)
+
+const formValue = reactive<FormType>({
+  name: null,
+  logic: 'where',
+  conditions: [{
+    type: null,
+    operator: 'eq',
+    result: null,
+  }],
+})
+
+function handleSumbit(e: MouseEvent) {
+  e.preventDefault()
+  formRef.value?.validate((errors) => {
+    if (errors)
+      return
+
+    const list = formValue.conditions.map((item, index) => {
+      const { type, operator, result } = item
+
+      return {
+        searchfield: type!,
+        searchtype: operator!,
+        searchvalue: formatValue(type!, result),
+        searchRelationType: formValue.logic!,
+        orderNum: index + 1,
+      }
+    })
+
+    const param: FilterCondition = {
+      searchname: formValue.name!,
+      type: 1,
+      ocrUsersearchchildList: list,
+    }
+
+    if (currentStatus.value === 'new')
+      addCondition(param)
+    else
+      updateCondition({ id: currentEditId!, ...param })
+    closeModal()
+  })
+}
+
+function formatValue(searchfield: string, searchvalue: any) {
+  if (searchfield === 'izuptime') {
+    const start = formatToDate2(searchvalue[0])
+    const end = formatToDate2(searchvalue[1])
+    return `${start}-${end}`
+  }
+
+  return searchvalue
+}
+
+// 编辑前前转换为服务端格式
+function unformatValue(searchfield: string, searchvalue: any) {
+  // 2022/01/03-2023/02/04
+  if (searchfield === 'izuptime') {
+    const dataStrs = searchvalue.split('-')
+    const start = formatToDate3(dataStrs[0])
+    const end = formatToDate3(dataStrs[1])
+    return [start, end]
+  }
+
+  return searchvalue
+}
+
+function createCondition() {
+  formValue.conditions.push({
+    type: null,
+    operator: 'eq',
+    result: null,
+  })
+}
+
+function removeCondition(index: number) {
+  formValue.conditions.splice(index, 1)
+}
+
+function formLabel(index: number) {
+  return index === 0 ? '筛选条件' : ''
+}
+
+const typeOptions = ref<Option[]>([])
+
+const operatorOptions = [
+  {
+    label: '等于',
+    value: 'eq',
+  },
+  {
+    label: '不等于',
+    value: 'notEq',
+  },
+]
+
+const logicOptions = ref([])
+
+onBeforeMount(() => {
+  dicStore.fetchRelationTypeList()
+})
+
+watch(() => dicStore.relationTypeList, (newval) => {
+  logicOptions.value = newval
+})
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal() {
+  show.value = false
+}
+
+function generateAllData(): Option[] {
+  const initVal: Option[] = []
+  const list = Object.keys(asideMap).reduce((acc, value) => {
+    if (value.startsWith('iz') && asideMap[value]?.inFilterList !== false) {
+      const name = asideMap[value]?.label
+
+      name && acc.push({
+        value,
+        label: name || '未配置',
+      })
+    }
+    return acc
+  }, initVal)
+
+  return list
+}
+
+typeOptions.value = generateAllData()
+
+function getOptions(key: string) {
+  const getterName = `get${key}`
+  const options = unref(dicStore[getterName])
+  return options || []
+}
+
+function leaveHandler() {
+  currentStatus.value = 'new'
+  currentEditId = null
+
+  formValue.name = null
+  formValue.conditions = [
+    {
+      type: null,
+      operator: 'eq',
+      result: null,
+    },
+  ]
+}
+
+function edit(editFilter: any) {
+  currentStatus.value = 'edit'
+
+  const { searchname, ocrUsersearchchildList, id } = editFilter
+  currentEditId = id
+  formValue.name = searchname
+  formValue.conditions = ocrUsersearchchildList.map((item) => {
+    return {
+      type: item.searchfield,
+      operator: item.searchtype,
+      result: unformatValue(item.searchfield, item.searchvalue),
+    }
+  })
+}
+
+defineExpose({
+  showModal,
+  edit,
+})
+</script>
+
+<template>
+  <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler">
+    <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+      <div class="wrapper">
+        <span class="wrapper-title">{{ modalTitle }}</span>
+        <div class="wrapper-bar">
+          <div class="wrapper-info">
+            <span :style="{ 'margin-left': '18px' }">基本信息</span>
+          </div>
+        </div>
+        <div class="wrapper-form">
+          <n-form ref="formRef" :model="formValue" :rules="rules">
+            <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="逻辑关系" v-show="false">
+              <n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
+            </n-form-item>
+            <n-form-item
+              v-for="(item, index) in formValue.conditions" :key="index" :style="formItemStyle"
+              path="conditions" :label="formLabel(index)"
+            >
+              <n-select filterable
+                v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
+              />
+              <n-select filterable
+                v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
+                :options="operatorOptions"
+              />
+              <n-space v-if="item.type === 'izuptime'">
+                <n-date-picker
+                  v-model:value="item.result" style="margin-left: 8px;width: 240px;" type="daterange"
+                  clearable
+                />
+              </n-space>
+              <n-select filterable
+                v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择" :options="getOptions(item.type!)"
+              />
+              <n-button :style="noBorderInput" icon-placement="right" @click="removeCondition(index)">
+                <template #icon>
+                  <SvgIcon size="24" name="close" />
+                </template>
+              </n-button>
+            </n-form-item>
+          </n-form>
+        </div>
+        <div class="wrapper-new" @click="createCondition">
+          <span>+</span>
+          <span style="margin-left:8px">添加筛选条件</span>
+        </div>
+      </div>
+      <template #footer>
+        <div class="wrapper-footer">
+          <n-button type="info" @click="handleSumbit">
+            保存
+          </n-button>
+          <n-button secondary style="margin-left:15px" @click="closeModal">
+            取消
+          </n-button>
+        </div>
+      </template>
+    </n-card>
+  </n-modal>
+</template>
+
+<style lang="less" scoped>
+.wrapper {
+  display: flex;
+  flex-direction: column;
+
+  &-title {
+    font-weight: bold;
+    font-size: 16px;
+  }
+
+  &-bar {
+    background-color: #e8e8e8;
+    width: 100%;
+    margin-top: 20px;
+  }
+
+  &-form {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20px;
+  }
+
+  &-new {
+    display: flex;
+    width: 110px;
+    color: #507afd;
+    line-height: 22px;
+    cursor: pointer;
+
+    &:hover {
+      color: #507aac;
+    }
+  }
+
+  &-table {
+    margin-top: 20px;
+  }
+
+  &-footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  &-info {
+    font-weight: bold;
+    position: relative;
+
+    &:before {
+      background-color: #1980FF;
+      content: "";
+      width: 5px;
+      border-radius: 2px;
+      top: 0;
+      bottom: 0;
+      position: absolute;
+    }
+  }
+}
+</style>

From 3135b2c4e5ed41271cf51315ced2ac60da29392c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:16:50 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8E=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts     | 7 +++++++
 src/config/final.ts | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 94c93f7..e07d992 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,8 +21,11 @@ declare module 'vue' {
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
+    NEllipsis: typeof import('naive-ui')['NEllipsis']
+    NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
+    NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -40,7 +43,11 @@ declare module 'vue' {
     NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
+    NTabPane: typeof import('naive-ui')['NTabPane']
+    NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
+    NTimeline: typeof import('naive-ui')['NTimeline']
+    NTimelineItem: typeof import('naive-ui')['NTimelineItem']
     NTooltip: typeof import('naive-ui')['NTooltip']
     NUpload: typeof import('naive-ui')['NUpload']
     NUploadDragger: typeof import('naive-ui')['NUploadDragger']
diff --git a/src/config/final.ts b/src/config/final.ts
index d9b2970..a0d4947 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -151,12 +151,6 @@ export const asideTaskMap: Recordable<AsideEntity> = {
     isDefaultFilter: true,
     key: 'izupuser'
   },
-  izprojecttype: {
-    label: '任务类型',
-    defaultValue: null,
-    isDefaultFilter: true,
-    key: 'izprojecttype'
-  },
   iztaskrrom: {
     label: '任务来源',
     defaultValue: null,

From 1e8fc844038e3cb604390ebcb47d1228440f02e8 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:19:57 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E6=97=A0=E6=B3=95=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index e0c9fe3..7857120 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -619,6 +619,7 @@ function reloadList(param, text) {
       @reject="rejectHandler"
       @approval="approvalHandler"
     />
+    <CustomSettingModal ref="CustomSettingModalRef" />
   </div>
 </template>
 

From b2975583294f5673287be256625f7f1560a1ece4 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 23:29:09 +0800
Subject: [PATCH 09/11] bug

---
 src/assets/icons/summary.svg                  | 26 ++++++
 src/components/Approval/NotPassed.vue         |  8 +-
 src/views/final/comp/RepeatTaskTableModal.vue |  2 +-
 src/views/final/content/Content.vue           |  3 +-
 src/views/task/content/Content.vue            | 92 ++++++++++++-------
 5 files changed, 95 insertions(+), 36 deletions(-)
 create mode 100644 src/assets/icons/summary.svg

diff --git a/src/assets/icons/summary.svg b/src/assets/icons/summary.svg
new file mode 100644
index 0000000..075c554
--- /dev/null
+++ b/src/assets/icons/summary.svg
@@ -0,0 +1,26 @@
+<?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>chazhongjiansuo</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+        <linearGradient x1="12.4444444%" y1="0%" x2="87.5555556%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#5B85F8" offset="0%"></stop>
+            <stop stop-color="#3C6CF0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-2250.000000, -6758.000000)">
+            <g id="chazhongjiansuo" transform="translate(2250.000000, 6758.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <g mask="url(#mask-2)" fill="url(#linearGradient-3)" fill-rule="nonzero" id="形状结合">
+                    <g transform="translate(6.000000, 2.000000)">
+                        <path d="M31.4511232,24.8747904 L31.7607141,24.8786253 L32.4504148,24.8786253 C39.5888163,25.0499657 45.2098765,30.9440752 45.0374513,38.0375676 C44.9632519,41.0900989 43.8225861,43.8634128 41.9782017,46.0188901 L51.6240923,56.6794025 C52.1413678,57.2619598 52.1413678,57.8102491 51.5206372,58.3585383 L50.106751,59.6264573 C49.5205054,60.1404784 48.9687449,60.1404784 48.4169844,59.523653 L38.6877524,48.7707922 C36.6723213,49.9523783 34.3085739,50.605744 31.7951992,50.5454164 L31.7951992,50.5454164 L31.1054985,50.5454164 C23.967097,50.374076 18.3460368,44.4799664 18.518462,37.3864741 C18.6908871,30.2929817 24.6223126,24.7072849 31.7607141,24.8786253 Z M23.6222467,0.61682542 C24.5188575,-0.205608473 25.8982588,-0.205608473 26.7948696,0.61682542 C29.3467619,2.94705478 35.2781874,6.95642001 46.3478825,7.77885391 C48.6928647,7.9501943 50.4516013,9.9034748 50.4176147,12.1994361 L50.4176147,12.1994361 L50.4176147,38.1061037 L48.5894096,38.1061037 C49.106685,28.682382 41.8303434,20.6293835 32.3469597,20.1153623 C22.8290909,19.6013411 14.6906235,26.7976377 14.173348,36.2556275 C13.6560725,45.7136172 20.9324142,53.8008838 30.4157979,54.314905 C31.5538039,54.3834412 32.69181,54.314905 33.795331,54.1435646 L33.795331,54.1435646 L34.5540017,55.2744112 C32.5193848,56.5423302 30.553738,57.775981 28.6915463,58.8382914 C26.5534744,60.1747465 23.8291569,60.1747465 21.6910849,58.8382914 C14.7595935,54.4177093 0,44.1715537 0,37.5235464 L0,37.5235464 L0,12.1994361 C0,9.9034748 1.75873661,8.01873046 4.06923373,7.81312199 C15.0009888,6.99068809 21.0013843,2.94705478 23.6222467,0.61682542 Z M31.7951992,30.2244456 C27.6225103,30.1216413 24.1395221,33.3771088 24.0705521,37.5235464 C23.967097,41.6699839 27.243175,45.0967918 31.4158638,45.199596 L31.4158638,45.199596 L31.8296842,45.199596 C36.002373,45.3024003 39.4508762,42.0469328 39.5543313,37.9004952 C39.6577864,33.7540577 36.3817084,30.3272498 32.2090195,30.2244456 L32.2090195,30.2244456 Z"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index b2e53a5..7d3ea14 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -101,7 +101,7 @@ async function handleSumbit(e: MouseEvent) {
         audit(param).then((res) => {
           const { code } = res
           if (code === 'OK') {
-            message.success('审核成功')
+            message.success(res.message)
             emit('success', param)
             closeModal()
           }
@@ -199,6 +199,8 @@ async function selectChange(id) {
     justify-content: flex-end;
     padding-right: 24px;
     padding-bottom: 10px;
+    border-top: 0.5px solid #d9d9d9;
+    padding-top: 15px;
   }
 
   &-info {
@@ -236,6 +238,10 @@ async function selectChange(id) {
   margin-bottom: 0px;
 }
 
+::v-deep(.n-form-item-label__text) {
+  color: #666666;
+}
+
 ::v-deep(.n-input__placeholder) {
   color: #333333!important;
 }
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 00947ed..0d1c1ae 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -322,7 +322,7 @@ function doAudit(param: any) {
       audit(param).then((res) => {
         const { code } = res
         if (code === 'OK') {
-          message.success('审核成功')
+          message.success(res.message)
           reload()
         }
         else { message.error(res.message) }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index cd56c0c..71285a0 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -717,7 +717,7 @@ function doAudit(param: any) {
       audit(param).then((res) => {
         const { code } = res
         if (code === 'OK') {
-          message.success('审核成功')
+          message.success(res.message)
           reload()
         }
         else { message.error(res.message) }
@@ -762,6 +762,7 @@ async function refreshHandler(searchId?: any) {
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
+        <SvgIcon style="margin-right: 6px;" size="13" name="summary" @click="showModal(repeatModalRef)" />
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index e0c9fe3..488edf8 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -2,7 +2,7 @@
 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 { useRoute, useRouter } from 'vue-router'
 import BatchModal from '../modal/BatchModal.vue'
 import CustomSettingModal from '../modal/CustomSettingModal.vue'
 import PictureTable from './PictureTable.vue'
@@ -25,6 +25,9 @@ import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 
 const emit = defineEmits(['setAsideItemName'])
+
+const router = useRouter()
+
 const batch = ref(false)
 const selectItems = ref<any[]>([])
 const message = useMessage()
@@ -37,22 +40,12 @@ const packageId: any = ref('') // 包id
 const CustomSettingModalRef = ref(null)
 const taskTableData = ref<any[]>([])
 const route = useRoute()
-
+const isDetail = ref(false) // 是否是详情
 const sortBy: any = {
   orderType: 'desc',
   orderName: 'similarityScore',
 }
 
-function setBatch(value: boolean) {
-  if (totalCount.value === 0)
-    return
-
-  batch.value = value
-
-  if (value === false)
-    selectItems.value = []
-}
-
 function onCheckChange(checked: any, item: any) {
   const index = selectItems.value.indexOf(item)
   item.checked = checked
@@ -77,23 +70,23 @@ const taskDetailPictureList = ref<any[]>([])
 const userStore = useUser()
 const imageRef = ref<ComponentElRef | null>()
 let processItems: any[] = []
-const isFullScreen = ref(false);
+const isFullScreen = ref(false)
 
 const fullscreenStyles = computed<any>(() => ({
-  'width': isFullScreen.value ? '100vw' : '',
-  'height': isFullScreen.value ? '100vh' : '',
-  'position': isFullScreen.value ? 'fixed' : '',
-  'top': isFullScreen.value ? '0' : '',
-  'left': isFullScreen.value ? '0' : '',
-  'zIndex': isFullScreen.value ? '9999' : '',
-}));
-
+  width: isFullScreen.value ? '100vw' : '',
+  height: isFullScreen.value ? '100vh' : '',
+  position: isFullScreen.value ? 'fixed' : '',
+  top: isFullScreen.value ? '0' : '',
+  left: isFullScreen.value ? '0' : '',
+  zIndex: isFullScreen.value ? '9999' : '',
+}))
 
 onMounted(() => {
   window.addEventListener('keydown', handleKeydown)
   if (route.query.id) {
     taskId.value = route.query.id
     packageId.value = route.query.packageid
+    isDetail.value = true
     getDetail()
   }
 })
@@ -108,6 +101,21 @@ function handleKeydown(event) {
   // 在这里执行右箭头的逻辑
 }
 
+function setBatch(value: boolean) {
+  // if (totalCount.value === 0)
+  //   return
+
+  batch.value = value
+
+  if (value === false) {
+    taskDetailInfo.value.checked = false
+    selectItems.value = []
+    taskDetailPictureList.value.forEach((item) => {
+      item.checked = false
+    })
+  }
+}
+
 // 从store里面获取任务id
 function currentTaskId() {
   const index = taskStore.getCurrentIndex
@@ -202,7 +210,7 @@ function doAudit(param: any) {
   audit(param).then((res) => {
     const { code } = res
     if (code === 'OK') {
-      message.success('审核成功')
+      message.success(res.message)
       setBatch(false)
       reloadList(param, '通过')
     }
@@ -311,12 +319,12 @@ onUnmounted(() => {
 
 function immersionHandler() {
   // taskStore.updateImmersion()
-  toggleFullScreen();
+  toggleFullScreen()
 }
 // 切换全屏状态
-const toggleFullScreen = () => {
-  isFullScreen.value = !isFullScreen.value;
-};
+function toggleFullScreen() {
+  isFullScreen.value = !isFullScreen.value
+}
 function previewHandler(event: MouseEvent) {
   event.stopImmediatePropagation()
   event.stopPropagation()
@@ -354,6 +362,14 @@ function reloadList(param, text) {
 
   getDetail()
 }
+
+function goBack() {
+  router.back()
+}
+
+function switchBatch() {
+  setBatch(!batch.value)
+}
 </script>
 
 <template>
@@ -361,12 +377,14 @@ function reloadList(param, text) {
     <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" />
+        <template v-if="!isDetail">
+          <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
+          <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
+        </template>
       </div>
-      <div class="right">
+      <div v-if="!isDetail" class="right">
         <div v-show="!showActions" style="display: flex; align-items: center">
-          <div class="btn" @click="setBatch(true)">
+          <div class="btn" @click="switchBatch()">
             <SvgIcon style="margin-right: 6px" size="22" name="batch" />
             批量审批
           </div>
@@ -396,12 +414,12 @@ function reloadList(param, text) {
             </ul>
           </n-popover> -->
           <div class="icon-wrap">
-            <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;"/>
+            <SvgIcon v-if="isFullScreen" size="20" name="power-off" style="cursor: pointer;" @click="immersionHandler" />
+            <SvgIcon v-else size="20" name="immersion-model" style="cursor: pointer;" @click="immersionHandler" />
           </div>
         </div>
         <div v-show="showActions" class="batch">
-          <n-button text @click="setBatch(false)">
+          <n-button text @click="switchBatch()">
             <template #icon>
               <SvgIcon name="revoke" />
             </template>
@@ -422,6 +440,14 @@ function reloadList(param, text) {
           >
         </div>
       </div>
+      <div v-else class="right">
+        <n-button text @click="goBack">
+          <template #icon>
+            <SvgIcon name="revoke" />
+          </template>
+          返回
+        </n-button>
+      </div>
     </div>
     <div class="wrapper-detail">
       <div

From cb4b00b1987a24981cfe3865aaef8015a1562801 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:29:31 +0800
Subject: [PATCH 10/11] =?UTF-8?q?feat:=20=E5=90=8C=E4=B8=80=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=AF=8F=E5=A4=A9=E6=9C=80=E5=A4=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=9610=E6=AC=A1=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E5=8D=81=E6=AC=A1=E5=90=8E=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=AC=A1=E6=95=B0=E8=B6=85=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=98=8E=E5=A4=A9=E5=86=8D=E8=AF=95!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 2e4d5a9..4b50660 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -300,7 +300,11 @@ async function sendCode(value) {
     phone: formSms.phone,
     agentcode: formSms.agentcode,
   });
-  startCount();
+  if(res.code == 'OK'){
+    startCount();
+  }else{
+    message.error(res.message)
+  }
 }
 
 function startCount() {

From 93972ea9a5794252af627ba75f1a2a9e663f544c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:49:37 +0800
Subject: [PATCH 11/11] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts     |  1 +
 src/config/final.ts | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index e07d992..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -34,6 +34,7 @@ declare module 'vue' {
     NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
+    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
     NProgress: typeof import('naive-ui')['NProgress']
diff --git a/src/config/final.ts b/src/config/final.ts
index a0d4947..fcc931d 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -1,5 +1,5 @@
 import type { AsideEntity } from './aside'
-import { IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items'
+import { IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items'
 
 export interface RowData {
   id: string
@@ -137,78 +137,91 @@ export const asideTaskMap: Recordable<AsideEntity> = {
     label: '审批状态',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izstatus'
+    key: 'izstatus',
+    component: IzStatus, // todo
   },
   izuptime: {
     label: '提报时间',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izuptime'
+    key: 'izuptime',
+    component: TimeVue,
   },
   izupuser: {
     label: '提报人',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izupuser'
+    key: 'izupuser',
+    component: ReportUserVue,
   },
   iztaskrrom: {
     label: '任务来源',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'iztaskrrom'
+    key: 'iztaskrrom',
+    component: IztaskrromVue,
   },
   izcustomname: {
     label: '拜访客户',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izcustomname'
+    key: 'izcustomname',
+    component: IzCustomname,
   },
   izcustomtype: {
     label: '客户类型',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izcustomtype'
+    key: 'izcustomtype',
+    component: IzCustomtype,
   },
   izproject: {
     label: '所属项目',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izproject'
+    key: 'izproject',
+    component: IzProjectVue,
   },
   izvisitpro: {
     label: '拜访省份/直辖市',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izvisitpro'
+    key: 'izvisitpro',
+    component: IzVisitcity,
   },
   izcustomlevel: {
     label: '客户级别',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izcustomlevel'
+    key: 'izcustomlevel',
+    component: IzCustomlevel
   },
   izprojecttype: {
     label: '项目类别',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izprojecttype'
+    key: 'izprojecttype',
+    component: IzProjecttype,
   },
   izproductname: {
     label: '产品名称',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izproductname'
+    key: 'izproductname',
+    component: IzProductVue,
   },
   izvisitcity: {
     label: '拜访城市',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izvisitcity'
+    key: 'izvisitcity',
+    component: IzvisitproVue,
   },
   izfirm: {
     label: '厂商',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izfirm'
+    key: 'izfirm',
+    component: IzfirmVue,
   }
 }
\ No newline at end of file