From d66d87731e88588de5c66f2189d6fd8252f0c7ae Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 28 Mar 2024 00:10:46 +0800
Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 139614f..fe175fd 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -456,11 +456,14 @@ function previewHandler(event: MouseEvent) {
             <div class="footer-times">
               <div class="time" style="margin-bottom: 4px;">
                 <SvgIcon color="#FFF" size="16" name="camera" />
-                <span class="time-value">{{ taskDetailInfo.createTime }} </span>
+                <span class="time-value">{{ taskDetailInfo?.submitDateTimestamp ? format(
+                  taskDetailInfo.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') : '-' }} </span>
               </div>
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
-                <span class="time-value">{{ taskDetailInfo.createTime }} </span>
+                <span class="time-value">{{
+                  taskDetailInfo?.photoDateTimestamp ? format(taskDetailInfo?.photoDateTimestamp, 'yyyy-MM-dd HH:mm:ss') : '-'
+                }} </span>
               </div>
             </div>
             <div class="status">
@@ -586,12 +589,14 @@ function previewHandler(event: MouseEvent) {
             <div class="time-wrapper">
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="camera" />
-                <span class="current-time" >{{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp) || 0) : '-'
+                <span class="current-time">{{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp) ||
+                  0) : '-'
                 }}</span>
               </div>
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
-                <span class="current-time">{{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp) || 0) : '-'
+                <span class="current-time">{{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)
+                  || 0) : '-'
                 }}</span>
               </div>
             </div>
@@ -1067,5 +1072,4 @@ function previewHandler(event: MouseEvent) {
 ::v-deep(.n-divider:not(.n-divider--vertical)) {
   margin-top: 12px;
   margin-bottom: 12px;
-}
-</style>
+}</style>

From 3c0666e06632fd1e5e460c7b327fb92e69666ddf Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 28 Mar 2024 00:38:11 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E6=8E=92=E5=BA=8F=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/active-sort.svg        | 12 ++++++++++++
 src/views/worksheet/content/Content.vue | 21 +++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/icons/active-sort.svg

diff --git a/src/assets/icons/active-sort.svg b/src/assets/icons/active-sort.svg
new file mode 100644
index 0000000..b9b32df
--- /dev/null
+++ b/src/assets/icons/active-sort.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>排序</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-664.000000, -7071.000000)" fill-rule="nonzero">
+            <g id="排序" transform="translate(664.000000, 7071.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="64" height="64"></rect>
+                <path d="M26.7875,57.7625 L6,38.71875 L10.2375,34.09375 L20.5125,43.5 L20.5125,6.89375 L26.7875,6.89375 L26.7875,57.7625 Z M43.4875,57.10625 L37.2125,57.10625 L37.2125,6.2375 L58,25.28125 L53.7625,29.90625 L43.4875,20.5 L43.4875,57.10625 Z" id="形状" fill="#507AFD"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index fe175fd..af9755d 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -68,7 +68,7 @@ const imageRef = ref<ComponentElRef | null>();
 const listData = ref<any[]>([]);
 const loading = ref(false);
 const el = ref<HTMLDivElement | null>(null);
-
+const selectedSortName = ref('');
 let canloadMore = true;
 
 let processItems: any[] = [];
@@ -312,7 +312,7 @@ async function handleSelect(item: any) {
 }
 
 async function sortHandler(orderby: "similarityScore" | "createdate") {
-
+  selectedSortName.value = orderby;
   sortBy.orderName = orderby;
   sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
   refreshHandler();
@@ -462,7 +462,8 @@ function previewHandler(event: MouseEvent) {
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
                 <span class="time-value">{{
-                  taskDetailInfo?.photoDateTimestamp ? format(taskDetailInfo?.photoDateTimestamp, 'yyyy-MM-dd HH:mm:ss') : '-'
+                  taskDetailInfo?.photoDateTimestamp ? format(taskDetailInfo?.photoDateTimestamp, 'yyyy-MM-dd HH:mm:ss') :
+                  '-'
                 }} </span>
               </div>
             </div>
@@ -564,20 +565,23 @@ function previewHandler(event: MouseEvent) {
             </n-scrollbar>
           </div>
         </div>
-        <div style="display: flex; justify-content: space-between; padding: 12px 0px">
+        <div style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0">
           <div>
             <!-- <span style="font-size: 21px; font-weight: bold">任务包图片</span><span>({{ totalCount }})</span> -->
             <span
               style="font-size: 18px; font-weight: Medium;color: #333333;font-family: PingFang SC, PingFang SC-Medium;">任务包图片</span>
           </div>
-          <div style="display: flex; align-items: center">
+          <div style="display: flex; align-items: center;font-size: 14px;margin-right: 25px;color:#323233">
             <div style="cursor: pointer" @click="sortHandler('createdate')">
               <span>时间排序</span>
-              <SvgIcon style="margin-left: 8px" name="sort" size="12" />
+              <SvgIcon style="margin-left: 5px" name="sort" size="12" v-show="selectedSortName !== 'createdate'" />
+              <SvgIcon style="margin-left: 5px" name="active-sort" size="12" v-show="selectedSortName === 'createdate'" />
             </div>
             <div style="margin-left: 15px; cursor: pointer" @click="sortHandler('similarityScore')">
               <span>相似度排序</span>
-              <SvgIcon style="margin-left: 8px" name="sort" size="12" />
+              <SvgIcon style="margin-left: 5px" name="sort" size="12" v-show="selectedSortName !== 'similarityScore'" />
+              <SvgIcon style="margin-left: 5px" name="active-sort" size="12"
+                v-show="selectedSortName === 'similarityScore'" />
             </div>
           </div>
         </div>
@@ -1072,4 +1076,5 @@ function previewHandler(event: MouseEvent) {
 ::v-deep(.n-divider:not(.n-divider--vertical)) {
   margin-top: 12px;
   margin-bottom: 12px;
-}</style>
+}
+</style>

From b79c6e3ed72099d8c382403b8058056854b58782 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 28 Mar 2024 00:58:35 +0800
Subject: [PATCH 03/11] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E9=81=AE?=
 =?UTF-8?q?=E7=BD=A9=E5=B1=82=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index af9755d..2dc3ffb 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -631,7 +631,7 @@ function previewHandler(event: MouseEvent) {
             </div> -->
             <div v-show="overTask && overTask.id === item.id" class="action">
               <SvgIcon style="cursor: pointer" name="t1" @click.stop="trueHandler" />
-              <SvgIcon style="cursor: pointer" name="t2" @click.stop="falseHandler" />
+              <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="falseHandler" />
             </div>
           </div>
         </div>
@@ -804,7 +804,7 @@ function previewHandler(event: MouseEvent) {
         border-radius: 8px;
         align-items: center;
         justify-content: center;
-        background-color: rgba(102, 102, 102, 0.5);
+        background-color: rgba(0,0,0,0.48);
       }
 
       .info {
@@ -1064,8 +1064,8 @@ function previewHandler(event: MouseEvent) {
         display: flex;
         border-radius: 8px;
         align-items: center;
-        justify-content: space-around;
-        background-color: #666666;
+        justify-content: center;
+        background-color: rgba(0,0,0,0.48);
       }
 
 

From 8b5433bc6e28c4f00fa62614052702049fd8877d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 28 Mar 2024 10:19:38 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E7=9B=91=E5=90=AC=E9=94=AE?=
 =?UTF-8?q?=E7=9B=98=E4=BA=8B=E4=BB=B6=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 patches/naive-ui+2.38.1.patch       | 1 +
 src/views/final/aside/Aside.vue     | 4 +++-
 src/views/home/aside/Aside.vue      | 4 +++-
 src/views/task/aside/Aside.vue      | 5 +++--
 src/views/worksheet/aside/Aside.vue | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/patches/naive-ui+2.38.1.patch b/patches/naive-ui+2.38.1.patch
index 8748dc4..07fa2ff 100644
--- a/patches/naive-ui+2.38.1.patch
+++ b/patches/naive-ui+2.38.1.patch
@@ -161,3 +161,4 @@ index 4f47aad..6dae078 100644
                          });
                      }
                  }))) : null));
+ 
\ No newline at end of file
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index 3d3778c..f98bf3e 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
 import { CustomFilterModalVue, FilterModal, NewFilterModal } from '@/views/final/comp'
 import Search from '@/views/home/aside/comp/Search.vue'
 import AdvanceFilter from '@/views/home/aside/comp/AdvanceFilter.vue'
@@ -35,6 +35,8 @@ function showModal(modalRef: any) {
   const modal = unref(modalRef)! as any
   modal.showModal()
 }
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 
 onMounted(() => {
   nextTick(() => {
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 4c8fca0..fa2c43c 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
 import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
 import Search from './comp/Search.vue'
 import AdvanceFilter from './comp/AdvanceFilter.vue'
@@ -43,6 +43,8 @@ onMounted(() => {
 })
 
 const collapse = ref(false)
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 
 function collapseHandler() {
   collapse.value = !collapse.value
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index dbf309e..c8a8ab4 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { debounce } from 'lodash-es'
-import { computed, onMounted, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, onMounted, ref, shallowRef, unref, watch } from 'vue'
 import CustomFieldModal from '../modal/CustomFieldModal.vue'
 import AdvanceFilter from '../../home/aside/comp/AdvanceFilter.vue'
 import {
@@ -27,7 +27,8 @@ const showFieldList = ref<any[]>([])
 function collapseHandler() {
   collapse.value = !collapse.value
 }
-
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 const asideWidth = computed(() => {
   return collapse.value ? 0 : 308
 })
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index de65660..b4d363b 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -8,6 +8,7 @@ import { debounce } from "lodash-es";
 import {
 computed,
 defineOptions,
+inject,
 nextTick,
 onMounted,
 ref,
@@ -29,7 +30,8 @@ const dicts = ref<any>([]);
 function collapseHandler() {
   collapse.value = !collapse.value;
 }
-
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 const asideWidth = computed(() => {
   return collapse.value ? 0 : 308;
 });

From fb79c978f2e200449ea1861b342028c9fa2ed98d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 28 Mar 2024 10:34:03 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=E5=9B=9E=E6=BB=9Apatches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 patches/naive-ui+2.38.1.patch | 1 -
 1 file changed, 1 deletion(-)

diff --git a/patches/naive-ui+2.38.1.patch b/patches/naive-ui+2.38.1.patch
index 07fa2ff..8748dc4 100644
--- a/patches/naive-ui+2.38.1.patch
+++ b/patches/naive-ui+2.38.1.patch
@@ -161,4 +161,3 @@ index 4f47aad..6dae078 100644
                          });
                      }
                  }))) : null));
- 
\ No newline at end of file

From 56579989dd74de2a7dde4813207557ee8ba1ad2a Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 28 Mar 2024 14:13:07 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat:=20=E5=88=87=E6=8D=A2=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8icon=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/switchCompany.svg            | 12 ++++++++++++
 src/layout/components/Header/UserSettings.vue |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/icons/switchCompany.svg

diff --git a/src/assets/icons/switchCompany.svg b/src/assets/icons/switchCompany.svg
new file mode 100644
index 0000000..c1f0374
--- /dev/null
+++ b/src/assets/icons/switchCompany.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切换</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-3040.000000, -3431.000000)" fill-rule="nonzero">
+            <g id="切换" transform="translate(3040.000000, 3431.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="64" height="64"></rect>
+                <path d="M31.9675,1.41375 C15.06625,1.41375 1.36625,15.09875 1.36625,31.981875 C1.36625,48.865 15.06625,62.55 31.9675,62.55 C48.86875,62.55 62.568125,48.865 62.568125,31.981875 C62.568125,15.09875 48.868125,1.41375 31.9675,1.41375 Z M13.239375,27.2225 C13.2325,27.210625 13.2325,27.191875 13.225,27.178125 L13.20625,27.103125 C13.20625,27.08875 13.199375,27.076875 13.199375,27.065625 L13.180625,26.983125 C13.180625,26.964375 13.17375,26.9525 13.17375,26.940625 C13.16875,26.914375 13.16875,26.881875 13.161875,26.858125 C13.161875,26.839375 13.154375,26.825 13.154375,26.80625 C13.154375,26.783125 13.1475,26.756875 13.1475,26.73125 C13.143125,26.715 13.143125,26.68875 13.143125,26.668125 L13.143125,26.670625 C13.143125,26.651875 13.13625,26.633125 13.143125,26.6 C13.13625,26.5625 13.13625,26.5175 13.13625,26.475 C13.13625,26.430625 13.143125,26.3925 13.143125,26.348125 L13.1475,26.286875 L13.154375,26.223125 C13.154375,26.1975 13.154375,26.17125 13.161875,26.148125 C13.161875,26.129375 13.16875,26.115 13.16875,26.09625 C13.169375,26.069375 13.17375,26.0425 13.180625,26.01625 C13.180625,25.995 13.1875,25.983125 13.1875,25.971875 L13.20625,25.89 C13.20625,25.875625 13.20625,25.86375 13.213125,25.8525 L13.231875,25.7775 C13.23875,25.765625 13.23875,25.746875 13.245625,25.735 C13.25,25.71375 13.264375,25.688125 13.27125,25.664375 L13.29,25.6125 C13.296875,25.59375 13.30875,25.57 13.31375,25.55125 L13.3375,25.495 C13.341875,25.47625 13.35375,25.4575 13.360625,25.438125 C13.365625,25.419375 13.375,25.39375 13.38875,25.374375 C13.400625,25.360625 13.405,25.34125 13.4125,25.331875 C13.419375,25.30375 13.43125,25.285 13.445625,25.26125 C13.45625,25.250625 13.465,25.2375 13.47125,25.22375 C13.483125,25.1975 13.4975,25.179375 13.51125,25.153125 C13.52125,25.1425 13.52875,25.130625 13.535,25.118125 C13.54875,25.091875 13.568125,25.07125 13.581875,25.0475 C13.586875,25.03375 13.600625,25.02125 13.608125,25.01 L13.66,24.939375 L13.690625,24.901875 C13.705,24.883125 13.71625,24.864375 13.735625,24.845625 C13.749375,24.826875 13.76875,24.815 13.7825,24.79625 C13.79625,24.784375 13.80875,24.763125 13.82,24.751875 L13.911875,24.6575 L20.114375,18.62875 C21.16,17.621875 22.81625,17.621875 23.861875,18.62875 C24.8975,19.635 24.8975,21.2625 23.861875,22.26875 L22.17875,23.903125 L47.996875,23.903125 C49.465625,23.903125 50.649375,25.06 50.649375,26.48 C50.649375,27.9075 49.458125,29.059375 47.996875,29.059375 L15.774375,29.059375 C15.736875,29.059375 15.691875,29.051875 15.645,29.051875 L15.58875,29.045 L15.5225,29.040625 C15.49625,29.04125 15.47,29.039375 15.445,29.03375 C15.42625,29.03375 15.411875,29.026875 15.393125,29.026875 C15.365625,29.025625 15.3375,29.021875 15.310625,29.015 C15.289375,29.015 15.2775,29.008125 15.263125,29.008125 L15.180625,28.989375 C15.159375,28.984375 15.1475,28.984375 15.13375,28.9775 L15.05875,28.95875 C15.044375,28.951875 15.02375,28.951875 15.01125,28.944375 L14.940625,28.92125 L14.88875,28.9 L14.8225,28.87625 L14.76625,28.8575 L14.7075,28.83125 C14.68875,28.82625 14.663125,28.819375 14.64375,28.805 C14.63,28.793125 14.610625,28.78875 14.596875,28.781875 C14.573125,28.775 14.549375,28.763125 14.52625,28.74875 C14.514375,28.73875 14.500625,28.730625 14.48625,28.725 L14.415625,28.6875 C14.40375,28.6775 14.39,28.669375 14.375625,28.664375 C14.351875,28.65 14.330625,28.63125 14.305,28.616875 C14.290625,28.611875 14.279375,28.598125 14.2675,28.59375 L14.196875,28.541875 L14.156875,28.51375 L14.098125,28.466875 C14.079375,28.455 14.0675,28.43625 14.04875,28.424375 L14.001875,28.386875 C13.97125,28.35375 13.938125,28.33 13.905,28.2975 C13.871875,28.266875 13.84625,28.23375 13.815625,28.20375 C13.801875,28.191875 13.789375,28.173125 13.778125,28.15875 C13.76375,28.14 13.7425,28.128125 13.73125,28.109375 C13.716875,28.090625 13.698125,28.071875 13.68625,28.0525 L13.653125,28.015 C13.634375,27.991875 13.613125,27.970625 13.599375,27.944375 C13.595,27.9325 13.5825,27.92125 13.575625,27.909375 C13.561875,27.88375 13.5425,27.8625 13.52875,27.83875 C13.516875,27.825 13.51,27.813125 13.505,27.80125 L13.465,27.733125 L13.439375,27.693125 C13.4325,27.67 13.420625,27.650625 13.40625,27.6275 C13.394375,27.61375 13.3875,27.595 13.380625,27.580625 C13.37625,27.561875 13.361875,27.538125 13.355,27.519375 C13.35,27.500625 13.33625,27.481875 13.32875,27.463125 L13.31,27.404375 L13.28375,27.340625 L13.265,27.29375 C13.25125,27.271875 13.24625,27.24625 13.239375,27.2225 Z M50.79125,37.60875 L50.786875,37.6725 L50.78,37.73625 C50.78,37.76 50.78,37.785625 50.773125,37.81125 C50.773125,37.83 50.765625,37.841875 50.765625,37.860625 C50.765,37.888125 50.760625,37.91625 50.75375,37.943125 C50.75375,37.961875 50.746875,37.97375 50.746875,37.985625 L50.728125,38.068125 C50.728125,38.0825 50.728125,38.09375 50.72125,38.105625 L50.7025,38.180625 C50.695,38.195 50.695,38.21375 50.688125,38.225625 C50.683125,38.246875 50.669375,38.27 50.6625,38.29375 C50.6575,38.315 50.650625,38.326875 50.64375,38.345625 L50.62,38.409375 L50.596875,38.465625 C50.5925,38.484375 50.58,38.50375 50.573125,38.5225 C50.568125,38.54125 50.559375,38.565 50.545,38.58375 C50.533125,38.5975 50.52875,38.616875 50.521875,38.628125 C50.514375,38.651875 50.503125,38.6725 50.48875,38.69875 C50.476875,38.710625 50.47,38.7225 50.4625,38.73375 C50.450625,38.759375 50.436875,38.780625 50.4225,38.804375 C50.410625,38.818125 50.40375,38.830625 50.39875,38.841875 C50.385,38.865625 50.365625,38.88625 50.351875,38.9125 C50.346875,38.924375 50.333125,38.93625 50.325625,38.9475 C50.306875,38.973125 50.295,38.994375 50.27375,39.018125 L50.243125,39.055625 C50.22875,39.074375 50.216875,39.093125 50.195625,39.1125 C50.176875,39.13125 50.165,39.15 50.14375,39.16875 C50.13,39.180625 50.118125,39.201875 50.10625,39.213125 L50.014375,39.3075 L43.809375,45.33625 C42.77625,46.3425 41.1025,46.3425 40.066875,45.33625 C39.03125,44.33 39.03125,42.7025 40.066875,41.69625 L41.7475,40.061875 L15.9225,40.061875 C14.45625,40.061875 13.271875,38.905 13.271875,37.485 C13.271875,36.0575 14.463125,34.905625 15.9225,34.905625 L48.1525,34.905625 C48.19,34.905625 48.235,34.9125 48.281875,34.9125 C48.300625,34.9125 48.319375,34.919375 48.340625,34.919375 L48.404375,34.924375 C48.430625,34.924375 48.45875,34.924375 48.481875,34.93125 C48.500625,34.93125 48.515,34.93875 48.53375,34.93875 C48.56125,34.939375 48.589375,34.94375 48.61625,34.950625 C48.64,34.950625 48.651875,34.9575 48.66375,34.9575 L48.74625,34.97625 C48.769375,34.980625 48.78125,34.980625 48.793125,34.988125 L48.870625,35.006875 C48.885,35.014375 48.90375,35.014375 48.918125,35.02125 L48.98875,35.044375 L49.038125,35.065625 L49.104375,35.089375 L49.163125,35.108125 L49.219375,35.13375 C49.240625,35.13875 49.26625,35.145625 49.283125,35.16 C49.296875,35.171875 49.31875,35.17625 49.33,35.183125 C49.35625,35.190625 49.3775,35.201875 49.400625,35.21625 C49.4125,35.22625 49.42625,35.234375 49.440625,35.24 L49.51125,35.2775 C49.525625,35.289375 49.536875,35.29625 49.55125,35.30125 C49.575,35.315 49.59625,35.334375 49.621875,35.348125 C49.63375,35.353125 49.648125,35.366875 49.661875,35.371875 L49.7325,35.42375 L49.770625,35.451875 C49.789375,35.465625 49.810625,35.48 49.829375,35.49875 C49.848125,35.510625 49.8625,35.529375 49.87875,35.54125 L49.925625,35.57875 L50.0225,35.668125 L50.114375,35.7625 C50.12875,35.774375 50.140625,35.793125 50.151875,35.806875 C50.16625,35.825625 50.185,35.8375 50.19625,35.85625 L50.24375,35.913125 L50.274375,35.950625 C50.295625,35.974375 50.314375,35.995 50.328125,36.02125 C50.333125,36.033125 50.346875,36.045 50.351875,36.05625 C50.365625,36.0825 50.385,36.103125 50.39875,36.126875 C50.409375,36.1375 50.418125,36.150625 50.424375,36.164375 C50.43625,36.190625 50.450625,36.20875 50.464375,36.2325 C50.47625,36.24625 50.480625,36.25875 50.488125,36.2725 C50.495,36.29625 50.506875,36.315 50.52125,36.338125 C50.533125,36.351875 50.54,36.37125 50.546875,36.385 L50.573125,36.44625 C50.58,36.465 50.591875,36.48375 50.596875,36.5025 L50.62,36.56125 L50.64375,36.625 L50.665,36.671875 C50.676875,36.69375 50.684375,36.7175 50.688125,36.7425 C50.695,36.754375 50.695,36.773125 50.7025,36.786875 L50.72125,36.861875 C50.72125,36.87625 50.72125,36.8875 50.728125,36.9 L50.746875,36.9825 C50.746875,37.00125 50.75375,37.013125 50.75375,37.025 C50.760625,37.05125 50.760625,37.08375 50.765625,37.1075 C50.765625,37.12625 50.773125,37.140625 50.773125,37.159375 C50.773125,37.1825 50.78,37.20875 50.78,37.234375 C50.786875,37.253125 50.786875,37.276875 50.786875,37.295625 C50.79125,37.32125 50.79125,37.34 50.79125,37.35875 C50.798162,37.39625 50.798162,37.43875 50.798162,37.485625 C50.79875,37.526875 50.79125,37.564375 50.79125,37.60875 L50.79125,37.60875 Z" id="形状" fill="#507AFD"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index ff9186b..14f518b 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -118,7 +118,7 @@ const options = computed(() => {
       </div>
       <div class="trigger">
         <span>{{ currentCompanyName }}</span>
-        <span @click="changeFlag = !changeFlag" style="cursor: pointer">icon</span>
+        <span @click="changeFlag = !changeFlag" style="cursor: pointer"><SvgIcon name="switchCompany" size="24" /></span>
       </div>
       <div class="item">
         <span>AI设置开关</span>

From 951d9a9e462402716e2484e074f65b0a70743083 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 28 Mar 2024 14:51:42 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat:=20ai=E5=B7=A5=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8search=E4=B8=AD=E8=BF=94=E5=9B=9E=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue      | 55 ++++++++++++++-------
 src/views/worksheet/aside/WorkSheetList.vue |  2 +-
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 81127bc..f90a318 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
+import { format } from 'date-fns';
 import { computed, onMounted } from "vue";
 import type { PackageListItem } from "/#/workorder";
-
 defineOptions({ name: "ListItem" });
 
 const props = defineProps({
@@ -14,7 +14,7 @@ const props = defineProps({
     required: true,
   },
   showFieldList: {
-    type: Array,
+    type: Array as any,
     default: () => [],
   },
   dicts: {
@@ -40,29 +40,30 @@ onMounted(async () => {
 
 <template>
   <div class="list-item" :class="{ 'list-item-selected': selected }">
-    <div>
-      <div class="list-item-header">
-        <div style="display: flex">
+    <div v-for="(item, index) in showFieldList" :key="index">
+      <div v-if="item.id === 'name'" class="list-item-header">
+        <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             {{ listItem.name }}
           </span>
-          <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
         </div>
-        <!-- <SvgIcon v-show="selected" size="14" name="more-ver" /> -->
       </div>
-      <ul class="list-item-detail">
-        <li v-for="(key, index) in Object.keys(listItem.search)" :key="index" v-if="listItem.search">
-          <div v-if="getValueByLabel(key)">
-            {{
-              getValueByLabel(key)
-            }}：{{
-              listItem.search[key]
-            }}
-          </div>
+      <ul v-else class="list-item-detail">
+        <li v-if="item.id === 'statshisText'">
+          审批状态：<span class="list-item-status" :class="listItem.statshisText === '通过'
+            ? 'list-item-success'
+            : listItem.statshisText === '不通过'
+              ? 'list-item-error'
+              : 'list-item-watting'
+            ">{{ listItem.statshisText }}</span>
+        </li>
+        <li v-else-if="item.id === 'createdate'">
+          提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
+        </li>
+        <li v-else class="ellipsis">
+          <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}
         </li>
-        <!-- <li>筛选时间：{{ listItem.createTime }}</li>
-        <li>执行人：{{ listItem.createBy }}</li> -->
       </ul>
     </div>
     <!-- <div class="list-item-header">
@@ -92,6 +93,24 @@ onMounted(async () => {
     display: flex;
     align-items: center;
 
+    .id-wrap {
+      display: flex;
+      align-items: center;
+      margin-bottom: 6px
+    }
+
+    .list-item-header-name {
+      width: 226px;
+      font-size: 16px;
+      font-family: PingFang SC, PingFang SC-Medium;
+      font-weight: 700;
+      color: #333333;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin-bottom: 0 0 8px 8px;
+    }
+
     &-name {
       font-size: 16px;
       font-weight: bold;
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 98c8b40..39cb0b7 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -64,7 +64,7 @@ async function loadMore() {
     const more = await fetchList()
     more.forEach(ele=>{
       ele.search = JSON.parse(ele.search)
-      ele.search.createTime = ele.search.submit_date_timestamp
+      // ele.search.createTime = ele.search.submit_date_timestamp
     })
     data.value.push(...more)
   }

From 848f25bd8422e45201d2960546c1a4edc252ec2d Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 28 Mar 2024 14:54:12 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue | 3 +++
 1 file changed, 3 insertions(+)

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

From 94a6398b28176c78052a9b8aa299f8e17e04b97f Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 28 Mar 2024 15:08:33 +0800
Subject: [PATCH 09/11] =?UTF-8?q?feat:=20=E3=80=90=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9--=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=BC=B9=E7=AA=97=E3=80=91=E7=82=B9=E5=87=BB=E5=85=A8?=
 =?UTF-8?q?=E9=80=89=E5=8B=BE=E9=80=89=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8F=96=E6=B6=88=E5=88=97=E8=A1=A8=E4=BB=BB?=
 =?UTF-8?q?=E6=84=8F=E4=B8=80=E4=B8=AA=E6=95=B0=E6=8D=AE=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=EF=BC=8C=E6=AD=A4=E6=97=B6=E4=B8=8A=E9=9D=A2=E5=85=A8=E9=80=89?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E6=9C=AA=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=E9=83=A8=E5=88=86=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BB=8D=E4=B8=BA=E5=85=A8=E9=83=A8=E9=80=89=E4=B8=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/CustomFilterModalVue.vue |  5 ++-
 src/views/task/aside/ListItem.vue             |  2 --
 src/views/task/content/Content.vue            |  3 --
 src/views/task/modal/CustomFieldModal.vue     | 36 ++++++++++++-------
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
index 5728f0e..4164c8e 100644
--- a/src/views/final/comp/CustomFilterModalVue.vue
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -137,13 +137,16 @@ function onCheckAllChange(value) {
   }
 
   selectIds.value = value ? ids : [];
+
+  
 }
 
 function onCheckChange(checked: any, item: any) {
   const index = selectIds.value.indexOf(item.id);
 
   item.checked = checked;
-
+  let currentIndex = offList.value.findIndex(v=>v.id == item.id)
+  offList.value[currentIndex].checked = item.checked;
   if (index === -1 && checked) selectIds.value.push(item.id);
   else selectIds.value.splice(index, 1);
 }
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index 9c6184f..e4c2bc1 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -18,8 +18,6 @@ const props = defineProps({
     default: () => [],
   },
 })
-console.log(props.showFieldList)
-console.log(props.listItem)
 const svgName = computed(() => {
   return props.selected ? 'task-select' : 'task'
 })
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 5901360..0f1f006 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -288,9 +288,6 @@ watch(
   async (newValue, oldValue) => {
     const packageid = taskStore.getPackageid
     const taskId = taskStore.getActiveId
-    console.log(packageid)
-    console.log(taskId)
-
     if (isEmpty(taskId))
       return
     taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index a6f0996..3fa4ca0 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -94,7 +94,15 @@ function generateDefaultList() {
 }
 
 const show = ref(false);
-const checkAll = ref(false);
+const checkAll = computed(()=>{
+  let baseNum = 0;
+  offList.value.map((v) => {
+    if (v.fix) {
+      baseNum += 1;
+    }
+  });
+  return onList.value.length == offList.value.length-baseNum
+});
 
 function showModal() {
   show.value = true;
@@ -140,7 +148,6 @@ function onCheckAllChange(value) {
   for (const item of offShowList.value) {
     if (!item.fix) {
       item.checked = value;
-      ids.push(item.id);
     }
   }
   selectIds.value = value ? ids : [];
@@ -150,7 +157,7 @@ function onCheckAllChange(value) {
         onList.value.push(v);
       }
     });
-    onShowList.value = cloneDeep(onList.value)
+    onShowList.value = cloneDeep(onList.value);
   } else {
     onList.value = [];
     onShowList.value = [];
@@ -159,12 +166,14 @@ function onCheckAllChange(value) {
 
 function onCheckChange(checked: any, item: any) {
   const index = selectIds.value.indexOf(item.id);
-
   item.checked = checked;
-  let currentIndex = offList.value.findIndex(v=>v.id == item.id)
-  offList.value[currentIndex].checked = item.checked;
-  if (index === -1 && checked) selectIds.value.push(item.id);
-  else selectIds.value.splice(index, 1);
+  let currentIndex = offList.value.findIndex((v) => v.id == item.id);
+  offList.value[currentIndex].checked = checked;
+  if (index === -1 && checked) {
+    selectIds.value.push(item.id);
+  } else {
+    selectIds.value.splice(index, 1);
+  }
 }
 
 const showIds = computed(() => {
@@ -207,6 +216,7 @@ watch(
           index--;
         }
       }
+      console.log(onShowList.value, list, "onShowList");
     }
   }
 );
@@ -245,7 +255,7 @@ function removeHandler(id: string) {
 
   index = offList.value.findIndex((v) => v.id == id);
   offList.value[index].checked = false;
-  offShowList.value = cloneDeep(offList.value)
+  offShowList.value = cloneDeep(offList.value);
 }
 const getData = async (type = "") => {
   const userStore = useUser();
@@ -314,7 +324,7 @@ const indeterminate = computed(() => {
       baseNum += 1;
     }
   });
-  return onList.value.length > 0 && offList.value.length - baseNum > onList.value.length;
+  return onShowList.value.length > 0 && offShowList.value.length - baseNum > onShowList.value.length;
 });
 const queryData = (value, type) => {
   if (value) {
@@ -326,11 +336,11 @@ const queryData = (value, type) => {
     }
   } else {
     // getData(type);
-    if(type == "off") {
+    if (type == "off") {
       offShowList.value = cloneDeep(offList.value);
-    }else{
+    } else {
       onShowList.value = cloneDeep(onList.value);
-      fixShowList.value = cloneDeep(fixList.value)
+      fixShowList.value = cloneDeep(fixList.value);
     }
   }
 };

From 3ea601deda4592c39f3c59f4f547717e184899b6 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 28 Mar 2024 15:41:29 +0800
Subject: [PATCH 10/11] =?UTF-8?q?feat:=20=E5=AE=A1=E6=A0=B8=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E5=92=8C=E4=B8=8D=E5=90=8C=E6=84=8F=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue    | 183 +++++++++++++++++----
 src/views/worksheet/modal/ConfrimModal.vue |  69 ++++++--
 2 files changed, 199 insertions(+), 53 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 2dc3ffb..d7eb679 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { audit } from '@/api/task/task';
 import {
 clearTF, getTaskDetailInfo,
 getTaskDetailPictureList,
@@ -10,6 +11,7 @@ import { useWorkOrder } from "@/store/modules/workOrder";
 import { isEmpty } from "@/utils";
 import { formatToDateHMS } from "@/utils/dateUtil";
 import { hideDownload } from "@/utils/image";
+import emitter from '@/utils/mitt';
 import { useInfiniteScroll } from "@vueuse/core";
 import { format } from 'date-fns';
 import imagesloaded from "imagesloaded";
@@ -17,7 +19,7 @@ import { clone, debounce, pickBy } from "lodash-es";
 import { useDialog, useMessage } from "naive-ui";
 import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
 import ConfrimModal from "../modal/ConfrimModal.vue";
-import type { SetTFParam, SimilarityPictureSortParam } from "/#/api";
+import type { ApprovalParam, SetTFParam, SimilarityPictureSortParam } from "/#/api";
 
 const batch = ref(false);
 const selectItems = ref<any[]>([]);
@@ -399,6 +401,102 @@ function previewHandler(event: MouseEvent) {
   if (imageRef.value && (imageRef.value as any).src)
     (imageRef.value as any).mergedOnClick();
 }
+function rejectHandler(items?: any) {
+  let cloneItem: any
+  if (batch.value) {
+    processItems = selectItems.value
+  }
+  else if (overTask.value) {
+    cloneItem = clone(overTask.value)
+    processItems = [cloneItem]
+  }
+
+  if (items !== undefined && !(items instanceof PointerEvent))
+    processItems = items
+
+  const msg = validate(processItems)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+
+  const modal = unref(confrimModalRef)! as any
+  modal.showModal()
+}
+function reject(idOrDesc: string, backId: string, isOther: boolean) {
+  const formIds: string[] = processItems.map(item => item.id)
+  const taskIds: string[] = processItems.map(item => item.taskId)
+  const tasknames: string[] = processItems.map(item => item.taskname)
+
+  const param: ApprovalParam = {
+    formid: formIds,
+    taskId: taskIds,
+    approvd: false,
+    taskComment: idOrDesc,
+    taskname: isOther ? tasknames : ['其他'],
+  }
+
+  doAudit(param)
+}
+function doAudit(param: any) {
+  audit(param).then((res) => {
+    const { code } = res
+    setBatch(false)
+    if (code === 'OK'){
+      emitter.emit('refresh')
+      refreshHandler()
+    }
+    else message.error(res.message)
+  })
+}
+
+function approvalHandler(items?: any) {
+  let cloneItem: any
+  if (batch.value) {
+    processItems = selectItems.value
+  }
+  else if (overTask.value) {
+    cloneItem = clone(overTask.value)
+    processItems = [cloneItem]
+  }
+
+  if (items !== undefined && !(items instanceof PointerEvent))
+    processItems = items
+
+  const msg = validate(processItems)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+
+  dialog.info({
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      approval()
+    },
+    onNegativeClick: () => {},
+  })
+}
+function approval() {
+  const formIds: string[] = processItems.map(item => item.id)
+  const taskIds: string[] = processItems.map(item => item.taskId)
+  const tasknames: string[] = processItems.map(item => item.taskname)
+
+  const param: ApprovalParam = {
+    formid: formIds,
+    taskId: taskIds,
+    approvd: true,
+    taskComment: 'approval',
+    taskname: tasknames,
+  }
+
+  doAudit(param)
+}
 </script>
 
 <template>
@@ -411,15 +509,17 @@ function previewHandler(event: MouseEvent) {
       </div>
       <div class="right">
         <div v-show="!showActions" style="display: flex; align-items: center">
-          <n-button text @click="clearHandler">
-            <SvgIcon size="12" name="delete" />
-            清除标记
-          </n-button>
           <div class="btn" style="margin: 0px 10px" @click="setBatch(true)">
             <SvgIcon style="margin-right: 6px" size="14" name="tf" />
-            辨别真假
+            批量审批
+          </div>
+          <div class="icon-wrap">
+            <SvgIcon
+              size="20"
+              name="immersion-model"
+              @click="immersionHandler"
+            />
           </div>
-          <SvgIcon style="cursor: pointer" size="20" name="immersion-model" @click="immersionHandler" />
         </div>
 
         <div v-show="showActions" class="batch">
@@ -429,12 +529,15 @@ function previewHandler(event: MouseEvent) {
             </template>
             返回
           </n-button>
-          <div style="cursor: pointer; margin-left: 16px" @click="falseHandler">
-            <SvgIcon width="64" height="28" name="t4" />
+          <div
+            style="cursor: pointer; margin-left: 16px"
+            @click.stop="rejectHandler"
+          >
+            <SvgIcon width="64" height="28" name="a1" />
           </div>
           <SvgIcon size="24" name="vs" />
-          <div style="cursor: pointer" @click="trueHandler">
-            <SvgIcon width="64" height="28" name="t3" />
+          <div style="cursor: pointer" @click.stop="approvalHandler">
+            <SvgIcon width="64" height="28" name="a2" />
           </div>
         </div>
       </div>
@@ -446,13 +549,6 @@ function previewHandler(event: MouseEvent) {
           <!-- 左侧大图 图片信息 -->
           <div class="left" :style="{ 'background-image': `url(${taskDetailInfo?.imgurl})` }" @click="showAction"
             @mouseleave="leaveTaskHandler">
-            <!-- 真假标记 -->
-            <div class="mark">
-              <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
-            </div>
-            <div class="mark">
-              <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 1" size="128" name="zhen" />
-            </div>
             <div class="footer-times">
               <div class="time" style="margin-bottom: 4px;">
                 <SvgIcon color="#FFF" size="16" name="camera" />
@@ -507,8 +603,8 @@ function previewHandler(event: MouseEvent) {
             </div>
             <!-- 操作 -->
             <div v-show="overTask && overTask.id === taskDetailInfo.id" class="action" @click.stop="hideAction">
-              <SvgIcon style="cursor: pointer" name="t1" @click.stop="trueHandler" />
-              <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="falseHandler" />
+              <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
+              <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="rejectHandler" />
             </div>
           </div>
           <!-- 右侧任务 标题信息 -->
@@ -516,8 +612,10 @@ function previewHandler(event: MouseEvent) {
             <n-scrollbar style="max-height: 100%">
               <span class="task-name">任务ID：{{ taskDetailInfo.taskname }}</span>
               <div class="tags">
-                <div class="tag tag-approved">已审批</div>
-                <div class="tag tag-passed">通过</div>
+                <div class="tag tag-submiting" v-if="taskDetailInfo.states==1">{{ TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
+                <div class="tag tag-approve" v-else-if="taskDetailInfo.states==2">{{ TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
+                <div class="tag tag-passed" v-else-if="taskDetailInfo.states==3">{{ TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
+                <div class="tag tag-approved" v-else-if="taskDetailInfo.states==4">{{ TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
               </div>
               <n-divider class="divider-line" />
               <div class="property">
@@ -614,30 +712,27 @@ function previewHandler(event: MouseEvent) {
                 {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}%
               </div>
             </div>
-            <div class="pass-status" v-if="item.historyStates === 1">
-              <SvgIcon name="repeat-icon" style="width:52;height:24px" />
-            </div>
-            <div class="pass-status" v-else-if="item.historyStates === 2">
+      
+            <div class="pass-status" v-if="item.historyStates === 2">
               <SvgIcon name="pass-icon" style="width:52;height:24px" />
             </div>
             <div class="pass-status" v-else-if="item.historyStates === 3">
               <SvgIcon name="no-pass-icon" style="width:52;height:24px" />
             </div>
-            <!-- <div class="mark">
-              <SvgIcon name="jia" />
-            </div>
-            <div class="mark">
-              <SvgIcon  name="zhen" />
+            <!-- 
+              重复标签
+            <div class="pass-status" v-if="item.historyStates === 1">
+              <SvgIcon name="repeat-icon" style="width:52;height:24px" />
             </div> -->
             <div v-show="overTask && overTask.id === item.id" class="action">
-              <SvgIcon style="cursor: pointer" name="t1" @click.stop="trueHandler" />
-              <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="falseHandler" />
+              <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
+              <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="rejectHandler" />
             </div>
           </div>
         </div>
       </div>
     </n-spin>
-    <ConfrimModal ref="confrimModalRef" @commit="setFalse" />
+    <ConfrimModal ref="confrimModalRef" @commit="reject" />
   </div>
 </template>
 
@@ -819,6 +914,17 @@ function previewHandler(event: MouseEvent) {
         padding: 16px 0 0 23px;
         color: #fff;
       }
+      .icon-wrap{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 30px;
+        height: 30px;
+        background: rgba(80,122,253,.1);
+        border-radius: 8px;
+        margin-left: 10px;
+        cursor: pointer;
+      }
 
       .img-info {
         color: lime !important;
@@ -914,7 +1020,14 @@ function previewHandler(event: MouseEvent) {
         font-size: 12px;
         line-height: 16px;
       }
-
+      .tag-submiting{
+        color: #feaf2d;
+        border: 1px solid #feaf2d;
+      }
+      .tag-approve{
+        color: #398ade;
+        border: 1px solid #398ade;
+      }
       .tag-passed {
         color: #02C984;
         border: 1px solid #02C984;
diff --git a/src/views/worksheet/modal/ConfrimModal.vue b/src/views/worksheet/modal/ConfrimModal.vue
index 2d32de3..9f0daa3 100644
--- a/src/views/worksheet/modal/ConfrimModal.vue
+++ b/src/views/worksheet/modal/ConfrimModal.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import { computed, onBeforeMount, ref } from 'vue'
-import { useDictionary } from '@/store/modules/dictonary'
+import { useDictionary } from '@/store/modules/dictonary';
+import { computed, onBeforeMount, ref, unref } from 'vue';
 
 const emit = defineEmits<{
-  (e: 'commit', id: any, desc: null | string)
+  (e: 'commit', rejectId: any, backId: any, isOther: boolean)
 }>()
 
 const dictonaryStore = useDictionary()
@@ -27,29 +27,49 @@ defineExpose({
   showModal,
 })
 
-const options = ref<any[]>([])
-
-const selectId = ref(null)
+const backOptions = ref<any[]>([])
+const reasonOptions = ref<any[]>([])
+const selectBackId = ref(null)
+const selectRejectId = ref(null)
+const selectItem = ref(null)
 const otherValue = ref(null)
 const showOther = computed(() => {
-  for (const item of options.value) {
-    if (item.value === selectId.value && item.label === '其他')
-      return true
-  }
+  return (selectItem.value as any)?.label === '其他'
+})
 
-  return false
+const comomitValue = computed(() => {
+  return (selectItem.value as any)?.label === '其他' ? otherValue.value : selectRejectId.value
 })
 
 async function handleSumbit(e: MouseEvent) {
   e.preventDefault()
   closeModal()
-  emit('commit', selectId.value, otherValue.value)
+  // selectRejectId.value === 'other'
+  emit('commit', unref(comomitValue), unref(selectBackId), showOther.value)
 }
 
 onBeforeMount(async () => {
-  const tfList = await dictonaryStore.fetchTFList()
-  options.value = tfList
+  const rejectList = await dictonaryStore.fetchTFList()
+  const backList = await dictonaryStore.fetchBackList()
+
+  reasonOptions.value = rejectList
+  backOptions.value = backList
+
+  // TODO 删除此项 通过name=其他 判断
+  // 添加其他选项
+  // reasonOptions.value.push({
+  //   label: '其他',
+  //   value: 'other',
+  // })
 })
+
+async function selectChange(id){
+  console.log(id,'selectChange')
+  selectItem.value = reasonOptions.value.find(v=>v.id == id);
+
+
+}
+
 </script>
 
 <template>
@@ -57,7 +77,7 @@ onBeforeMount(async () => {
     <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
       <div class="wrapper">
         <div class="wrapper-header">
-          <span class="wrapper-left">选择判假原因</span>
+          <span class="wrapper-left">选择不通过原因</span>
           <div class="wrapper-right">
             <div class="wrapper-right-close" @pointerdown="closeModal">
               <div class="wrapper-right-icon" />
@@ -65,10 +85,23 @@ onBeforeMount(async () => {
           </div>
         </div>
         <div class="wrapper-content">
-          <span>判假原因</span>
-          <n-select filterable v-model:value="selectId" style="margin-top: 10px;" :options="options" />
-          <n-input v-show="showOther" v-model:value="otherValue" style="margin-top: 10px;" type="textarea" />
+          <span>处理方式</span>
+          <n-select filterable v-model:value="selectBackId" style="margin-top: 10px;" :options="backOptions" />
+        </div>
+        <div class="wrapper-content">
+          <span>不通过原因</span>
+          <n-select filterable v-model:value="selectRejectId" @change="selectChange" style="margin-top: 10px;" :options="reasonOptions" />
+          <n-input v-show="showOther" v-model:value="otherValue" type="textarea" placeholder="备注内容" style="margin-top: 10px;" />
         </div>
+
+
+
+        <!-- <div class="wrapper-content">
+          <n-input
+          type="textarea"
+          placeholder="备注内容" v-model="showOther"></n-input>
+        </div> -->
+
       </div>
       <template #footer>
         <div class="wrapper-footer">

From a6082c65c85e2976058bfee367ccfe48ccbfec63 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 28 Mar 2024 15:43:58 +0800
Subject: [PATCH 11/11] =?UTF-8?q?refactor:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components.d.ts b/components.d.ts
index 896d6e9..06ebe68 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -27,7 +27,6 @@ declare module 'vue' {
     NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
-    NIcon: typeof import('naive-ui')['NIcon']
     NImage: typeof import('naive-ui')['NImage']
     NInput: typeof import('naive-ui')['NInput']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']