From 9d147ee263b6e7c1baa0b17a3f872c9e71c346cb Mon Sep 17 00:00:00 2001
From: dk <1260500659@qq.com>
Date: Thu, 2 Jul 2026 16:34:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(feedback):=20=E5=A2=9E=E5=8A=A0=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=90=9C=E7=B4=A2=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20-=20=E5=9C=A8=E5=8F=8D=E9=A6=88=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=84=E4=BB=B6=E4=B8=AD=E5=BC=95=E5=85=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AD=97=E5=85=B8=E9=80=89=E9=A1=B9=20-=20=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=90=9C=E7=B4=A2=E5=8C=BA=E5=9F=9F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E9=80=89=E6=8B=A9=E5=99=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20-=20=E8=AE=BE=E7=BD=AE=E5=8F=8D=E9=A6=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=9D=E5=A7=8B=E6=90=9C=E7=B4=A2=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81=E5=80=BC=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(personal-center): 限制已完成项目的编辑操作
- 根据项目完成状态动态控制编辑按钮的显示
- 从个人中心我的项目详情对话框中移除已完成项目的操作权限

refactor(project): 优化任务操作权限控制逻辑
- 移除原有的任务权限钩子函数依赖
- 使用当前用户身份直接判断任务操作权限
- 只有任务负责人才能进行编辑和删除操作
- 已完成任务不可编辑
- 重构成更清晰的任务操作按钮显示逻辑

fix(project): 完成任务禁用工时记录删除功能
- 添加计算属性控制完成状态下的工时记录删除权限
- 在工时记录面板中根据任务状态控制删除操作的显示
---
 src/views/feedback/index.vue                  |  2 +-
 .../feedback/modules/feedback-search.vue      | 12 ++-
 src/views/personal-center/my-item/index.vue   | 26 +++---
 .../modules/personal-item-detail-dialog.vue   |  5 +-
 .../execution/composables/use-task-actions.ts | 91 ++++---------------
 .../execution/modules/task-worklog-panel.vue  | 49 +++++-----
 6 files changed, 74 insertions(+), 111 deletions(-)

diff --git a/src/views/feedback/index.vue b/src/views/feedback/index.vue
index 5c5175b..6ed1809 100644
--- a/src/views/feedback/index.vue
+++ b/src/views/feedback/index.vue
@@ -45,7 +45,7 @@ function canEditRow(row: Api.Feedback.FeedbackItem) {
 }
 
 function getInitSearchParams(): Api.Feedback.FeedbackSearchParams {
-  return { pageNo: 1, pageSize: 20, type: undefined, status: undefined, title: undefined, creator: undefined };
+  return { pageNo: 1, pageSize: 20, type: undefined, status: 1, title: undefined, creator: undefined };
 }
 
 function transformPageResult(
diff --git a/src/views/feedback/modules/feedback-search.vue b/src/views/feedback/modules/feedback-search.vue
index 135c9bf..1029942 100644
--- a/src/views/feedback/modules/feedback-search.vue
+++ b/src/views/feedback/modules/feedback-search.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
+import { FEEDBACK_STATUS_DICT_CODE } from '@/constants/dict';
 import { fetchGetUserSimpleList } from '@/service/api';
+import { useDict } from '@/hooks/business/dict';
 import TableSearchFields, { type SearchField } from '@/components/custom/table-search-fields.vue';
 
 defineOptions({ name: 'FeedbackSearch' });
@@ -14,8 +16,9 @@ const model = defineModel<Api.Feedback.FeedbackSearchParams>('model', { required
 
 // 提交人下拉选项（全员简易列表；value 取用户 id，ID 铁律 string）
 const userOptions = ref<{ label: string; value: string }[]>([]);
+const { dictOptions: statusOptions } = useDict(FEEDBACK_STATUS_DICT_CODE);
 
-// 分类 / 状态筛选已迁移至左侧分面面板，搜索区保留标题关键词 + 提交人
+// 分类保留在左侧分面；搜索区补充标题关键词、提交人、状态
 const fields = computed<SearchField[]>(() => [
   { key: 'title', label: '标题', type: 'input', placeholder: '请输入标题关键词' },
   {
@@ -25,6 +28,13 @@ const fields = computed<SearchField[]>(() => [
     placeholder: '请选择提交人',
     filterable: true,
     options: userOptions.value
+  },
+  {
+    key: 'status',
+    label: '状态',
+    type: 'select',
+    placeholder: '请选择状态',
+    options: statusOptions.value
   }
 ]);
 
diff --git a/src/views/personal-center/my-item/index.vue b/src/views/personal-center/my-item/index.vue
index 73a7295..5f1872b 100644
--- a/src/views/personal-center/my-item/index.vue
+++ b/src/views/personal-center/my-item/index.vue
@@ -281,17 +281,21 @@ function buildRowActions(row: Api.PersonalItem.PersonalItem): PersonalItemRowAct
       type: 'primary',
       onClick: async () => openDetail(row, 'worklog')
     },
-    {
-      key: 'edit',
-      tooltip: '编辑',
-      icon: markRaw(IconMdiPencilOutline),
-      type: 'primary',
-      onClick: async () => {
-        operateType.value = 'edit';
-        editingData.value = row;
-        openOperateDialog();
-      }
-    },
+    ...(!isCompleted
+      ? ([
+          {
+            key: 'edit',
+            tooltip: '编辑',
+            icon: markRaw(IconMdiPencilOutline),
+            type: 'primary',
+            onClick: async () => {
+              operateType.value = 'edit';
+              editingData.value = row;
+              openOperateDialog();
+            }
+          }
+        ] satisfies PersonalItemRowAction[])
+      : []),
     ...(!isCompleted
       ? ([
           {
diff --git a/src/views/personal-center/my-item/modules/personal-item-detail-dialog.vue b/src/views/personal-center/my-item/modules/personal-item-detail-dialog.vue
index e34d0b7..b4165cf 100644
--- a/src/views/personal-center/my-item/modules/personal-item-detail-dialog.vue
+++ b/src/views/personal-center/my-item/modules/personal-item-detail-dialog.vue
@@ -81,10 +81,7 @@ const totalHoursText = computed(() => {
 });
 const canSubmitWorklog = computed(() =>
   Boolean(
-    detailData.value?.id &&
-      (detailData.value.statusCode === 'pending' ||
-        detailData.value.statusCode === 'active' ||
-        detailData.value.statusCode === 'completed')
+    detailData.value?.id && (detailData.value.statusCode === 'pending' || detailData.value.statusCode === 'active')
   )
 );
 
diff --git a/src/views/project/project/execution/composables/use-task-actions.ts b/src/views/project/project/execution/composables/use-task-actions.ts
index 11ae868..b4f70aa 100644
--- a/src/views/project/project/execution/composables/use-task-actions.ts
+++ b/src/views/project/project/execution/composables/use-task-actions.ts
@@ -1,13 +1,8 @@
-import { markRaw } from 'vue';
-import { useTaskPermissions } from './use-task-permissions';
-import IconMdiCheckCircleOutline from '~icons/mdi/check-circle-outline';
+import { computed, markRaw } from 'vue';
+import { useAuthStore } from '@/store/modules/auth';
 import IconMdiClipboardEditOutline from '~icons/mdi/clipboard-edit-outline';
-import IconMdiCloseCircleOutline from '~icons/mdi/close-circle-outline';
 import IconMdiDeleteOutline from '~icons/mdi/delete-outline';
-import IconMdiPause from '~icons/mdi/pause';
 import IconMdiPencilOutline from '~icons/mdi/pencil-outline';
-import IconMdiRestart from '~icons/mdi/restart';
-import IconMdiSync from '~icons/mdi/sync';
 
 export interface TaskAction {
   key: string;
@@ -27,43 +22,22 @@ export interface TaskActionEmits {
   ) => void;
 }
 
-const STATUS_ACTION_ICON_MAP: Record<string, object> = {
-  pause: markRaw(IconMdiPause),
-  complete: markRaw(IconMdiCheckCircleOutline),
-  resume: markRaw(IconMdiRestart),
-  cancel: markRaw(IconMdiCloseCircleOutline)
-};
-
-// 状态推进按钮 type 映射（对齐执行 execution-section.vue 同源语义）：
-// cancel 破坏性=红，pause 中断=橙，complete 完结=绿，resume 主动作=蓝
-const STATUS_ACTION_TYPE_MAP: Record<string, TaskAction['type']> = {
-  cancel: 'danger',
-  pause: 'warning',
-  complete: 'success',
-  resume: 'primary'
-};
-
-// 同一状态下多个推进按钮的展示顺序，与执行侧保持一致：暂停 → 取消 → 完成 → 恢复
-const STATUS_ACTION_ORDER: Record<string, number> = {
-  pause: 1,
-  cancel: 2,
-  complete: 3,
-  resume: 4
-};
-
 /**
  * 任务行操作按钮的集中装配。
  *
- * 表格操作列与看板卡片操作区共用同一份语义：填报 / 编辑 / 删除 / 状态推进按钮，
- * 含 auto_start 过滤、complete 进度 100% 兜底、按钮排序与 icon/type 映射。
+ * 只在这里收口任务行按钮的最终显示口径，不改动底层子任务 / 父任务负责人 / 执行负责人那套权限体系：
+ * - 当前用户是任务负责人（task.ownerId）: 显示 填报 / 编辑 / 删除
+ * - 当前用户是协办人（task.assignees[].userId）: 只显示 填报
+ * - 都不是: 也显示 填报
  */
 export function useTaskActions(emits: TaskActionEmits) {
-  const { canEditTask, canDeleteTask } = useTaskPermissions();
+  const authStore = useAuthStore();
+  const currentUserId = computed(() => authStore.userInfo.userId || '');
 
   function createActions(row: Api.Project.ProjectTask): TaskAction[] {
     const actions: TaskAction[] = [];
+    const isOwner = Boolean(currentUserId.value) && row.ownerId === currentUserId.value;
 
-    // 填报:行操作入口始终显示——查看人人可看;新增/编辑由弹层内 canSubmit 按身份与状态控制
     actions.push({
       key: 'report',
       tooltip: '填报',
@@ -72,7 +46,11 @@ export function useTaskActions(emits: TaskActionEmits) {
       onClick: () => emits.report(row)
     });
 
-    if (canEditTask(row)) {
+    if (!isOwner) {
+      return actions;
+    }
+
+    if (row.statusCode !== 'completed') {
       actions.push({
         key: 'edit',
         tooltip: '编辑',
@@ -82,41 +60,12 @@ export function useTaskActions(emits: TaskActionEmits) {
       });
     }
 
-    if (canDeleteTask(row)) {
-      actions.push({
-        key: 'delete',
-        tooltip: '删除',
-        icon: markRaw(IconMdiDeleteOutline),
-        type: 'danger',
-        onClick: () => emits.remove(row)
-      });
-    }
-
-    if (!row.availableActions.length) {
-      return actions;
-    }
-
-    // 排序：暂停 → 取消 → 完成 → 恢复（对齐执行）
-    const sortedActions = [...row.availableActions].sort(
-      (a, b) => (STATUS_ACTION_ORDER[a.actionCode] ?? 99) - (STATUS_ACTION_ORDER[b.actionCode] ?? 99)
-    );
-
-    sortedActions.forEach(action => {
-      // auto_start 由后端在填工时时自动触发，无手工开始通道；防御后端误下发，前端不渲染
-      if (action.actionCode === 'auto_start') {
-        return;
-      }
-      // 完成任务至少要求任务进度达到 100%；父级提交入口仍保留同样兜底校验
-      if (action.actionCode === 'complete' && row.progressRate < 100) {
-        return;
-      }
-      actions.push({
-        key: `status-${action.actionCode}`,
-        tooltip: action.actionName,
-        icon: markRaw(STATUS_ACTION_ICON_MAP[action.actionCode] ?? IconMdiSync),
-        type: STATUS_ACTION_TYPE_MAP[action.actionCode] ?? 'primary',
-        onClick: () => emits.statusAction(row, action)
-      });
+    actions.push({
+      key: 'delete',
+      tooltip: '删除',
+      icon: markRaw(IconMdiDeleteOutline),
+      type: 'danger',
+      onClick: () => emits.remove(row)
     });
 
     return actions;
diff --git a/src/views/project/project/execution/modules/task-worklog-panel.vue b/src/views/project/project/execution/modules/task-worklog-panel.vue
index 826f4fe..8503011 100644
--- a/src/views/project/project/execution/modules/task-worklog-panel.vue
+++ b/src/views/project/project/execution/modules/task-worklog-panel.vue
@@ -256,6 +256,7 @@ const canCreate = computed(() => Boolean(props.canSubmit && props.taskId));
 const isWorklogMutableStatus = computed(
   () => props.taskStatusCode === 'active' || props.taskStatusCode === 'completed'
 );
+const showDeleteAction = computed(() => props.taskStatusCode !== 'completed');
 
 function canEditRow(row: Api.Project.TaskWorklog) {
   return Boolean(isWorklogMutableStatus.value && currentUserId.value && row.userId === currentUserId.value);
@@ -706,31 +707,33 @@ watch(
                 </ElButton>
               </span>
             </ElTooltip>
-            <ElPopconfirm
-              v-if="canDeleteRow(row)"
-              title="确认删除该条工时记录？"
-              confirm-button-text="删除"
-              cancel-button-text="取消"
-              confirm-button-type="danger"
-              @confirm="handleDelete(row)"
-            >
-              <template #reference>
+            <template v-if="showDeleteAction">
+              <ElPopconfirm
+                v-if="canDeleteRow(row)"
+                title="确认删除该条工时记录？"
+                confirm-button-text="删除"
+                cancel-button-text="取消"
+                confirm-button-type="danger"
+                @confirm="handleDelete(row)"
+              >
+                <template #reference>
+                  <span class="inline-flex">
+                    <ElTooltip content="删除">
+                      <ElButton link type="danger" class="task-worklog-panel__action-btn">
+                        <IconMdiDeleteOutline class="text-15px" />
+                      </ElButton>
+                    </ElTooltip>
+                  </span>
+                </template>
+              </ElPopconfirm>
+              <ElTooltip v-else content="仅可删除本人填报">
                 <span class="inline-flex">
-                  <ElTooltip content="删除">
-                    <ElButton link type="danger" class="task-worklog-panel__action-btn">
-                      <IconMdiDeleteOutline class="text-15px" />
-                    </ElButton>
-                  </ElTooltip>
+                  <ElButton link type="danger" class="task-worklog-panel__action-btn" disabled>
+                    <IconMdiDeleteOutline class="text-15px" />
+                  </ElButton>
                 </span>
-              </template>
-            </ElPopconfirm>
-            <ElTooltip v-else content="仅可删除本人填报">
-              <span class="inline-flex">
-                <ElButton link type="danger" class="task-worklog-panel__action-btn" disabled>
-                  <IconMdiDeleteOutline class="text-15px" />
-                </ElButton>
-              </span>
-            </ElTooltip>
+              </ElTooltip>
+            </template>
           </div>
         </template>
       </ElTableColumn>