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

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

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