From 8cd4669b90dc0470a8ce36881323538ae50a1303 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 21 May 2026 05:01:15 +0000
Subject: [PATCH] =?UTF-8?q?refactor(manage):=20=E9=83=A8=E9=97=A8=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E5=8F=AA=E8=AF=BB=E8=A7=86=E8=A7=92=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8=E7=A6=81=E7=94=A8=E6=80=81UserSelec?=
 =?UTF-8?q?t=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

用 disabled 属性的 UserSelect 替代独立的 UserAvatar 只读展示，
消除双份渲染逻辑，负责人/协助人员/可见人员统一使用同一组件路径。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 resources/assets/js/components/UserSelect.vue |  4 ++--
 .../js/pages/manage/components/TaskDetail.vue | 24 +++++--------------
 .../assets/sass/components/user-select.scss   |  6 +++++
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/resources/assets/js/components/UserSelect.vue b/resources/assets/js/components/UserSelect.vue
index f33d45f91..e35786e9f 100755
--- a/resources/assets/js/components/UserSelect.vue
+++ b/resources/assets/js/components/UserSelect.vue
@@ -6,7 +6,7 @@
                     <UserAvatar :userid="userid" :size="avatarSize" :show-icon="avatarIcon" :show-name="avatarName"/>
                 </li>
             </template>
-            <li v-if="addIcon || values.length === 0" class="add-icon" :style="addStyle" @click="onSelection"></li>
+            <li v-if="!disabled && (addIcon || values.length === 0)" class="add-icon" :style="addStyle" @click="onSelection"></li>
         </ul>
 
         <Modal
@@ -300,7 +300,6 @@ export default {
             type: Boolean,
             default: false
         },
-
         // 仅显示群组
         onlyGroup: {
             type: Boolean,
@@ -442,6 +441,7 @@ export default {
                 'select-module': this.module,
                 'select-border': this.border,
                 'select-whole': this.isWhole,
+                'select-disabled': this.disabled,
             }
         },
 
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index c3b6c3ce8..d840d7f3d 100755
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -52,7 +52,7 @@
             {{expiresFormat(taskDetail.end_at)}}
         </div>
         <UserSelect
-            v-if="!isDepartmentReadonly"
+            v-if="!isDepartmentReadonly || (ownerData.owner_userid && ownerData.owner_userid.length > 0)"
             class="subtask-avatar"
             v-model="ownerData.owner_userid"
             :multiple-max="10"
@@ -60,12 +60,8 @@
             :title="$L('修改负责人')"
             :add-icon="false"
             :project-id="taskDetail.project_id"
+            :disabled="isDepartmentReadonly"
             :before-submit="onOwner"/>
-        <UserAvatar
-            v-else-if="ownerData.owner_userid && ownerData.owner_userid.length > 0"
-            class="subtask-avatar readonly-avatar"
-            :userid="ownerData.owner_userid[0]"
-            :size="20"/>
     </li>
     <!--主任务-->
     <div
@@ -207,11 +203,7 @@
                         <div class="item-label" slot="label">
                             <i class="taskfont">&#xe6e4;</i>{{$L('负责人')}}
                         </div>
-                        <div v-if="isDepartmentReadonly" class="item-content user readonly-users">
-                            <UserAvatar v-for="item in getOwner" :key="item.userid" :userid="item.userid" :size="28" showName/>
-                        </div>
                         <UserSelect
-                            v-else
                             class="item-content user"
                             v-model="ownerData.owner_userid"
                             :multiple-max="10"
@@ -219,17 +211,14 @@
                             :title="$L('修改负责人')"
                             :project-id="taskDetail.project_id"
                             :add-icon="false"
+                            :disabled="isDepartmentReadonly"
                             :before-submit="onOwner"/>
                     </FormItem>
                     <FormItem v-if="getAssist.length > 0 || assistForce">
                         <div class="item-label" slot="label">
                             <i class="taskfont">&#xe63f;</i>{{$L('协助人员')}}
                         </div>
-                        <div v-if="isDepartmentReadonly" class="item-content user readonly-users">
-                            <UserAvatar v-for="item in getAssist" :key="item.userid" :userid="item.userid" :size="28" showName/>
-                        </div>
                         <UserSelect
-                            v-else
                             ref="assist"
                             class="item-content user"
                             v-model="assistData.assist_userid"
@@ -239,6 +228,7 @@
                             :project-id="taskDetail.project_id"
                             :disabled-choice="assistData.disabled"
                             :add-icon="false"
+                            :disabled="isDepartmentReadonly"
                             :before-submit="onAssist"/>
                     </FormItem>
                     <FormItem v-if="taskDetail.visibility > 1 || visibleForce || visibleKeep">
@@ -248,17 +238,15 @@
                         </div>
                         <div class="item-content user">
                             <span v-if="taskDetail.visibility == 1 || taskDetail.visibility == 2" ref="visibilityText" class="visibility-text" @click="!isDepartmentReadonly && showCisibleDropdown($event)">{{ taskDetail.visibility == 1 ? $L('项目人员可见') : $L('任务人员可见') }}</span>
-                            <UserSelect v-else-if="!isDepartmentReadonly"
+                            <UserSelect v-else
                                 ref="visibleUserSelectRef"
                                 v-model="taskDetail.visibility_appointor"
                                 :avatar-size="28"
                                 :title="$L('选择指定人员')"
                                 :project-id="taskDetail.project_id"
                                 :add-icon="false"
+                                :disabled="isDepartmentReadonly"
                                 @on-show-change="visibleUserSelectShowChange"/>
-                            <div v-else class="readonly-users">
-                                <UserAvatar v-for="userid in taskDetail.visibility_appointor" :key="userid" :userid="userid" :size="28" showName/>
-                            </div>
                         </div>
                     </FormItem>
                     <FormItem v-if="taskDetail.end_at || timeForce">
diff --git a/resources/assets/sass/components/user-select.scss b/resources/assets/sass/components/user-select.scss
index 840ecb40d..7879a1939 100755
--- a/resources/assets/sass/components/user-select.scss
+++ b/resources/assets/sass/components/user-select.scss
@@ -9,6 +9,12 @@
         padding: 0 6px;
     }
 
+    &.select-disabled {
+        > ul > li {
+            cursor: default;
+        }
+    }
+
     > ul {
         display: flex;
         flex-direction: row;