From a650f6e96d3ea6568e30bf94b1059e6f1a2bfc75 Mon Sep 17 00:00:00 2001
From: dk <1260500659@qq.com>
Date: Tue, 30 Jun 2026 11:55:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E3=80=81=E4=BA=A7=E5=93=81/=E9=A1=B9=E7=9B=AE=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?):=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/personal-center/my-item/index.vue   |  86 +++++----
 .../personal-item-bind-execution-dialog.vue   | 181 ++++++++++++++----
 .../modules/personal-item-detail-dialog.vue   |   2 +-
 .../modules/personal-item-operate-dialog.vue  |   6 +-
 src/views/project/list/index.vue              |   4 +-
 .../execution/composables/use-task-actions.ts |   4 +-
 src/views/project/project/execution/index.vue |   8 +-
 .../composables/use-workbench-colors.ts       |   2 +-
 src/views/workbench/homepage.ts               |  12 +-
 .../workbench/modules/workbench-team-load.vue |   2 +-
 .../modules/workbench-todo-panel.vue          | 175 +++++++++++++++--
 11 files changed, 373 insertions(+), 109 deletions(-)

diff --git a/src/views/personal-center/my-item/index.vue b/src/views/personal-center/my-item/index.vue
index 74736d4..73a7295 100644
--- a/src/views/personal-center/my-item/index.vue
+++ b/src/views/personal-center/my-item/index.vue
@@ -255,9 +255,9 @@ function openView(row: Api.PersonalItem.PersonalItem) {
 function buildRowActions(row: Api.PersonalItem.PersonalItem): PersonalItemRowAction[] {
   currentStatusItem.value = row;
 
+  const isCompleted = row.statusCode === 'completed';
   const rawLifecycleActions = [...(row.availableActions ?? [])];
   const pauseAction = rawLifecycleActions.find(action => action.actionCode === 'pause') ?? null;
-  const cancelAction = rawLifecycleActions.find(action => action.actionCode === 'cancel') ?? null;
   const completeAction = rawLifecycleActions.find(action => action.actionCode === 'complete') ?? null;
 
   const lifecycleActions = rawLifecycleActions
@@ -292,26 +292,30 @@ function buildRowActions(row: Api.PersonalItem.PersonalItem): PersonalItemRowAct
         openOperateDialog();
       }
     },
-    {
-      key: 'delete',
-      tooltip: '删除',
-      icon: markRaw(IconMdiDeleteOutline),
-      type: 'danger',
-      onClick: async () => handleDelete(row)
-    },
-    {
-      key: 'status-pause',
-      tooltip: pauseAction?.actionName ?? '暂停',
-      icon: markRaw(IconMdiPause),
-      type: 'warning',
-      disabled: !pauseAction,
-      onClick: async () =>
-        handleStatusAction(row, {
-          actionCode: pauseAction?.actionCode ?? 'pause',
-          actionName: pauseAction?.actionName ?? '暂停',
-          needReason: pauseAction?.needReason ?? false
-        })
-    },
+    ...(!isCompleted
+      ? ([
+          {
+            key: 'delete',
+            tooltip: '删除',
+            icon: markRaw(IconMdiDeleteOutline),
+            type: 'danger',
+            onClick: async () => handleDelete(row)
+          },
+          {
+            key: 'status-pause',
+            tooltip: pauseAction?.actionName ?? '暂停',
+            icon: markRaw(IconMdiPause),
+            type: 'warning',
+            disabled: !pauseAction,
+            onClick: async () =>
+              handleStatusAction(row, {
+                actionCode: pauseAction?.actionCode ?? 'pause',
+                actionName: pauseAction?.actionName ?? '暂停',
+                needReason: pauseAction?.needReason ?? false
+              })
+          }
+        ] satisfies PersonalItemRowAction[])
+      : []),
     // {
     //   key: 'status-cancel',
     //   tooltip: cancelAction?.actionName ?? '取消',
@@ -326,19 +330,23 @@ function buildRowActions(row: Api.PersonalItem.PersonalItem): PersonalItemRowAct
     //     })
     // },
     ...lifecycleActions,
-    {
-      key: 'status-complete',
-      tooltip: completeAction?.actionName ?? '完成',
-      icon: markRaw(IconMdiCheckCircleOutline),
-      type: 'success',
-      disabled: !completeAction,
-      onClick: async () =>
-        handleStatusAction(row, {
-          actionCode: completeAction?.actionCode ?? 'complete',
-          actionName: completeAction?.actionName ?? '完成',
-          needReason: completeAction?.needReason ?? false
-        })
-    }
+    ...(!isCompleted
+      ? ([
+          {
+            key: 'status-complete',
+            tooltip: completeAction?.actionName ?? '完成',
+            icon: markRaw(IconMdiCheckCircleOutline),
+            type: 'success',
+            disabled: !completeAction,
+            onClick: async () =>
+              handleStatusAction(row, {
+                actionCode: completeAction?.actionCode ?? 'complete',
+                actionName: completeAction?.actionName ?? '完成',
+                needReason: completeAction?.needReason ?? false
+              })
+          }
+        ] satisfies PersonalItemRowAction[])
+      : [])
   ];
 }
 
@@ -452,7 +460,7 @@ async function handleStatusActionSubmit(reason: string | null) {
 
 async function handleDelete(row: Api.PersonalItem.PersonalItem) {
   try {
-    await ElMessageBox.confirm(`确定删除个人事项“${row.taskTitle}”吗？`, '删除确认', {
+    await ElMessageBox.confirm(`确定删除我的事项“${row.taskTitle}”吗？`, '删除确认', {
       type: 'warning',
       confirmButtonText: '确定',
       cancelButtonText: '取消'
@@ -473,12 +481,12 @@ async function handleDelete(row: Api.PersonalItem.PersonalItem) {
 
 async function handleBatchDelete() {
   if (!checkedRowIds.value.length) {
-    window.$message?.warning('请先选择个人事项');
+    window.$message?.warning('请先选择我的事项');
     return;
   }
 
   try {
-    await ElMessageBox.confirm(`确定删除选中的 ${selectedCount.value} 条个人事项吗？`, '删除确认', {
+    await ElMessageBox.confirm(`确定删除选中的 ${selectedCount.value} 条我的事项吗？`, '删除确认', {
       type: 'warning',
       confirmButtonText: '确定',
       cancelButtonText: '取消'
@@ -500,7 +508,7 @@ async function handleBatchDelete() {
 
 function handleOpenBindExecution() {
   if (!checkedRowIds.value.length) {
-    window.$message?.warning('请先选择个人事项');
+    window.$message?.warning('请先选择我的事项');
     return;
   }
 
@@ -541,7 +549,7 @@ onActivated(() => {
       <template #header>
         <div class="flex items-center justify-between gap-12px">
           <div class="flex items-center gap-10px">
-            <p>个人事项</p>
+            <p>我的事项</p>
             <ElTag effect="plain">{{ mobilePagination.total || data.length }}</ElTag>
           </div>
           <TableHeaderOperation v-model:columns="columnChecks" :loading="loading" @refresh="reloadTable">
diff --git a/src/views/personal-center/my-item/modules/personal-item-bind-execution-dialog.vue b/src/views/personal-center/my-item/modules/personal-item-bind-execution-dialog.vue
index 14ff411..a382835 100644
--- a/src/views/personal-center/my-item/modules/personal-item-bind-execution-dialog.vue
+++ b/src/views/personal-center/my-item/modules/personal-item-bind-execution-dialog.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 import { computed, reactive, ref, watch } from 'vue';
-import { fetchGetPersonalItemExecutionOptions } from '@/service/api';
+import {
+  fetchGetMyOwnedProjectPage,
+  fetchGetMyParticipatedProjectPage,
+  fetchGetProjectExecutionPage
+} from '@/service/api';
 import { useForm, useFormRules } from '@/hooks/common/form';
 import BusinessFormDialog from '@/components/custom/business-form-dialog.vue';
 
@@ -28,44 +32,113 @@ const visible = defineModel<boolean>('visible', {
 const { formRef, validate } = useForm();
 const { createRequiredRule } = useFormRules();
 
-const loading = ref(false);
-const executionOptions = ref<Api.PersonalItem.PersonalItemExecutionOption[]>([]);
+interface ProjectOption {
+  label: string;
+  value: string;
+}
+
+interface ExecutionOption {
+  label: string;
+  value: string;
+}
+
+const projectLoading = ref(false);
+const executionLoading = ref(false);
+const projectOptions = ref<ProjectOption[]>([]);
+const executionOptions = ref<ExecutionOption[]>([]);
+const loading = computed(() => projectLoading.value || executionLoading.value);
 
 const model = reactive({
+  projectId: '',
   executionId: ''
 });
 
 const rules = computed(
   () =>
     ({
+      projectId: [createRequiredRule('请选择项目')],
       executionId: [createRequiredRule('请选择执行')]
     }) satisfies Record<string, App.Global.FormRule[]>
 );
 
-function getExecutionOptionLabel(option: Api.PersonalItem.PersonalItemExecutionOption) {
-  if (option.projectName?.trim()) {
-    return `${option.projectName} / ${option.executionName}`;
-  }
+function createProjectOptions(
+  participated: Api.Project.MyParticipatedProjectItem[],
+  owned: Api.Project.MyOwnedProjectItem[]
+): ProjectOption[] {
+  const optionMap = new Map<string, ProjectOption>();
 
-  return option.executionName;
+  owned.forEach(item => {
+    if (!item.id || !item.name?.trim()) return;
+    optionMap.set(item.id, {
+      label: item.name.trim(),
+      value: item.id
+    });
+  });
+
+  participated.forEach(item => {
+    if (!item.id || !item.name?.trim()) return;
+    if (item.statusCode === 'completed' || item.statusCode === 'cancelled' || item.statusCode === 'archived') {
+      return;
+    }
+    if (!optionMap.has(item.id)) {
+      optionMap.set(item.id, {
+        label: item.name.trim(),
+        value: item.id
+      });
+    }
+  });
+
+  return Array.from(optionMap.values());
 }
 
-async function loadExecutionOptions() {
-  loading.value = true;
-  const { error, data } = await fetchGetPersonalItemExecutionOptions();
-  loading.value = false;
+async function loadProjectOptions() {
+  projectLoading.value = true;
+  const [participatedResult, ownedResult] = await Promise.all([
+    fetchGetMyParticipatedProjectPage({ pageNo: 1, pageSize: -1 }),
+    fetchGetMyOwnedProjectPage({ pageNo: 1, pageSize: -1 })
+  ]);
+  projectLoading.value = false;
+
+  if (participatedResult.error || ownedResult.error || !participatedResult.data || !ownedResult.data) {
+    projectOptions.value = [];
+    executionOptions.value = [];
+    return;
+  }
+
+  projectOptions.value = createProjectOptions(participatedResult.data.list, ownedResult.data.list);
+}
+
+async function loadExecutionOptions(projectId: string) {
+  if (!projectId) {
+    executionOptions.value = [];
+    return;
+  }
+
+  executionLoading.value = true;
+  const { error, data } = await fetchGetProjectExecutionPage(projectId, {
+    pageNo: 1,
+    pageSize: -1
+  });
+  executionLoading.value = false;
 
   if (error || !data) {
     executionOptions.value = [];
     return;
   }
 
-  executionOptions.value = data.map(item => ({ ...item }));
+  executionOptions.value = data.list
+    .filter(item => !item.terminal && item.statusCode !== 'completed' && item.statusCode !== 'cancelled')
+    .map(item => ({
+      label: item.executionName,
+      value: item.id
+    }));
 }
 
 async function initDialog() {
+  model.projectId = '';
   model.executionId = '';
-  await loadExecutionOptions();
+  executionOptions.value = [];
+  await loadProjectOptions();
   formRef.value?.clearValidate();
 }
 
@@ -85,42 +158,84 @@ watch(
     }
   }
 );
+
+watch(
+  () => model.projectId,
+  async (projectId, previousProjectId) => {
+    if (projectId === previousProjectId) return;
+
+    model.executionId = '';
+
+    if (!projectId) {
+      executionOptions.value = [];
+      formRef.value?.clearValidate('executionId');
+      return;
+    }
+
+    await loadExecutionOptions(projectId);
+    formRef.value?.clearValidate('executionId');
+  }
+);
 </script>
 
 <template>
   <BusinessFormDialog
     v-model="visible"
     title="批量关联执行"
-    preset="sm"
+    preset="md"
     :loading="loading"
     :confirm-loading="props.submitLoading"
     @confirm="handleConfirm"
   >
     <ElAlert
-      :title="`已选中 ${props.selectedCount} 条个人事项，关联成功后这些事项会从当前列表移除。`"
+      :title="`已选中 ${props.selectedCount} 条我的事项，关联成功后这些事项会从当前列表移除。`"
       type="info"
       :closable="false"
       class="mb-16px"
     />
 
     <ElForm ref="formRef" :model="model" :rules="rules" label-position="top" :validate-on-rule-change="false">
-      <ElFormItem label="执行" prop="executionId">
-        <ElSelect
-          v-model="model.executionId"
-          clearable
-          filterable
-          placeholder="请选择执行"
-          class="w-full"
-          :loading="loading"
-        >
-          <ElOption
-            v-for="option in executionOptions"
-            :key="option.executionId"
-            :label="getExecutionOptionLabel(option)"
-            :value="option.executionId"
-          />
-        </ElSelect>
-      </ElFormItem>
+      <ElRow :gutter="16">
+        <ElCol :span="12">
+          <ElFormItem label="项目" prop="projectId">
+            <ElSelect
+              v-model="model.projectId"
+              clearable
+              filterable
+              placeholder="请选择项目"
+              class="w-full"
+              :loading="projectLoading"
+            >
+              <ElOption
+                v-for="option in projectOptions"
+                :key="option.value"
+                :label="option.label"
+                :value="option.value"
+              />
+            </ElSelect>
+          </ElFormItem>
+        </ElCol>
+        <ElCol :span="12">
+          <ElFormItem label="执行" prop="executionId">
+            <ElSelect
+              v-model="model.executionId"
+              clearable
+              filterable
+              placeholder="请选择执行"
+              class="w-full"
+              :loading="executionLoading"
+              :disabled="!model.projectId"
+            >
+              <ElOption
+                v-for="option in executionOptions"
+                :key="option.value"
+                :label="option.label"
+                :value="option.value"
+              />
+            </ElSelect>
+          </ElFormItem>
+        </ElCol>
+      </ElRow>
     </ElForm>
   </BusinessFormDialog>
 </template>
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 118d085..e34d0b7 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
@@ -132,7 +132,7 @@ async function promptCompleteItemIfNeeded() {
   const { error } = await fetchCompletePersonalItem(detailData.value.id);
 
   if (!error) {
-    window.$message?.success('个人事项已完成');
+    window.$message?.success('我的事项已完成');
     await refreshDetail();
   }
 }
diff --git a/src/views/personal-center/my-item/modules/personal-item-operate-dialog.vue b/src/views/personal-center/my-item/modules/personal-item-operate-dialog.vue
index 2e690e2..1b26a69 100644
--- a/src/views/personal-center/my-item/modules/personal-item-operate-dialog.vue
+++ b/src/views/personal-center/my-item/modules/personal-item-operate-dialog.vue
@@ -70,10 +70,10 @@ const model = reactive<Model>(createDefaultModel());
 
 const title = computed(() => {
   if (isView.value) {
-    return '个人事项详情';
+    return '我的事项详情';
   }
 
-  return isEdit.value ? '编辑个人事项' : '新增个人事项';
+  return isEdit.value ? '编辑我的事项' : '新增我的事项';
 });
 
 function createDefaultModel(): Model {
@@ -195,7 +195,7 @@ async function handleSubmit() {
 
   await Promise.all([attachmentUploaderRef.value?.commit(), richTextEditorRef.value?.commit()]);
 
-  window.$message?.success(isEdit.value ? '个人事项修改成功' : '个人事项创建成功');
+  window.$message?.success(isEdit.value ? '我的事项修改成功' : '我的事项创建成功');
   visible.value = false;
   emit('submitted');
 }
diff --git a/src/views/project/list/index.vue b/src/views/project/list/index.vue
index cf55355..bf77657 100644
--- a/src/views/project/list/index.vue
+++ b/src/views/project/list/index.vue
@@ -45,7 +45,7 @@ const searchParams = reactive(getInitSearchParams());
 const navKey = ref<ProjectListNavKey>('active');
 const groupPage = ref<Api.Project.ProjectGroupPageResult>(createEmptyGroupPage());
 const loading = ref(false);
-const allCollapsed = ref(false);
+const allCollapsed = ref(true);
 /** 状态看板项（overview-summary items，状态机动态下发），左栏与"全部"口径派生均以此为源 */
 const statusBoardItems = ref<Api.Project.OverviewStatusItem[]>([]);
 /** "全部"口径总数（后端 total，前端不自行求和） */
@@ -171,7 +171,7 @@ async function handleResetSearch() {
 
 async function handleNavChange(key: ProjectListNavKey) {
   navKey.value = key;
-  allCollapsed.value = false;
+  allCollapsed.value = true;
   await Promise.all([loadOverviewData(), loadGroupPage(1)]);
 }
 
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 25fd68c..11ae868 100644
--- a/src/views/project/project/execution/composables/use-task-actions.ts
+++ b/src/views/project/project/execution/composables/use-task-actions.ts
@@ -63,10 +63,10 @@ export function useTaskActions(emits: TaskActionEmits) {
   function createActions(row: Api.Project.ProjectTask): TaskAction[] {
     const actions: TaskAction[] = [];
 
-    // 工作日志:行操作入口始终显示——查看人人可看;新增/编辑由弹层内 canSubmit 按身份与状态控制
+    // 填报:行操作入口始终显示——查看人人可看;新增/编辑由弹层内 canSubmit 按身份与状态控制
     actions.push({
       key: 'report',
-      tooltip: '工作日志',
+      tooltip: '填报',
       icon: markRaw(IconMdiClipboardEditOutline),
       type: 'primary',
       onClick: () => emits.report(row)
diff --git a/src/views/project/project/execution/index.vue b/src/views/project/project/execution/index.vue
index 6e33d8e..b6afdb0 100644
--- a/src/views/project/project/execution/index.vue
+++ b/src/views/project/project/execution/index.vue
@@ -171,7 +171,13 @@ const deleteDialogVisible = ref(false);
 const deleteExecutionDependentSummary = ref<string | null>(null);
 const { canCreateTopLevelTask } = useTaskPermissions();
 
-const canCreateTask = computed(() => (selectedExecution.value ? canCreateTopLevelTask(selectedExecution.value) : true));
+const canCreateTask = computed(() => {
+  if (selectedExecution.value) {
+    return canCreateTopLevelTask(selectedExecution.value);
+  }
+
+  return buttonCodeSet.value.has('project:task:create');
+});
 
 const workspaceTitle = computed(() => {
   if (selectedExecution.value) return selectedExecution.value.executionName || '执行任务';
diff --git a/src/views/workbench/composables/use-workbench-colors.ts b/src/views/workbench/composables/use-workbench-colors.ts
index fab6873..a6939f3 100644
--- a/src/views/workbench/composables/use-workbench-colors.ts
+++ b/src/views/workbench/composables/use-workbench-colors.ts
@@ -7,7 +7,7 @@
 
 // 项目色：纯分类色，不含红/橙系。告警语义留给等级色（红/橙/绿），避免视觉混淆。
 const PROJECT_COLORS = ['#5B8FF9', '#5AD8A6', '#5D7092', '#F6BD16', '#6DC8EC', '#73D13D', '#36CFC9', '#36495D'];
-// 个人事项独占紫色，与项目色明显区分
+// 我的事项独占紫色，与项目色明显区分
 const PERSONAL_COLOR = '#9254DE';
 const OTHER_COLOR = '#BFBFBF';
 
diff --git a/src/views/workbench/homepage.ts b/src/views/workbench/homepage.ts
index cf9e45c..60ff83d 100644
--- a/src/views/workbench/homepage.ts
+++ b/src/views/workbench/homepage.ts
@@ -22,7 +22,7 @@ export interface WorkbenchTodoItemSource {
   deadline: string | null;
   /** 来源（提交人/项目名/工单号） */
   source: string;
-  /** 进度百分比，仅任务和个人事项使用 */
+  /** 进度百分比，仅任务和我的事项使用 */
   progressRate?: number | null;
   /** 优先级，用于前端排序与高亮 */
   priority?: WorkbenchTodoPriority;
@@ -67,7 +67,7 @@ const todoCategoryMeta: Record<
 > = {
   task: { label: '任务', tone: 'emerald', icon: 'mdi:checkbox-marked-circle-outline' },
   ticket: { label: '工单', tone: 'amber', icon: 'mdi:ticket-confirmation-outline' },
-  personal: { label: '个人事项', tone: 'violet', icon: 'mdi:notebook-edit-outline' },
+  personal: { label: '我的事项', tone: 'violet', icon: 'mdi:notebook-edit-outline' },
   approval: { label: '待审批', tone: 'sky', icon: 'mdi:checkbox-multiple-marked-outline' }
 };
 
@@ -239,7 +239,7 @@ export function buildWorkbenchOwnedProjects(
   }));
 }
 
-/** 工时分布行项：项目 / 个人事项 / 其他（杂项） */
+/** 工时分布行项：项目 / 我的事项 / 其他（杂项） */
 export interface WorkbenchWorklogDistributionItem {
   /** 唯一 key；project 用 projectId，personal/other 用固定字面量 */
   key: string;
@@ -280,7 +280,7 @@ function toWorklogDistributionItem(item: Api.Project.WorklogDistributionItem): W
   const isProject = item.kind === 'project' && Boolean(item.projectId);
   return {
     key: isProject ? (item.projectId as string) : item.kind,
-    label: item.projectName ?? (item.kind === 'personal' ? '个人事项' : '其他'),
+    label: item.projectName ?? (item.kind === 'personal' ? '我的事项' : '其他'),
     hours: roundHours(item.hours),
     kind: item.kind,
     projectId: isProject ? (item.projectId as string) : undefined
@@ -438,14 +438,14 @@ export interface WorkbenchTeamLoadItemSource {
   key: string;
   label: string;
   kind: WorkbenchTeamLoadItemKind;
-  /** 该项目/个人事项下，该成员未完成的任务/事项数（含待开始/已暂停；任务按"负责人/协办人"口径，单任务多人各算 1 条） */
+  /** 该项目/我的事项下，该成员未完成的任务/事项数（含待开始/已暂停；任务按"负责人/协办人"口径，单任务多人各算 1 条） */
   count: number;
 }
 
 export interface WorkbenchTeamLoadMemberSource {
   memberId: string;
   memberName: string;
-  /** 未完成数按项目 + 个人事项的拆分（合计即"未完成总数"） */
+  /** 未完成数按项目 + 我的事项的拆分（合计即"未完成总数"） */
   items: WorkbenchTeamLoadItemSource[];
   /** 今天 ≤ 计划结束 ≤ 今天+3 天 且未完成（与逾期互斥） */
   dueSoon: number;
diff --git a/src/views/workbench/modules/workbench-team-load.vue b/src/views/workbench/modules/workbench-team-load.vue
index 309fc27..287b482 100644
--- a/src/views/workbench/modules/workbench-team-load.vue
+++ b/src/views/workbench/modules/workbench-team-load.vue
@@ -34,7 +34,7 @@ function toTeamLoadSource(member: Api.Project.TeamLoadMember, index: number): Wo
     memberName: index === 0 ? `${member.userNickname}（我）` : member.userNickname,
     items: member.items.map(item => ({
       key: item.kind === 'project' && item.projectId ? item.projectId : item.kind,
-      label: item.projectName ?? (item.kind === 'personal' ? '个人事项' : '其他'),
+      label: item.projectName ?? (item.kind === 'personal' ? '我的事项' : '其他'),
       kind: item.kind,
       count: item.count
     })),
diff --git a/src/views/workbench/modules/workbench-todo-panel.vue b/src/views/workbench/modules/workbench-todo-panel.vue
index 8a6b30c..242e52e 100644
--- a/src/views/workbench/modules/workbench-todo-panel.vue
+++ b/src/views/workbench/modules/workbench-todo-panel.vue
@@ -26,6 +26,7 @@ import { useRouterPush } from '@/hooks/common/router';
 import { useDict } from '@/hooks/business/dict';
 import type { WorklogChangedPayload } from '@/views/project/project/execution/shared';
 import TaskStatusActionDialog from '@/views/project/project/execution/modules/status-action-dialog.vue';
+import TaskInfoReadonly from '@/views/project/project/execution/modules/task-info-readonly.vue';
 import TaskWorklogDialog from '@/views/project/project/execution/modules/task-worklog-dialog.vue';
 import PersonalItemDetailDialog from '@/views/personal-center/my-item/modules/personal-item-detail-dialog.vue';
 import PersonalItemOperateDialog from '@/views/personal-center/my-item/modules/personal-item-operate-dialog.vue';
@@ -57,6 +58,7 @@ import { useWorkbenchRefresh } from '../composables/use-workbench-refresh';
 import { useWorkbenchWorklogSignal } from '../composables/use-workbench-worklog-signal';
 import WorkbenchModuleCard from './workbench-module-card.vue';
 import IconMdiCheckCircleOutline from '~icons/mdi/check-circle-outline';
+import IconMdiClipboardCheckOutline from '~icons/mdi/clipboard-check-outline';
 import IconMdiClipboardEditOutline from '~icons/mdi/clipboard-edit-outline';
 import IconMdiCloseCircleOutline from '~icons/mdi/close-circle-outline';
 import IconMdiEyeOutline from '~icons/mdi/eye-outline';
@@ -127,7 +129,7 @@ const mainTabs: Array<{ key: WorkbenchTodoMainTab; label: string }> = [
   { key: 'all', label: '全部' },
   { key: 'task', label: '任务' },
   { key: 'ticket', label: '工单' },
-  { key: 'personal', label: '个人事项' },
+  { key: 'personal', label: '我的事项' },
   { key: 'approval', label: '待审批' }
 ];
 
@@ -169,7 +171,7 @@ const myTaskItems = ref<WorkbenchTodoItem[]>([]);
 // 保留任务原始行，供操作图标按 availableActions 渲染并取 projectId / executionId 调状态变更接口
 const myTaskRows = ref<Api.Project.MyTaskItem[]>([]);
 const personalTodoItems = ref<WorkbenchTodoItem[]>([]);
-// 保留个人事项原始行，供操作图标（详情/填报/完成）按 availableActions 渲染并回传给弹层
+// 保留我的事项原始行，供操作图标（详情/填报/完成）按 availableActions 渲染并回传给弹层
 const personalItemRows = ref<Api.PersonalItem.PersonalItem[]>([]);
 const overtimeApprovalItems = ref<WorkbenchTodoItem[]>([]);
 const overtimeApprovalRows = ref<Api.OvertimeApplication.OvertimeApplication[]>([]);
@@ -188,14 +190,14 @@ const mergedItems = computed(() => [
   ...workReportApprovalItems.value
 ]);
 
-// 个人事项操作弹层：详情用 view 模式、新增用 add 模式，共用同一实例
+// 我的事项操作弹层：详情用 view 模式、新增用 add 模式，共用同一实例
 const personalOperateVisible = ref(false);
 const personalOperateType = ref<'add' | 'view'>('add');
 const personalOperateRow = ref<Api.PersonalItem.PersonalItem | null>(null);
-// 个人事项填报：复用详情弹层的 worklog tab
+// 我的事项填报：复用详情弹层的 worklog tab
 const personalDetailVisible = ref(false);
 const personalDetailRow = ref<Api.PersonalItem.PersonalItem | null>(null);
-// 个人事项完成：复用状态动作弹层收集原因 + 二次确认
+// 我的事项完成：复用状态动作弹层收集原因 + 二次确认
 const personalStatusVisible = ref(false);
 const personalStatusRow = ref<Api.PersonalItem.PersonalItem | null>(null);
 const personalStatusAction = ref<Api.PersonalItem.PersonalItemLifecycleAction | null>(null);
@@ -203,6 +205,8 @@ const personalStatusAction = ref<Api.PersonalItem.PersonalItemLifecycleAction |
 const taskStatusVisible = ref(false);
 const taskStatusRow = ref<Api.Project.MyTaskItem | null>(null);
 const taskStatusAction = ref<Api.Project.LifecycleAction<Api.Project.ProjectTaskActionCode> | null>(null);
+const taskPreviewMap = ref<Record<string, Api.Project.ProjectTask>>({});
+const taskPreviewLoadingIds = ref<string[]>([]);
 // 任务填报工时：复用任务工作区的工时弹层；弹层需要完整任务详情，点击时按需拉取
 const taskWorklogVisible = ref(false);
 const taskWorklogTask = ref<Api.Project.ProjectTask | null>(null);
@@ -222,9 +226,7 @@ const currentPerformanceActionType = ref<PerformanceApprovalActionType>('confirm
 // 批量审批选中状态（存原始加班申请 id，避免映射转换）
 const selectedOvertimeIds = ref<Set<string>>(new Set());
 
-const OVERTIME_APPROVAL_ACTION_ICONS = {
-  detail: markRaw(IconMdiEyeOutline)
-};
+const APPROVAL_ENTRY_ICON = markRaw(IconMdiClipboardCheckOutline);
 
 function getApprovalCategoryLabel(bizType: ApprovalBizType) {
   if (bizType === 'weekly') return '周报';
@@ -287,13 +289,13 @@ function getPersonalCompleteAction(row: Api.PersonalItem.PersonalItem) {
   return row.availableActions?.find(action => action.actionCode === 'complete') || null;
 }
 
-// 仅当个人事项当前可完成（availableActions 含 complete）时才渲染完成图标
+// 仅当我的事项当前可完成（availableActions 含 complete）时才渲染完成图标
 function canCompletePersonalItem(item: WorkbenchTodoItem) {
   const row = findPersonalItemRow(item);
   return Boolean(row && getPersonalCompleteAction(row));
 }
 
-// 详情：复用个人事项操作弹层的 view 只读模式
+// 详情：复用我的事项操作弹层的 view 只读模式
 function openPersonalDetail(item: WorkbenchTodoItem) {
   const row = findPersonalItemRow(item);
   if (!row) return;
@@ -350,6 +352,52 @@ function findMyTaskRow(item: WorkbenchTodoItem) {
   return myTaskRows.value.find(row => `task-${row.id}` === item.id) || null;
 }
 
+function canPreviewTaskInfo(item: WorkbenchTodoItem) {
+  const row = findMyTaskRow(item);
+  return Boolean(item.category === 'task' && row?.projectId && row.executionId);
+}
+
+function getTaskPreviewTask(item: WorkbenchTodoItem) {
+  const row = findMyTaskRow(item);
+  if (!row) return null;
+  return taskPreviewMap.value[row.id] || null;
+}
+
+function getTaskPreviewTaskOptions(item: WorkbenchTodoItem) {
+  const task = getTaskPreviewTask(item);
+  return task ? [task] : [];
+}
+
+function isTaskPreviewLoading(item: WorkbenchTodoItem) {
+  const row = findMyTaskRow(item);
+  if (!row) return false;
+  return taskPreviewLoadingIds.value.includes(row.id);
+}
+
+async function handleTaskPreviewShow(item: WorkbenchTodoItem) {
+  const row = findMyTaskRow(item);
+  if (!row?.executionId) return;
+
+  if (taskPreviewMap.value[row.id] || taskPreviewLoadingIds.value.includes(row.id)) {
+    return;
+  }
+
+  taskPreviewLoadingIds.value = [...taskPreviewLoadingIds.value, row.id];
+
+  const { error, data } = await fetchGetProjectTask(row.projectId, row.executionId, row.id);
+
+  taskPreviewLoadingIds.value = taskPreviewLoadingIds.value.filter(id => id !== row.id);
+
+  if (error || !data) {
+    return;
+  }
+
+  taskPreviewMap.value = {
+    ...taskPreviewMap.value,
+    [row.id]: data
+  };
+}
+
 // 状态变更接口挂在执行路径下，未挂执行的任务不渲染动作按钮
 function getTaskActions(item: WorkbenchTodoItem) {
   const row = findMyTaskRow(item);
@@ -362,6 +410,23 @@ function canReportTaskWorklog(item: WorkbenchTodoItem) {
   return Boolean(findMyTaskRow(item)?.executionId);
 }
 
+async function refreshTaskWorklogTaskDetail(
+  target?:
+    | Pick<Api.Project.ProjectTask, 'id' | 'projectId' | 'executionId'>
+    | Pick<Api.Project.MyTaskItem, 'id' | 'projectId' | 'executionId'>
+    | null
+) {
+  const task = target ?? taskWorklogTask.value;
+  if (!task?.executionId) return;
+
+  const { error, data } = await fetchGetProjectTask(task.projectId, task.executionId, task.id);
+  if (error || !data) return;
+
+  if (taskWorklogTask.value?.id === data.id) {
+    taskWorklogTask.value = data;
+  }
+}
+
 // 填报：工时弹层需要完整任务详情（负责人/状态/日期），按需拉一次详情再打开
 async function openTaskWorklog(item: WorkbenchTodoItem) {
   const row = findMyTaskRow(item);
@@ -378,6 +443,9 @@ async function openTaskWorklog(item: WorkbenchTodoItem) {
 async function handleTaskWorklogChanged(payload: WorklogChangedPayload) {
   notifyWorklogChanged();
   await loadMyTaskItems();
+  if (taskWorklogTask.value?.id === payload.taskId) {
+    await refreshTaskWorklogTaskDetail();
+  }
 
   // 与任务工作区联动一致：进度填到 100 且我是任务负责人时提示完成（仅单任务，不做级联）
   if (payload.mode === 'delete' || payload.progressRate !== 100) return;
@@ -459,6 +527,9 @@ async function submitTaskStatusChange(reason: string | null) {
   taskStatusVisible.value = false;
   window.$message?.success(`${action.actionName}成功`);
   await loadMyTaskItems();
+  if (taskWorklogTask.value?.id === row.id) {
+    await refreshTaskWorklogTaskDetail(row);
+  }
 }
 
 const tabCounts = computed(() => {
@@ -733,6 +804,9 @@ function mapTaskTodoPriority(priority: string) {
 async function loadMyTaskItems() {
   const { error, data } = await fetchGetMyTaskPage({ pageNo: 1, pageSize: -1 });
 
+  taskPreviewMap.value = {};
+  taskPreviewLoadingIds.value = [];
+
   if (error || !data) {
     myTaskRows.value = [];
     myTaskItems.value = [];
@@ -756,7 +830,7 @@ async function loadMyTaskItems() {
   );
 }
 
-// 待办口径：未到终态的个人事项（pending / active / paused），terminal 态（completed / cancelled）不进待办
+// 待办口径：未到终态的我的事项（pending / active / paused），terminal 态（completed / cancelled）不进待办
 const PERSONAL_TODO_STATUSES: Api.PersonalItem.PersonalItemStatusCode[] = ['pending', 'active', 'paused'];
 
 async function loadPersonalTodoItems() {
@@ -777,7 +851,7 @@ async function loadPersonalTodoItems() {
       title: item.taskTitle,
       createdTime: item.createTime,
       deadline: item.plannedEndDate,
-      source: '个人事项',
+      source: '我的事项',
       progressRate: item.progressRate,
       routeKey: 'personal-center_my-item'
     }))
@@ -1061,7 +1135,7 @@ onActivated(refresh);
 
       <button type="button" class="workbench-todo__add" @click="handleOpenAdd">
         <SvgIcon icon="mdi:plus" class="workbench-todo__add-icon" />
-        <span>个人事项</span>
+        <span>我的事项</span>
       </button>
     </div>
 
@@ -1179,7 +1253,42 @@ onActivated(refresh);
 
           <div class="workbench-todo__body">
             <h4 class="workbench-todo__item-title">
+              <ElPopover
+                v-if="canPreviewTaskInfo(item)"
+                placement="right-start"
+                trigger="hover"
+                :width="960"
+                popper-class="workbench-task-preview-popover"
+                @show="handleTaskPreviewShow(item)"
+              >
+                <template #reference>
+                  <span
+                    class="workbench-todo__item-title-text"
+                    :class="{
+                      'workbench-todo__item-title-text--clickable': Boolean(
+                        item.routeKey || item.approvalBizType || item.projectId
+                      )
+                    }"
+                    @click="handleClickItem(item)"
+                  >
+                    {{ item.title }}
+                  </span>
+                </template>
+
+                <div class="workbench-task-preview">
+                  <div class="workbench-task-preview__header">任务信息</div>
+                  <div v-loading="isTaskPreviewLoading(item)" class="workbench-task-preview__body">
+                    <TaskInfoReadonly
+                      v-if="getTaskPreviewTask(item)"
+                      :task="getTaskPreviewTask(item)"
+                      :task-options="getTaskPreviewTaskOptions(item)"
+                    />
+                    <ElEmpty v-else description="暂无任务信息" :image-size="56" />
+                  </div>
+                </div>
+              </ElPopover>
               <span
+                v-else
                 class="workbench-todo__item-title-text"
                 :class="{
                   'workbench-todo__item-title-text--clickable': Boolean(
@@ -1212,16 +1321,16 @@ onActivated(refresh);
 
           <div class="workbench-todo__trailing">
             <div v-if="item.approvalBizType === 'overtime_application'" class="workbench-todo__actions" @click.stop>
-              <ElTooltip content="详情">
+              <ElTooltip content="审批">
                 <ElButton link type="primary" class="workbench-todo__action-btn" @click="openOvertimeDetail(item)">
-                  <component :is="OVERTIME_APPROVAL_ACTION_ICONS.detail" class="text-15px" />
+                  <component :is="APPROVAL_ENTRY_ICON" class="text-15px" />
                 </ElButton>
               </ElTooltip>
             </div>
             <div v-else-if="item.approvalBizType === 'performance'" class="workbench-todo__actions" @click.stop>
-              <ElTooltip content="查看绩效">
+              <ElTooltip content="审批">
                 <ElButton link type="primary" class="workbench-todo__action-btn" @click="openPerformanceDetail(item)">
-                  <IconMdiEyeOutline class="text-15px" />
+                  <component :is="APPROVAL_ENTRY_ICON" class="text-15px" />
                 </ElButton>
               </ElTooltip>
             </div>
@@ -1230,9 +1339,9 @@ onActivated(refresh);
               class="workbench-todo__actions"
               @click.stop
             >
-              <ElTooltip content="详情">
+              <ElTooltip content="审批">
                 <ElButton link type="primary" class="workbench-todo__action-btn" @click="openWorkReportDetail(item)">
-                  <component :is="OVERTIME_APPROVAL_ACTION_ICONS.detail" class="text-15px" />
+                  <component :is="APPROVAL_ENTRY_ICON" class="text-15px" />
                 </ElButton>
               </ElTooltip>
             </div>
@@ -1241,7 +1350,7 @@ onActivated(refresh);
               class="workbench-todo__actions"
               @click.stop
             >
-              <ElTooltip content="填报工时">
+              <ElTooltip content="填报">
                 <ElButton link type="primary" class="workbench-todo__action-btn" @click="openTaskWorklog(item)">
                   <component :is="PERSONAL_ACTION_ICONS.worklog" class="text-15px" />
                 </ElButton>
@@ -1723,6 +1832,32 @@ onActivated(refresh);
   text-decoration: underline;
 }
 
+:deep(.workbench-task-preview-popover) {
+  padding: 0;
+  overflow: hidden;
+}
+
+.workbench-task-preview {
+  background: var(--el-bg-color);
+}
+
+.workbench-task-preview__header {
+  display: flex;
+  align-items: center;
+  min-height: 48px;
+  padding: 0 18px;
+  border-bottom: 1px solid var(--el-border-color-lighter);
+  font-size: 15px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.workbench-task-preview__body {
+  max-height: min(72vh, 760px);
+  padding: 18px;
+  overflow: auto;
+}
+
 .workbench-todo__meta {
   display: flex;
   align-items: center;