Merge branch 'master' into feature/20260525

src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="密级" name="secretLevel">
-                <j-dict-select-tag v-model:value="mainForm.secretLevel" :disabled="mainDisabled" dictCode="secret_level" placeholder="请选择密级" allow-clear />
+                <j-dict-select-tag v-model:value="mainForm.secretLevel" disabled dictCode="secret_level" placeholder="请选择密级" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -96,7 +96,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成状态" name="bpmStatus">
-                <a-input v-model:value="mainForm.bpmStatus" :disabled="mainDisabled" allow-clear />
+                <j-dict-select-tag v-model:value="mainForm.bpmStatus" disabled dictCode="super_status" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="24">

src/views/dashboard/ProcessPortal/data/todo.data.ts

@@ -9,6 +9,13 @@ export const todoColumns: BasicColumn[] = [
     dataIndex: 'bpmBizTitle',
     ellipsis: true,
   },
+  {
+    title: '事项名称',
+    align: 'center',
+    width: 160,
+    dataIndex: 'flowName',
+    ellipsis: true,
+  },
   {
     title: '当前环节',
     align: 'center',

src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts

@@ -24,10 +24,16 @@ export const columns: BasicColumn[] = [
     width: 130,
     dataIndex: 'taskName',
   },
+  // {
+  //   title: '流程名称',
+  //   align: 'center',
+  //   dataIndex: 'processDefinitionName',
+  //   ellipsis: true,
+  // },
   {
-    title: '流程名称',
+    title: '事项名称',
     align: 'center',
-    dataIndex: 'processDefinitionName',
+    dataIndex: 'flowName',
     ellipsis: true,
   },
   {