!11 新增xispeak返回流程显示权限记录

Merge pull request !11 from new_new_new/feature/20260519

.gitignore

@@ -24,6 +24,7 @@ pnpm-debug.log*
 .idea
 .svn
 # .vscode
+*.java
 *.suo
 *.ntvs*
 *.njsproj

src/components/semri/process/FlowScheduleStartModal.vue

@@ -1,12 +1,5 @@
 <template>
-  <j-modal
+  <j-modal :title="title" :width="720" :visible="visible" @ok="handleOk" @cancel="handleCancel" cancelText="取消">
-    :title="title"
-    :width="720"
-    :visible="visible"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="取消"
-  >
     <a-form :model="formData" :label-col="{ style: { width: '120px' } }" :wrapper-col="{ span: 16 }">
       <a-form-item label="发起类型">
         <a-radio-group v-model:value="formData.triggerMode">
@@ -15,12 +8,12 @@
         </a-radio-group>
       </a-form-item>
 
-      <a-form-item v-if="deptOptions.length" label="被督办部门">
+      <a-form-item v-if="deptOptions.length" label="牵头部门">
         <a-select
           v-model:value="formData.deptIds"
           mode="multiple"
           :options="deptOptions"
-          placeholder="请选择被督办部门"
+          placeholder="请选择牵头部门"
           allow-clear
           style="width: 100%"
           :getPopupContainer="(node) => node?.parentNode"
@@ -38,16 +31,12 @@
       </a-form-item>
 
       <template v-if="showSuoleaderFields">
-        <a-form-item label="是否所办领导审批">
+        <a-form-item label="是否所党委审批">
           <j-switch v-model:value="formData.isNeedAppro" />
         </a-form-item>
 
-        <a-form-item label="所办领导">
+        <a-form-item label="所党委领导">
-          <j-select-user
+          <j-select-user v-model:value="formData.supDeptleaderid" :disabled="String(formData.isNeedAppro) !== '1'" allow-clear />
-            v-model:value="formData.supDeptleaderid"
-            :disabled="String(formData.isNeedAppro) !== '1'"
-            allow-clear
-          />
         </a-form-item>
       </template>
 
@@ -62,13 +51,7 @@
         </a-form-item>
 
         <a-form-item label="重复次数">
-          <a-input-number
+          <a-input-number v-model:value="formData.startCount" :min="1" :precision="0" placeholder="重复次数" style="width: 100%" />
-            v-model:value="formData.startCount"
-            :min="1"
-            :precision="0"
-            placeholder="重复次数"
-            style="width: 100%"
-          />
         </a-form-item>
 
         <a-form-item label="重复开始日期">

src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md

@@ -0,0 +1,271 @@
+# BgXiSpeak 流程审批界面权限控制
+
+## 控制模型
+
+- 默认全关，逐级显式通过 `extendUrlParams` 传 `=1` 开启
+- 上级未开启时，下级传参不生效
+- 每个 UI 元素只受一个属性控制
+
+## 控制树
+
+```
+showProcessHandle      → 流程办理区域
+  └── showSubApproveUser → 是否办结 + 部门经办人选人
+
+showFeedbackInfo        → 反馈信息区域（表格 + 表头）
+  ├── showAddFeedback    → 新增反馈按钮
+  ├── showEditFeedback   → 编辑/删除操作列
+  ├── showDeptFeedback   → 按部门过滤反馈数据
+  └── showJiJianFields   → 纪检字段列（检查情况/监督意见/措施数量）
+```
+
+## 节点权限配置
+
+> 格式：`| L1 属性 | L2 属性 | 值 | 说明 |`，缩进表示层级，L2 仅在 L1=1 时生效
+
+---
+
+## 习讲话审批流程 
+### 节点: <督办部门经办人发起流程>
+* taskDefKey: `<Task_00v3pcv>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `0` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+
+### 节点: <督办部门负责人审批>
+* taskDefKey: `<Task_0zmn6ik>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `0` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <所党委审批>
+* taskDefKey: `<Task_15sm4w5>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `0` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <收集流程部门负责人接受任务并分配>
+* taskDefKey: `<Task_1v9ce78>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `1` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `0` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <收集流程门经办人填写>
+* taskDefKey: `<Task_0jrgrzs>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `1` —— 新增反馈按钮
+      * **showEditFeedback** `1` —— 编辑/删除操作列
+      * **showDeptFeedback** `1` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <收集流程部门负责人审批>
+* taskDefKey: `<Task_0mf32ge>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `1` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <收集流程督办发起人确认部门经办人填写内容>
+* taskDefKey: `<Task_1w4vxgc>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+
+### 节点: <反馈流程部门经办人填写反馈情况>
+* taskDefKey: `<Task_08zb04x>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `1` —— 新增反馈按钮
+      * **showEditFeedback** `1` —— 编辑/删除操作列
+      * **showDeptFeedback** `1` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <反馈流程部门负责人审批>
+* taskDefKey: `<Task_04bazej>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `1` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <反馈流程督办经办人核查>
+* taskDefKey: `<Task_175afz2>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+
+### 节点: <反馈流程督办部门负责人审批>
+* taskDefKey: `<Task_00i7rrp>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `0` —— 纪检字段列
+---
+
+### 节点: <反馈流程纪检经办人监察>
+* taskDefKey: `<Task_1wfkrvj>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `1` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+
+### 节点: <反馈流程纪检负责人审批>
+* taskDefKey: `<Task_1ogk921>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+
+### 节点: <督办部门经办人确认全部反馈事项>
+* taskDefKey: `<Task_0bj578x>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+## 习讲话经办人反馈流程
+### 节点: <部门经办人反馈完成情况>
+* taskDefKey: `<Task_12vdqzv>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `1` —— 新增反馈按钮
+      * **showEditFeedback** `1` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+
+### 节点: <部门负责人审批>
+* taskDefKey: `<Task_06di2wf>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+
+### 节点: <督办经办人核查>
+* taskDefKey: `<Task_13olnz1>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+
+### 节点: <督办部门负责人审批>
+* taskDefKey: `<Task_1l650tz>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+
+### 节点: <纪检经办人监察>
+* taskDefKey: `<Task_0bahwr8>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `1` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---
+
+
+### 节点: <纪检负责人审批>
+* taskDefKey: `<Task_005iiwi>`
+
+  * **showProcessHandle** `1` —— 流程办理区域
+    * **showSubApproveUser** `0` —— 是否办结 + 部门经办人
+  * **showFeedbackInfo** `1` —— 反馈信息区域
+      * **showAddFeedback** `0` —— 新增反馈按钮
+      * **showEditFeedback** `0` —— 编辑/删除操作列
+      * **showDeptFeedback** `0` —— 按部门过滤反馈
+      * **showJiJianFields** `1` —— 纪检字段列
+---

src/views/bg/xispeak/BgXiSpeak.api.ts

@@ -13,6 +13,7 @@ enum Api {
   loadTreeData = '/bg/xispeak/bgXiSpeak/loadTreeRoot',
   getChildList = '/bg/xispeak/bgXiSpeak/childList',
   getChildListBatch = '/bg/xispeak/bgXiSpeak/getChildListBatch',
+  getRootListWithDept = '/bg/xispeak/bgXiSpeak/getRootListWithDept',
 }
 
 /**
@@ -33,6 +34,8 @@ export const getImportUrl = Api.importExcel;
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
+export const getRootListWithDept = (deptIds: string) => defHttp.get({ url: Api.getRootListWithDept, params: { dept_ids: deptIds } });
+
 /**
  * 删除
  * @param params
@@ -105,6 +108,17 @@ export const bgXiSpeakFeedbackList = (params) => {
   return Promise.resolve({});
 };
 
+/**
+ * 子表列表接口
+ * @param params
+ */
+export const bgXiSpeakFeedbackListWithDept = (params) => {
+  if (params['mainId']) {
+    return defHttp.get({ url: '/bg/xispeak/bgXiSpeak/listBgXiSpeakFeedbackByMainIdWithUserDept', params });
+  }
+  return Promise.resolve({});
+};
+
 /**
  * 子表删除单个
  */
@@ -170,3 +184,19 @@ export const updateLaunchType = (params) => {
 export const withDrawXiSpeak = (params) => {
   return defHttp.post({ url: '/bg/xispeak/bgXiSpeak/withDrawXiSpeak', params }, { joinParamsToUrl: true, isTransformResponse: false });
 };
+
+/**
+ * 批量查询反馈统计数量（每个 xispeak 下的 feedback 总条数和已闭环数）
+ * @param params { ids: "id1,id2,id3" }
+ */
+export const queryFeedbackCounts = (params) => {
+  return defHttp.get({ url: '/bg/xispeak/bgXiSpeak/queryFeedbackCounts', params });
+};
+
+/**
+ * 更新 task_task 的部门经办人姓名
+ * @param params { processInstanceId, deptHandlerName }
+ */
+export const updateDeptHandlerName = (params) => {
+  return defHttp.post({ url: '/tasktask/taskTask/updateDeptHandlerName', params }, { isTransformResponse: false });
+};

src/views/bg/xispeak/BgXiSpeak.data.ts

@@ -29,20 +29,26 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'status',
   },
+  {
+    title: '密级',
+    align: 'center',
+    dataIndex: 'secretLevel_dictText',
+    width: 80,
+  },
   {
     title: '责任人',
     align: 'center',
     dataIndex: 'responsiblePerson_dictText',
   },
-  {
+  // {
-    title: '落实方案',
+  //   title: '落实方案',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'implPlan',
+  //   dataIndex: 'implPlan',
-  },
+  // },
   {
     title: '牵头部门',
     align: 'center',
-    dataIndex: 'leadDepartment_dictText',
+    dataIndex: 'implDept_dictText',
   },
   {
     title: '贯彻落实措施',
@@ -54,36 +60,36 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'numberOfResolutions',
   },
+  // {
+  //   title: '落实情况',
+  //   align: 'left',
+  //   dataIndex: 'implStatus',
+  // },
   {
-    title: '落实情况',
+    title: '落实措施条数',
-    align: 'left',
-    dataIndex: 'implStatus',
-  },
-  {
-    title: '落实条数',
     align: 'center',
     dataIndex: 'implCount',
   },
   {
-    title: '已闭环数量',
+    title: '措施已闭环数',
     align: 'center',
     dataIndex: 'closedCount',
   },
-  {
+  // {
-    title: '报告反馈情况',
+  //   title: '报告反馈情况',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'reportFeedbackStatus',
+  //   dataIndex: 'reportFeedbackStatus',
-  },
+  // },
-  {
+  // {
-    title: '是否存在完成风险(0不存在，1存在)',
+  //   title: '是否存在完成风险(0不存在，1存在)',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'isCompletionRisk',
+  //   dataIndex: 'isCompletionRisk',
-  },
+  // },
-  {
+  // {
-    title: '拖期风险应对措施',
+  //   title: '拖期风险应对措施',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'delayRiskMitigation',
+  //   dataIndex: 'delayRiskMitigation',
-  },
+  // },
   {
     title: '完成状态',
     align: 'center',
@@ -105,11 +111,6 @@ export const columns: BasicColumn[] = [
       return text.length > 10 ? text.substr(0, 10) : text;
     },
   },
-  {
-    title: '落实部门',
-    align: 'center',
-    dataIndex: 'implDept_dictText',
-  },
   // {
   //   title: '层深(最顶层节点层深为0)',
   //   align: 'center',
@@ -220,7 +221,12 @@ export const bgXiSpeakFeedbackColumns: BasicColumn[] = [
   {
     title: '完成状态',
     align: 'center',
-    dataIndex: 'completionStatus',
+    dataIndex: 'completionStatus_dictText',
+  },
+  {
+    title: '是否有报送上级报告',
+    align: 'center',
+    dataIndex: 'isReportedToHigher_dictText',
   },
   {
     title: '落实计划',
@@ -257,7 +263,7 @@ export const superQuerySchema = {
   status: { title: '学习传达研究部署情况', order: 4, view: 'text', type: 'string' },
   responsiblePerson: { title: '责任人', order: 5, view: 'sel_user', type: 'string' },
   implPlan: { title: '落实方案', order: 6, view: 'text', type: 'string' },
-  leadDepartment: { title: '牵头部门', order: 7, view: 'sel_depart', type: 'string' },
+  implDept: { title: '牵头部门', order: 7, view: 'sel_depart', type: 'string' },
   implMeasures: { title: '贯彻落实措施', order: 8, view: 'text', type: 'string' },
   numberOfResolutions: { title: '会议决策数', order: 9, view: 'number', type: 'number' },
   implStatus: { title: '落实情况', order: 10, view: 'text', type: 'string' },
@@ -268,7 +274,6 @@ export const superQuerySchema = {
   delayRiskMitigation: { title: '拖期风险应对措施', order: 15, view: 'text', type: 'string' },
   completionStatus: { title: '完成状态(督办中，1已完成)', order: 16, view: 'number', type: 'number' },
   deadline: { title: '截止日期', order: 17, view: 'date', type: 'string' },
-  implDept: { title: '落实部门id', order: 18, view: 'sel_depart', type: 'string' },
   treeDepth: { title: '层深(最顶层节点层深为0)', order: 18, view: 'number', type: 'number' },
   sortOrder: { title: '同级数据排序号', order: 19, view: 'number', type: 'number' },
   bpmStatus: { title: '流程引擎状态字段', order: 21, view: 'number', type: 'number' },

src/views/bg/xispeak/BgXiSpeakList.vue

@@ -1,86 +1,49 @@
 <template>
   <div>
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
+    <BasicTable
-        <!--插槽:table标题-->
+      @register="registerTable"
-        <template #tableTitle>
+      :rowSelection="rowSelection"
-          <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">新增</a-button>
+      :expandedRowKeys="expandedRowKeys"
-          <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"
+      @expand="handleExpand"
-            >导出</a-button
+      @fetch-success="onFetchSuccess"
-          >
+    >
-          <j-upload-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
+      <!--插槽:table标题-->
-            >导入</j-upload-button
+      <template #tableTitle>
-          >
+        <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">新增</a-button>
-          <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">导出</a-button>
-            <template #overlay>
+        <j-upload-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
-              <a-menu>
+          >导入</j-upload-button
-                <a-menu-item key="1" @click="batchHandleDelete">
+        >
-                  <Icon icon="ant-design:delete-outlined"></Icon>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
-                  删除
+          <template #overlay>
-                </a-menu-item>
+            <a-menu>
-              </a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
-            </template>
+                <Icon icon="ant-design:delete-outlined"></Icon>
-            <a-button v-auth="'bg.xispeak:bg_xi_speak:deleteBatch'"
+                删除
-              >批量操作
+              </a-menu-item>
-              <Icon icon="ant-design:down-outlined"></Icon>
+            </a-menu>
-            </a-button>
+          </template>
-          </a-dropdown>
+          <a-button v-auth="'bg.xispeak:bg_xi_speak:deleteBatch'"
-          <!-- 高级查询 -->
+            >批量操作
-          <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+            <Icon icon="ant-design:down-outlined"></Icon>
-        </template>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+        <div class="table-title-search">
+          <j-select-dept v-model:value="searchDeptIds" placeholder="选择牵头部门" allow-clear style="width: 100%" @change="handleDeptSearch" />
+        </div>
+      </template>
 
-        <!--操作栏-->
+      <!--操作栏-->
-        <template #action="{ record }">
+      <template #action="{ record }">
-          <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
-        </template>
+      </template>
-        <!--字段回显插槽-->
+      <!--字段回显插槽-->
-        <template v-slot:bodyCell="{ column, record, index, text }"> </template>
+      <template v-slot:bodyCell="{ column, record, index, text }"> </template>
-        <!--嵌套子表-->
+    </BasicTable>
-        <template #expandedRowRender="{ record }">
+
-          <div class="feedback-expand-table" v-if="selectedFeedbackId === record.id">
+    <BgXiSpeakFeedbackViewModal ref="feedbackViewModalRef" />
-            <div class="feedback-expand-header">
-              <div class="feedback-expand-title">
-                <span class="feedback-expand-icon">
-                  <Icon icon="ant-design:message-outlined" />
-                </span>
-                <span>反馈信息</span>
-                <a-tag class="feedback-expand-count" color="processing">
-                  {{ getFeedbackTableLoading(record) ? '加载中' : `${getFeedbackCount(record)} 条` }}
-                </a-tag>
-              </div>
-              <div class="feedback-expand-actions">
-                <a-button type="link" size="small" @click="handleCloseFeedback">收起</a-button>
-              </div>
-            </div>
-            <BasicTable
-              class="feedback-inner-table"
-              bordered
-              size="small"
-              rowKey="id"
-              :canResize="false"
-              :showIndexColumn="false"
-              :showActionColumn="false"
-              :showTableSetting="false"
-              :clickToRowSelect="false"
-              :columns="feedbackExpandColumns"
-              :dataSource="getFeedbackTableData(record)"
-              :loading="getFeedbackTableLoading(record)"
-              :pagination="false"
-              :scroll="{ x: 1220 }"
-            >
-              <template #feedbackAttachments="{ record: feedbackRecord }">
-                <SUploadFile
-                  v-if="feedbackRecord.id"
-                  class="feedback-attachment-list"
-                  :bussiness-id="feedbackRecord.id"
-                  :disabled="true"
-                  :multiple="true"
-                />
-                <span v-else>-</span>
-              </template>
-            </BasicTable>
-          </div>
-        </template>
-      </BasicTable>
     <!-- 表单区域 -->
     <BgXiSpeakModal ref="registerModal" @success="handleSuccess"></BgXiSpeakModal>
     <!-- 审批记录 -->
@@ -94,20 +57,21 @@
 <script lang="ts" name="bg.xispeak-bgXiSpeak" setup>
   import { ref, reactive, unref, computed, provide } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import type { BasicColumn } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { startProcessSchedules } from '/@/api/common/api';
   import { dateUtil } from '/@/utils/dateUtil';
-  import Icon from '/@/components/Icon/index';
+
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import BgXiSpeakModal from './components/BgXiSpeakModal.vue';
-  import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
+
   import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
   import FlowScheduleStartModal from '/src/components/semri/process/FlowScheduleStartModal.vue';
   import FeedbackRightNowModal from './components/FeedbackRightNowModal.vue';
+  import BgXiSpeakFeedbackViewModal from './components/BgXiSpeakFeedbackViewModal.vue';
   import { columns as taskTaskColumns } from '/@/views/taskProcess/TaskTask.data';
-  import { columns, superQuerySchema, bgXiSpeakFeedbackColumns } from './BgXiSpeak.data';
+  import { columns, superQuerySchema } from './BgXiSpeak.data';
   import {
     list,
     deleteBgXiSpeak,
@@ -118,8 +82,9 @@
     getChildListBatch,
     updateLaunchType,
     saveOrUpdateDict,
-    bgXiSpeakFeedbackList,
     withDrawXiSpeak,
+    getRootListWithDept,
+    bgXiSpeakFeedbackList,
   } from './BgXiSpeak.api';
 
   const FLOW_CODE = 'dev_bg_xi_speak_001';
@@ -131,32 +96,16 @@
   const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
   const { createMessage } = useMessage();
   const expandedRowKeys = ref([]);
-  const queryParam = ref<any>({});
+  const queryParams = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   const flowScheduleModalRef = ref();
+  const feedbackViewModalRef = ref();
   const feedbackRightNowModalRef = ref();
   const businessProcessListModalRef = ref();
   const currentBusinessId = ref('');
   const pendingFeedbackRightNow = ref(0);
   const processColumns = taskTaskColumns;
-  const selectedFeedbackId = ref<string | number | null>(null);
-  const feedbackTableData = reactive<Record<string, Recordable[]>>({});
-  const feedbackTableLoading = reactive<Record<string, boolean>>({});
-
-  // 注册table数据
-  const feedbackExpandColumns: BasicColumn[] = [
-    ...bgXiSpeakFeedbackColumns,
-    {
-      title: '附件下载',
-      dataIndex: 'id',
-      key: 'attachments',
-      align: 'left',
-      width: 340,
-      slots: { customRender: 'feedbackAttachments' },
-    },
-  ];
-
   // 是否显示DW领导列表选择
   const showSdwLeaderSelect = computed(() => queryParam.value.needSdwApproval === '1');
 
@@ -187,10 +136,31 @@
     },
   });
 
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource, setTableData }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
   provide('mainId', mainId);
 
+  const searchDeptIds = ref([]);
+  const isDeptSearching = ref(false);
+
+  async function handleDeptSearch(value) {
+    if (!value || (Array.isArray(value) && value.length === 0)) {
+      isDeptSearching.value = false;
+      reload();
+      return;
+    }
+    const deptIds = Array.isArray(value) ? value.join(',') : value;
+    try {
+      const res = await getRootListWithDept(deptIds);
+      isDeptSearching.value = true;
+      const records = res?.records || res || [];
+      setTableData(records);
+    } catch (e) {
+      createMessage.error('按部门查询失败');
+    }
+  }
+
   const labelCol = reactive({
     xs: 24,
     sm: 4,
@@ -305,12 +275,14 @@
   async function handleExpand(expanded, record) {
     if (expanded) {
       expandedRowKeys.value.push(record.id);
-      // 懒加载子节点
       if (record.children && record.children.length > 0 && record.children[0].isLoading) {
         let result = await getChildList({ pid: record.id });
         result = result.records ? result.records : result;
         if (result && result.length > 0) {
           record.children = getDataByResult(result);
+          await refreshFeedbackCounts(record.children);
+          // 触发表格重新渲染
+          updateTableDataRecord(record.id, { ...record });
         } else {
           record.children = null;
           record.hasChild = '0';
@@ -339,11 +311,77 @@
     }
   }
 
+  /**
+   * 递归收集所有 ID（含子节点）
+   */
+  function collectAllIds(records) {
+    const ids: string[] = [];
+    const walk = (list) => {
+      if (!list) return;
+      for (const item of list) {
+        if (item.id) ids.push(item.id);
+        if (item.children) walk(item.children);
+      }
+    };
+    walk(records);
+    return ids;
+  }
+
+  /**
+   * 批量查询反馈统计数量并更新到 records 中
+   */
+  async function refreshFeedbackCounts(records) {
+    const ids = collectAllIds(records);
+    if (ids.length === 0) return;
+    try {
+      // 并行加载所有记录的反馈数据
+      const results = await Promise.all(
+        ids.map((id) =>
+          bgXiSpeakFeedbackList({
+            mainId: id,
+            pageNo: 1,
+            pageSize: 9999,
+            column: 'createTime',
+            order: 'desc',
+          }).catch(() => null)
+        )
+      );
+      // 构建 id -> { total, closed } 映射
+      const countsMap: Record<string, { total: number; closed: number }> = {};
+      ids.forEach((id, index) => {
+        const res = results[index];
+        const list = Array.isArray(res) ? res : res?.records || [];
+        const total = list.length;
+        const closed = list.filter((item: any) => item.completionStatus == 1).length;
+        countsMap[id] = { total, closed };
+      });
+      const updateFn = (list) => {
+        if (!list) return;
+        for (const item of list) {
+          const counts = countsMap[item.id];
+          if (counts) {
+            item.implCount = counts.total;
+            item.closedCount = counts.closed;
+          }
+          if (item.children) updateFn(item.children);
+        }
+      };
+      updateFn(records);
+    } catch (e) {
+      // 静默处理查询异常
+    }
+  }
+
   /**
    * 接口请求成功后回调
    */
-  function onFetchSuccess(result) {
+  async function onFetchSuccess(result) {
     getDataByResult(result.items) && loadDataByExpandedRows();
+    if (result.items && result.items.length > 0) {
+      await refreshFeedbackCounts(result.items);
+      // 触发表格重新渲染以显示更新后的 implCount / closedCount
+      setTableData([...getDataSource()]);
+    }
   }
 
   /**
@@ -444,11 +482,11 @@
         },
         auth: 'bg.xispeak:bg_xi_speak:delete',
       },
-      {
+      // {
-        label: '审批进度',
+      //   label: '审批进度',
-        onClick: handlePreviewPic.bind(null, record),
+      //   onClick: handlePreviewPic.bind(null, record),
-        ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
+      //   ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
-      },
+      // },
       {
         label: '查询督办流程',
         onClick: handleQueryProcess.bind(null, record),
@@ -463,14 +501,14 @@
         ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
       },
       {
-        label: selectedFeedbackId.value === record.id ? '收起反馈信息' : '查看反馈',
+        label: '查看反馈',
         onClick: handleViewFeedback.bind(null, record),
       },
     ];
 
     if (record.bpmStatus == '1' || !record.bpmStatus) {
       dropDownAction.push({
-        label: '发起督办计划收集流程',
+        label: '发起落实措施收集流程',
         onClick: handleProcess.bind(null, record),
       });
       dropDownAction.push({
@@ -508,8 +546,8 @@
   }
 
   function getLeadDeptOptions(record) {
-    const deptIds = splitDeptValue(record?.leadDepartment);
+    const deptIds = splitDeptValue(record?.implDept);
-    const deptNames = splitDeptValue(record?.leadDepartment_dictText);
+    const deptNames = splitDeptValue(record?.implDept_dictText);
     return deptIds.map((deptId, index) => ({
       value: deptId,
       label: deptNames[index] || deptId,
@@ -528,7 +566,7 @@
   function handleFeedbackRightNowConfirm({ record, feedbackRightNow }) {
     pendingFeedbackRightNow.value = feedbackRightNow;
     flowScheduleModalRef.value?.open({
-      title: '发起督办计划收集流程',
+      title: '发起落实措施收集流程',
       payload: { record },
       deptOptions: getLeadDeptOptions(record),
       showSuoleaderFields: true,
@@ -598,6 +636,24 @@
         return;
       }
 
+      // 查询已有反馈记录，按部门获取处理人姓名
+      const deptHandlerMap = new Map<string, string>();
+      try {
+        const feedbackRes = await bgXiSpeakFeedbackList({ mainId: record.id, pageNo: 1, pageSize: 999 });
+        const feedbackRecords = feedbackRes?.records || feedbackRes?.result?.records || [];
+        for (const fb of feedbackRecords) {
+          const fbDeptIds = splitDeptValue(fb.responDeptid);
+          const handlerName = fb.responPersonname || '';
+          for (const fbDeptId of fbDeptIds) {
+            if (fbDeptId && handlerName && !deptHandlerMap.has(fbDeptId)) {
+              deptHandlerMap.set(fbDeptId, handlerName);
+            }
+          }
+        }
+      } catch (e) {
+        // 查询反馈失败则继续，deptHandlerName 留空
+      }
+
       let successCount = 0;
       const total = selectedDeptIds.length;
 
@@ -622,6 +678,7 @@
             urgencyLevel: record.completionStatus,
             deptId: deptId,
             deptLeaderId: deptId,
+            deptHandlerName: deptHandlerMap.get(deptId) || '',
             requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
             deadline: record.deadline || formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
           },
@@ -657,7 +714,7 @@
         title: record.speakStatus,
         content: record.implStatus,
         urgencyLevel: record.completionStatus,
-        deptId: options.deptId || record.leadDepartment,
+        deptId: options.deptId || record.implDept,
         deptLeaderId: record.responsiblePerson,
         requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
         deadline: record.deadline || formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
@@ -677,53 +734,8 @@
     });
   }
 
-  function getFeedbackKey(record: Recordable) {
-    return String(record?.id ?? '');
-  }
-
-  function getFeedbackTableData(record: Recordable) {
-    return feedbackTableData[getFeedbackKey(record)] || [];
-  }
-
-  function getFeedbackCount(record: Recordable) {
-    return getFeedbackTableData(record).length;
-  }
-
-  function getFeedbackTableLoading(record: Recordable) {
-    return !!feedbackTableLoading[getFeedbackKey(record)];
-  }
-
-  function handleCloseFeedback() {
-    selectedFeedbackId.value = null;
-  }
-
-  async function loadFeedbackTableData(mainId: string | number) {
-    const key = String(mainId);
-    feedbackTableLoading[key] = true;
-    try {
-      const res = await bgXiSpeakFeedbackList({
-        mainId,
-        pageNo: 1,
-        pageSize: 9999,
-        column: 'createTime',
-        order: 'desc',
-      });
-      feedbackTableData[key] = Array.isArray(res) ? res : res?.records || [];
-    } finally {
-      feedbackTableLoading[key] = false;
-    }
-  }
-
   async function handleViewFeedback(record: Recordable) {
-    const mainId = record.id;
+    feedbackViewModalRef.value.open(record);
-    if (selectedFeedbackId.value === mainId) {
-      selectedFeedbackId.value = null;
-    } else {
-      selectedFeedbackId.value = mainId;
-      if (!feedbackTableData[mainId] || feedbackTableData[mainId].length === 0) {
-        await loadFeedbackTableData(mainId);
-      }
-    }
   }
 
   /**
@@ -753,97 +765,10 @@
 </script>
 
 <style lang="less" scoped>
-  .feedback-expand-table {
+  .table-title-search {
-    margin: 4px 10px 12px 42px;
+    display: inline-flex;
-    padding: 12px 14px 14px;
+    align-items: center;
-    background: #f6fbff;
+    margin-left: 8px;
-    border: 1px solid #d6e8ff;
+    width: 280px;
-    border-left: 4px solid #1677ff;
-    border-radius: 6px;
-
-    .feedback-expand-header {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      gap: 12px;
-      margin-bottom: 10px;
-    }
-
-    .feedback-expand-title {
-      display: inline-flex;
-      align-items: center;
-      min-width: 0;
-      color: #1f2937;
-      font-size: 14px;
-      font-weight: 600;
-      line-height: 24px;
-    }
-
-    .feedback-expand-icon {
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      width: 24px;
-      height: 24px;
-      margin-right: 8px;
-      color: #1677ff;
-      background: #e6f4ff;
-      border-radius: 50%;
-    }
-
-    .feedback-expand-count {
-      margin-left: 10px;
-    }
-
-    .feedback-expand-actions {
-      display: flex;
-      align-items: center;
-    }
-
-    :deep(.jeecg-basic-table) {
-      background: #fff;
-    }
-
-    :deep(.feedback-inner-table .ant-table-wrapper) {
-      padding: 0;
-      border-radius: 4px;
-    }
-
-    :deep(.feedback-inner-table .ant-table-thead > tr > th) {
-      background: #eef6ff;
-      color: #334155;
-      font-weight: 600;
-    }
-
-    :deep(.feedback-inner-table .ant-table-tbody > tr > td) {
-      background: #fff;
-    }
-
-    :deep(.feedback-inner-table .ant-table-tbody > tr:hover > td) {
-      background: #f8fbff;
-    }
-
-    .feedback-attachment-list {
-      min-width: 300px;
-
-      :deep(.file-list-wrapper) {
-        min-height: auto;
-        padding: 8px;
-      }
-
-      :deep(.file-list-header) {
-        margin-bottom: 6px;
-        padding-bottom: 6px;
-      }
-
-      :deep(.file-list .file-item) {
-        padding: 8px;
-        margin-bottom: 6px;
-      }
-
-      :deep(.ant-empty) {
-        margin: 0;
-      }
-    }
   }
 </style>

src/views/bg/xispeak/components/BgXiSpeakBPMFeedbackModal.vue

@@ -1,6 +1,6 @@
 <template>
   <JModal
-    title="新增反馈"
+    :title="isEdit ? '编辑反馈' : '新增反馈'"
     :width="820"
     :visible="visible"
     :confirmLoading="saving"
@@ -9,14 +9,7 @@
     @ok="handleOk"
     @cancel="handleCancel"
   >
-    <a-form
+    <a-form ref="formRef" class="bpm-feedback-modal-form" :model="formData" :rules="formRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
-      ref="formRef"
-      class="bpm-feedback-modal-form"
-      :model="formData"
-      :rules="formRules"
-      :labelCol="labelCol"
-      :wrapperCol="wrapperCol"
-    >
       <a-row :gutter="16">
         <a-col :span="12">
           <a-form-item label="反馈部门" name="responDeptid">
@@ -28,9 +21,15 @@
             <j-select-user v-model:value="formData.responPersonid" allow-clear @change="handleUserChange" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
+        <!--        <a-col :span="12">-->
-          <a-form-item label="序号" name="num">
+        <!--          <a-form-item label="序号" name="num">-->
-            <a-input-number v-model:value="formData.num" style="width: 100%" allow-clear />
+        <!--            <a-input-number v-model:value="formData.num" style="width: 100%" allow-clear />-->
+        <!--          </a-form-item>-->
+        <!--        </a-col>-->
+
+        <a-col :span="24">
+          <a-form-item label="具体措施" name="method" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+            <a-textarea v-model:value="formData.method" :rows="3" allow-clear />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -38,11 +37,6 @@
             <a-date-picker v-model:value="formData.deadline" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
           </a-form-item>
         </a-col>
-        <a-col :span="24">
-          <a-form-item label="措施内容" name="method" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-            <a-textarea v-model:value="formData.method" :rows="3" allow-clear />
-          </a-form-item>
-        </a-col>
         <a-col :span="12">
           <a-form-item label="成果形式" name="outcomeForm">
             <a-input v-model:value="formData.outcomeForm" allow-clear />
@@ -50,75 +44,47 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="完成状态" name="completionStatus">
-            <a-input v-model:value="formData.completionStatus" allow-clear />
+            <JDictSelectTag v-model:value="formData.completionStatus" dictCode="measure_complete_status" placeholder="请选择完成状态" type="select" allow-clear />
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="是否有报送上级报告" name="isReportedToHigher">
+            <JDictSelectTag v-model:value="formData.isReportedToHigher" dictCode="need_report_higher" placeholder="请选择" type="select" allow-clear />
+          </a-form-item>
+        </a-col>
+
         <a-col :span="24">
           <a-form-item label="进展情况" name="progress" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
             <a-textarea v-model:value="formData.progress" :rows="3" allow-clear />
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <!--        <a-col :span="24">-->
-          <a-form-item label="落实情况" name="implStatus" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+        <!--          <a-form-item label="落实情况" name="implStatus" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">-->
-            <a-textarea v-model:value="formData.implStatus" :rows="3" allow-clear />
+        <!--            <a-textarea v-model:value="formData.implStatus" :rows="3" allow-clear />-->
+        <!--          </a-form-item>-->
+        <!--        </a-col>-->
+<!--        <a-col :span="24">-->
+<!--          <a-form-item label="落实计划" name="completionPlan" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">-->
+<!--            <a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />-->
+<!--          </a-form-item>-->
+<!--        </a-col>-->
+        <a-col v-if="showJiJianFields" :span="12">
+          <a-form-item label="检查情况(纪检)" name="checkStatus">
+            <a-input v-model:value="formData.checkStatus" placeholder="填写监督检查情况，成果是否完整，符合，时间是否按时等" allow-clear />
+          </a-form-item>
+        </a-col>
+        <a-col v-if="showJiJianFields" :span="24">
+          <a-form-item label="监督意见(纪检)" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+            <a-textarea v-model:value="formData.inspectionAdvice" placeholder="是否通过审核" :rows="3" allow-clear />
+          </a-form-item>
+        </a-col>
+        <a-col v-if="showJiJianFields" :span="12">
+          <a-form-item label="措施数量(纪检)" name="measureNum">
+            <a-input-number v-model:value="formData.measureNum" placeholder="填写本条举措设计的措施数量" style="width: 100%" allow-clear />
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="落实计划" name="completionPlan" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+          <a-form-item label="体现落实措施，取得成果的证明材料" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-            <a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="总措施号" name="sumMethodNum">
-            <a-input v-model:value="formData.sumMethodNum" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="检查情况" name="checkStatus">
-            <a-input v-model:value="formData.checkStatus" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="监督意见" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-            <a-textarea v-model:value="formData.inspectionAdvice" :rows="3" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="措施数量" name="measureNum">
-            <a-input-number v-model:value="formData.measureNum" style="width: 100%" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="发起类型" name="launchType">
-            <a-select v-model:value="formData.launchType" placeholder="请选择发起类型" allow-clear>
-              <a-select-option :value="0">立即发起</a-select-option>
-              <a-select-option :value="1">周期发起</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="周期类型" name="intervalType">
-            <a-select v-model:value="formData.intervalType" placeholder="请选择周期类型" allow-clear>
-              <a-select-option :value="1">日</a-select-option>
-              <a-select-option :value="2">周</a-select-option>
-              <a-select-option :value="3">两周</a-select-option>
-              <a-select-option :value="4">月</a-select-option>
-              <a-select-option :value="5">季</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="周期任务数量" name="startCount">
-            <a-input-number v-model:value="formData.startCount" style="width: 100%" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="周期开始时间" name="startTime">
-            <a-date-picker v-model:value="formData.startTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" placeholder="请选择周期开始时间" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="附件" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
             <SUploadFile
               :key="uploadKey"
               ref="uploadFileRef"
@@ -143,13 +109,18 @@
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   const emit = defineEmits(['success']);
+  const props = defineProps({
+    showJiJianFields: { type: Boolean, default: false },
+  });
   const { createMessage } = useMessage();
   const userStore = useUserStore();
 
   const visible = ref(false);
   const saving = ref(false);
+  const isEdit = ref(false);
   const formRef = ref();
   const uploadFileRef = ref<InstanceType<typeof SUploadFile> | null>(null);
   const uploadSecretLevel = ref(1);
@@ -167,6 +138,7 @@
     responPersonname: '',
     implStatus: '',
     completionStatus: '',
+    isReportedToHigher: undefined,
     completionPlan: '',
     mainId: '',
     bpmProcessId: '',
@@ -186,7 +158,8 @@
   });
 
   const formRules = {
-    implStatus: [{ required: true, message: '请输入落实情况' }],
+    progress: [{ required: true, message: '请输入进展情况' }],
+    completionStatus: [{ required: true, message: '请选择完成状态' }],
   };
 
   function resetForm(mainId = '', bpmProcessId = '') {
@@ -205,11 +178,23 @@
 
   function open(mainId: string, secretLevel?: string | number, bpmProcessId = '') {
     resetForm(mainId, bpmProcessId);
+    isEdit.value = false;
     uploadSecretLevel.value = normalizeSecretLevel(secretLevel);
     void applyCurrentUserFeedbackInfo();
     visible.value = true;
   }
 
+  function openEdit(record: Record<string, any>) {
+    resetForm(record.mainId || '', record.bpmProcessId || '');
+    isEdit.value = true;
+    Object.keys(formData).forEach((key) => {
+      if (record[key] !== undefined) {
+        formData[key] = record[key];
+      }
+    });
+    visible.value = true;
+  }
+
   function normalizeSecretLevel(value?: string | number) {
     const level = Number(value);
     return [1, 2, 3, 4].includes(level) ? level : 1;
@@ -277,7 +262,7 @@
       if (!formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
         formData.id = buildUUID();
       }
-      const res = await bgXiSpeakFeedbackSaveOrUpdate({ ...formData }, false);
+      const res = await bgXiSpeakFeedbackSaveOrUpdate({ ...formData }, isEdit.value);
       if (res.success) {
         if (formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
           await uploadFileRef.value.bindBussinessId(formData.id);
@@ -295,6 +280,7 @@
 
   defineExpose({
     open,
+    openEdit,
   });
 </script>
 

src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue

@@ -1,7 +1,14 @@
 <template>
   <a-spin :spinning="loading">
     <div class="bg-xispeak-bpm-form">
-      <a-form class="main-form" :class="{ 'main-form-readonly': mainDisabled }" labelAlign="left" :labelCol="labelCol" :wrapperCol="wrapperCol" :model="mainForm">
+      <a-form
+        class="main-form"
+        :class="{ 'main-form-readonly': mainDisabled }"
+        labelAlign="left"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        :model="mainForm"
+      >
         <div class="base-info-header section-toolbar">
           <div class="section-title">基础信息</div>
           <a-space class="section-actions">
@@ -9,7 +16,12 @@
               <Icon icon="ant-design:save-outlined" />
               保存
             </a-button>
-            <a-button class="section-action-button" :type="showBaseInfoDetail ? 'default' : 'link'" size="small" @click="showBaseInfoDetail = !showBaseInfoDetail">
+            <a-button
+              class="section-action-button"
+              :type="showBaseInfoDetail ? 'default' : 'link'"
+              size="small"
+              @click="showBaseInfoDetail = !showBaseInfoDetail"
+            >
               <Icon :icon="showBaseInfoDetail ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
               {{ showBaseInfoDetail ? '收起基础信息' : '展开全部信息' }}
             </a-button>
@@ -32,6 +44,17 @@
                 <a-date-picker v-model:value="mainForm.time" value-format="YYYY-MM-DD" :disabled="mainDisabled" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="密级" name="secretLevel">
+                <j-dict-select-tag
+                  v-model:value="mainForm.secretLevel"
+                  dictCode="secret_level"
+                  placeholder="请选择密级"
+                  :disabled="mainDisabled"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="责任人" name="responsiblePerson">
                 <j-select-user v-model:value="mainForm.responsiblePerson" :disabled="mainDisabled" allow-clear />
@@ -43,12 +66,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="牵头部门" name="leadDepartment">
+              <a-form-item label="牵头部门" name="implDept">
-                <j-select-dept v-model:value="mainForm.leadDepartment" :disabled="mainDisabled" :multiple="true" checkStrictly allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="落实部门" name="implDept">
                 <j-select-dept v-model:value="mainForm.implDept" :disabled="mainDisabled" :multiple="true" checkStrictly allow-clear />
               </a-form-item>
             </a-col>
@@ -79,12 +97,25 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成状态" name="completionStatus">
-                <JDictSelectTag v-model:value="mainForm.completionStatus" dictCode="db_status" placeholder="请选择完成状态" type="radio" :disabled="mainDisabled" />
+                <JDictSelectTag
+                  v-model:value="mainForm.completionStatus"
+                  dictCode="db_status"
+                  placeholder="请选择完成状态"
+                  type="radio"
+                  :disabled="mainDisabled"
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="截止日期" name="deadline">
-                <a-date-picker v-model:value="mainForm.deadline" value-format="YYYY-MM-DD HH:mm:ss" :show-time="true" :disabled="mainDisabled" style="width: 100%" allow-clear />
+                <a-date-picker
+                  v-model:value="mainForm.deadline"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  :show-time="true"
+                  :disabled="mainDisabled"
+                  style="width: 100%"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -125,7 +156,15 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="父级节点" name="pid">
-                <j-tree-select v-model:value="mainForm.pid" dict="bg_xi_speak,impl_status,id" pidField="pid" pidValue="0" hasChildField="has_child" :disabled="mainDisabled" allow-clear />
+                <j-tree-select
+                  v-model:value="mainForm.pid"
+                  dict="bg_xi_speak,impl_status,id"
+                  pidField="pid"
+                  pidValue="0"
+                  hasChildField="has_child"
+                  :disabled="mainDisabled"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -139,37 +178,49 @@
 
       <a-divider />
 
-      <div class="feedback-header section-toolbar">
+      <div class="feedback-header section-toolbar" v-if="showFeedbackInfo">
         <div class="section-title">反馈信息</div>
-        <a-button v-if="showAddFeedback" class="section-action-button feedback-add-button" type="primary" @click="openFeedbackModal">
+        <a-space class="section-actions">
-          <Icon icon="ant-design:plus-outlined" />
+          <a-button v-if="showAddFeedback" class="section-action-button feedback-add-button" type="primary" @click="openFeedbackModal">
-          新增反馈
+            <Icon icon="ant-design:plus-outlined" />
-        </a-button>
+            新增反馈
+          </a-button>
+          <a-button
+            class="section-action-button"
+            :type="showFeedbackDetail ? 'default' : 'link'"
+            size="small"
+            @click="showFeedbackDetail = !showFeedbackDetail"
+          >
+            <Icon :icon="showFeedbackDetail ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+            {{ showFeedbackDetail ? '收起反馈信息' : '展开反馈信息' }}
+          </a-button>
+        </a-space>
       </div>
       <a-table
+        v-if="showFeedbackInfo"
         rowKey="id"
         size="small"
         bordered
         :columns="feedbackColumns"
         :data-source="feedbackList"
         :pagination="false"
-        :scroll="{ x: 1400 }"
+        :scroll="{ x: 2080 }"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'attachments'">
-            <SUploadFile
+            <SUploadFile v-if="record.id" class="feedback-attachment-list" :bussiness-id="record.id" :disabled="true" :multiple="true" />
-              v-if="record.id"
-              class="feedback-attachment-list"
-              :bussiness-id="record.id"
-              :disabled="true"
-              :multiple="true"
-            />
             <span v-else>-</span>
           </template>
+          <template v-if="column.key === 'feedbackAction'">
+            <a-button type="link" size="small" @click="handleEditFeedback(record)">编辑</a-button>
+            <a-popconfirm title="确定删除该反馈吗？" @confirm="handleDeleteFeedback(record)">
+              <a-button type="link" size="small" danger>删除</a-button>
+            </a-popconfirm>
+          </template>
         </template>
       </a-table>
 
-      <BgXiSpeakBPMFeedbackModal ref="feedbackModalRef" @success="loadFeedbackList" />
+      <BgXiSpeakBPMFeedbackModal ref="feedbackModalRef" :showJiJianFields="showJiJianFields" @success="loadFeedbackList" />
 
       <template v-if="showProcessHandle">
         <a-divider />
@@ -186,13 +237,9 @@
                 </a-radio-group>
               </a-form-item>
             </a-col>
-            <a-col v-if="showSubApproveUserSelector" :span="12">
+            <a-col v-if="showSubApproveUser" :span="12">
               <a-form-item label="部门经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-                <j-select-user
+                <j-select-user v-model:value="subApproveUser" :disabled="savingSubApproveUser" allow-clear />
-                  v-model:value="subApproveUser"
-                  :disabled="savingSubApproveUser"
-                  allow-clear
-                />
               </a-form-item>
             </a-col>
           </a-row>
@@ -218,7 +265,14 @@
   import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import Icon from '/@/components/Icon/index';
-  import { bgXiSpeakFeedbackList, saveBpmForm, setProcessVariable } from '../BgXiSpeak.api';
+  import {
+    bgXiSpeakFeedbackList,
+    bgXiSpeakFeedbackListWithDept,
+    bgXiSpeakFeedbackDelete,
+    saveBpmForm,
+    setProcessVariable,
+    updateDeptHandlerName,
+  } from '../BgXiSpeak.api';
   import { usePermission } from '/@/hooks/web/usePermission';
   import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
   import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
@@ -234,8 +288,8 @@
   });
 
   initBpmFormData(props.formData);
-  console.log("@props.formData", props.formData);
+  console.log('@props.formData', props.formData);
-  console.log("@props", props);
+  console.log('@props', props);
 
   const emit = defineEmits(['ok', 'success', 'claimSuccess']);
   const { createMessage } = useMessage();
@@ -253,6 +307,7 @@
   const savingMain = ref(false);
   const savingSubApproveUser = ref(false);
   const showBaseInfoDetail = ref(true);
+  const showFeedbackDetail = ref(true);
   const feedbackList = ref<any[]>([]);
   const subApproveUser = ref('');
   const isEnd = ref(0);
@@ -264,11 +319,11 @@
     time: '',
     elmComment: '',
     status: '',
+    secretLevel: '',
     responsiblePerson: '',
     needSdwApproval: 0,
     sdwLeaderList: '',
     implPlan: '',
-    leadDepartment: '',
     implMeasures: '',
     numberOfResolutions: undefined,
     implStatus: '',
@@ -286,16 +341,30 @@
     supervisionCount: undefined,
   });
 
-  const feedbackColumns = [
+  const feedbackColumns = computed(() => {
-    { title: '序号', dataIndex: 'num', align: 'center', width: 60 },
+    const cols: any[] = [
-    { title: '反馈部门名称', dataIndex: 'responDeptname', align: 'center', width: 140 },
+      { title: '序号', dataIndex: 'num', align: 'center', width: 60 },
-    { title: '反馈人姓名', dataIndex: 'responPersonname', align: 'center', width: 120 },
+      { title: '反馈部门名称', dataIndex: 'responDeptname', align: 'center', width: 140 },
-    { title: '措施内容', dataIndex: 'method', align: 'left', width: 200 },
+      { title: '反馈人姓名', dataIndex: 'responPersonname', align: 'center', width: 120 },
-    { title: '完成状态', dataIndex: 'completionStatus_dictText', align: 'center', width: 100 },
+      { title: '措施内容', dataIndex: 'method', align: 'left', width: 200 },
-    { title: '进展情况', dataIndex: 'progress', align: 'left', width: 200 },
+      { title: '完成状态', dataIndex: 'completionStatus_dictText', align: 'center', width: 100 },
-    { title: '落实情况', dataIndex: 'implStatus', align: 'left', width: 200 },
+      { title: '是否有报送上级报告', dataIndex: 'isReportedToHigher_dictText', align: 'center', width: 140 },
-    { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
+      { title: '进展情况', dataIndex: 'progress', align: 'left', width: 200 },
-  ];
+      { title: '落实情况', dataIndex: 'implStatus', align: 'left', width: 200 },
+      { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
+    ];
+    if (showJiJianFields.value) {
+      cols.push(
+        { title: '检查情况(纪检)', dataIndex: 'checkStatus', align: 'left', width: 160 },
+        { title: '监督意见(纪检)', dataIndex: 'inspectionAdvice', align: 'left', width: 160 },
+        { title: '措施数量(纪检)', dataIndex: 'measureNum', align: 'center', width: 100 }
+      );
+    }
+    if (showEditFeedback.value) {
+      cols.push({ title: '操作', dataIndex: 'id', key: 'feedbackAction', align: 'center', width: 120, fixed: 'right' });
+    }
+    return cols;
+  });
 
   const mainDisabled = computed(() => {
     if (props.formBpm) {
@@ -303,9 +372,36 @@
     }
     return props.formDisabled;
   });
-  const showProcessHandle = computed(() => props.formBpm && !!props.formData?.taskId);
+  const showProcessHandle = computed(() => {
-  const showAddFeedback = computed(() => String(props.formData?.extendUrlParams?.addfeedback ?? '') === '1');
+    const explicit = props.formData?.extendUrlParams?.showProcessHandle;
-  const showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.selectuser ?? '') === '1');
+    if (explicit === '0') return false;
+    if (explicit === '1') return true;
+    return props.formBpm && !!props.formData?.taskId;
+  });
+  const showAddFeedback = computed(
+    () => String(props.formData?.extendUrlParams?.showAddFeedback ?? props.formData?.extendUrlParams?.addfeedback ?? '') === '1'
+  );
+  const showFeedbackInfo = computed(() => {
+    const p = props.formData?.extendUrlParams;
+    const explicit = p?.showFeedbackInfo ?? p?.showApproveInfo;
+    if (explicit === '0') return false;
+    if (explicit === '1') return true;
+    // 未显式设置时，任一子属性开启则自动显示反馈区域
+    return String(p?.showAddFeedback ?? p?.addfeedback ?? '') === '1'
+      || String(p?.showEditFeedback ?? p?.editfeedback ?? '') === '1'
+      || String(p?.showDeptFeedback ?? p?.deptfeedback ?? '') === '1';
+  });
+  const showEditFeedback = computed(
+    () => String(props.formData?.extendUrlParams?.showEditFeedback ?? props.formData?.extendUrlParams?.editfeedback ?? '') === '1'
+  );
+  const showDeptFeedback = computed(
+    () => String(props.formData?.extendUrlParams?.showDeptFeedback ?? props.formData?.extendUrlParams?.deptfeedback ?? '') === '1'
+  );
+  const showJiJianFields = computed(() => String(props.formData?.extendUrlParams?.showJiJianFields ?? '') === '1');
+  const showDeptFields = computed(() => String(props.formData?.extendUrlParams?.deptfields ?? '') === '1');
+  const showSubApproveUser = computed(
+    () => String(props.formData?.extendUrlParams?.showSubApproveUser ?? props.formData?.extendUrlParams?.selectuser ?? '') === '1'
+  );
   const showSubApproveUserSelector = computed(() => showSubApproveUser.value && String(isEnd.value) !== '1');
 
   const processInfo = computed(() => ({
@@ -327,10 +423,7 @@
     initFormData();
   });
 
-  watch(
+  watch([() => props.formData?.dataId, () => processInfo.value.processInstanceId], () => initFormData());
-    [() => props.formData?.dataId, () => processInfo.value.processInstanceId],
-    () => initFormData()
-  );
 
   watch(
     () => props.formData?.vars?.isEnd,
@@ -368,7 +461,8 @@
       feedbackList.value = [];
       return;
     }
-    const res = await bgXiSpeakFeedbackList({ mainId: mainForm.id, bpmProcessId, pageNo: 1, pageSize: 999 });
+    const apiFn = showDeptFeedback.value ? bgXiSpeakFeedbackListWithDept : bgXiSpeakFeedbackList;
+    const res = await apiFn({ mainId: mainForm.id, bpmProcessId, pageNo: 1, pageSize: 999 });
     feedbackList.value = res?.records || res?.result?.records || [];
   }
 
@@ -429,7 +523,19 @@
       createMessage.warning('流程实例ID不能为空，无法新增反馈');
       return;
     }
-    feedbackModalRef.value?.open(mainForm.id, undefined, processInstanceId);
+    feedbackModalRef.value?.open(mainForm.id, mainForm.secretLevel, processInstanceId);
+  }
+
+  function handleEditFeedback(record) {
+    feedbackModalRef.value?.openEdit(record);
+  }
+
+  async function handleDeleteFeedback(record) {
+    if (!record.id) {
+      createMessage.warning('反馈记录ID不存在');
+      return;
+    }
+    await bgXiSpeakFeedbackDelete({ id: record.id }, loadFeedbackList);
   }
 
   async function saveSubApproveUserVariable(options: { showSuccessMessage?: boolean } = {}) {
@@ -460,6 +566,8 @@
           createMessage.warning(subApproveUserResult.message || '保存失败');
           return false;
         }
+        // 同步更新 task_task 表的 deptHandlerName，供 XiSpeakFeedbackFlow.getImplDeptWorker 使用
+        updateDeptHandlerName({ processInstanceId, deptHandlerName: usernameValue }).catch(() => {});
       }
       if (showSuccessMessage) {
         createMessage.success('保存成功');

src/views/bg/xispeak/components/BgXiSpeakFeedbackForm.vue

@@ -2,21 +2,30 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef" name="BgXiSpeakFeedbackForm">
+        <a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef" :model="formData" :rules="validatorRules" name="BgXiSpeakFeedbackForm">
-          <a-row>
+          <!-- 基本信息 -->
+          <a-divider orientation="left" plain>基本信息</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="12">
-              <a-form-item label="反馈部门" v-bind="validateInfos.responDeptid" name="responDeptid">
+              <a-form-item label="反馈部门" name="responDeptid">
                 <j-select-dept v-model:value="formData.responDeptid" :multiple="true" checkStrictly allow-clear @change="handleDeptChange" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="反馈人" v-bind="validateInfos.responPersonid" name="responPersonid">
+              <a-form-item label="反馈人" name="responPersonid">
                 <j-select-user v-model:value="formData.responPersonid" allow-clear @change="handleUserChange" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="反馈时间" v-bind="validateInfos.responTime" name="responTime">
+              <a-form-item label="反馈时间" name="responTime">
-                <a-date-picker placeholder="请选择反馈时间" v-model:value="formData.responTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
+                <a-date-picker
+                  placeholder="请选择反馈时间"
+                  v-model:value="formData.responTime"
+                  showTime
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -24,6 +33,10 @@
                 <a-input-number v-model:value="formData.num" placeholder="请输入序号" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 措施内容 -->
+          <a-divider orientation="left" plain>措施信息</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="24">
               <a-form-item label="措施内容" name="method">
                 <a-textarea v-model:value="formData.method" placeholder="请输入措施内容" :rows="3" allow-clear></a-textarea>
@@ -31,7 +44,13 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成期限" name="deadline">
-                <a-date-picker placeholder="请选择完成期限" v-model:value="formData.deadline" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
+                <a-date-picker
+                  placeholder="请选择完成期限"
+                  v-model:value="formData.deadline"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -40,22 +59,48 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="进展情况" name="progress">
+              <a-form-item label="进展情况" v-bind="validateInfos.progress" name="progress">
                 <a-textarea v-model:value="formData.progress" placeholder="请输入进展情况" :rows="3" allow-clear></a-textarea>
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 状态与落实 -->
+          <a-divider orientation="left" plain>状态与落实</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="12">
-              <a-form-item label="落实情况" v-bind="validateInfos.implStatus" name="implStatus">
+              <a-form-item label="落实情况" name="implStatus">
                 <a-input v-model:value="formData.implStatus" placeholder="请输入落实情况" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成状态" v-bind="validateInfos.completionStatus" name="completionStatus">
-                <a-input v-model:value="formData.completionStatus" placeholder="请输入完成状态" allow-clear></a-input>
+                <JDictSelectTag
+                  v-model:value="formData.completionStatus"
+                  dictCode="measure_complete_status"
+                  placeholder="请选择完成状态"
+                  type="select"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="是否报送上级报告" name="isReportedToHigher">
+                <JDictSelectTag
+                  v-model:value="formData.isReportedToHigher"
+                  dictCode="need_report_higher"
+                  placeholder="请选择"
+                  type="select"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="检查情况" name="checkStatus">
+                <a-input v-model:value="formData.checkStatus" placeholder="请输入检查情况" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="落实计划" v-bind="validateInfos.completionPlan" name="completionPlan">
+              <a-form-item label="落实计划" name="completionPlan">
                 <a-textarea v-model:value="formData.completionPlan" placeholder="请输入落实计划" :rows="3" allow-clear></a-textarea>
               </a-form-item>
             </a-col>
@@ -65,8 +110,8 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="检查情况" name="checkStatus">
+              <a-form-item label="措施数量" name="measureNum">
-                <a-input v-model:value="formData.checkStatus" placeholder="请输入检查情况" allow-clear></a-input>
+                <a-input-number v-model:value="formData.measureNum" placeholder="请输入措施数量" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -74,11 +119,10 @@
                 <a-textarea v-model:value="formData.inspectionAdvice" placeholder="请输入监督意见" :rows="3" allow-clear></a-textarea>
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+          </a-row>
-              <a-form-item label="措施数量" name="measureNum">
+          <!-- 周期配置 -->
-                <a-input-number v-model:value="formData.measureNum" placeholder="请输入措施数量" style="width: 100%" allow-clear />
+          <a-divider orientation="left" plain>周期配置</a-divider>
-              </a-form-item>
+          <a-row :gutter="[16, 0]">
-            </a-col>
             <a-col :span="12">
               <a-form-item label="发起类型" name="launchType">
                 <a-select v-model:value="formData.launchType" placeholder="请选择发起类型" allow-clear>
@@ -105,15 +149,21 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="周期开始时间" name="startTime">
-                <a-date-picker v-model:value="formData.startTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" placeholder="请选择周期开始时间" allow-clear />
+                <a-date-picker
-              </a-form-item>
+                  v-model:value="formData.startTime"
-            </a-col>
+                  showTime
-            <a-col :span="12">
+                  value-format="YYYY-MM-DD HH:mm:ss"
-              <a-form-item label="外键" name="mainId" style="display: none">
+                  style="width: 100%"
-                <a-input v-model:value="formData.mainId" placeholder="请输入外键" allow-clear></a-input>
+                  placeholder="请选择周期开始时间"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
           </a-row>
+          <!-- 外键隐藏 -->
+          <a-form-item label="外键" name="mainId" style="display: none">
+            <a-input v-model:value="formData.mainId" placeholder="请输入外键" allow-clear></a-input>
+          </a-form-item>
         </a-form>
       </template>
     </JFormContainer>
@@ -122,18 +172,18 @@
 
 <script lang="ts" setup>
   import { ref, reactive, defineExpose, nextTick, inject, unref } from 'vue';
+  import { Form } from 'ant-design-vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getValueType } from '/@/utils';
   import { bgXiSpeakFeedbackSaveOrUpdate } from '../BgXiSpeak.api';
-  import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   const mainId = inject('mainId');
   const formRef = ref();
-  const useForm = Form.useForm;
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
@@ -144,6 +194,7 @@
     responTime: '',
     implStatus: '',
     completionStatus: '',
+    isReportedToHigher: undefined,
     completionPlan: '',
     mainId: '',
     num: undefined,
@@ -164,14 +215,17 @@
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
   const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
   const confirmLoading = ref<boolean>(false);
-  const validatorRules = {};
+  const validatorRules = reactive({
+    completionStatus: [{ required: true, message: '请选择完成状态' }],
+    progress: [{ required: true, message: '请输入进展情况' }],
+  });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
   const props = defineProps({
     disabled: { type: Boolean, default: false },
   });
   const formItemLayout = {
-    labelCol: { xs: { span: 24 }, sm: { span: 5 } },
+    labelCol: { xs: { span: 24 }, sm: { span: 6 } },
-    wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
+    wrapperCol: { xs: { span: 24 }, sm: { span: 18 } },
   };
 
   /**
@@ -222,7 +276,7 @@
 
   async function submitForm() {
     try {
-      await validate();
+      await formRef.value?.validate();
     } catch ({ errorFields }) {
       if (errorFields) {
         const firstField = errorFields[0];

src/views/bg/xispeak/components/BgXiSpeakFeedbackModal.vue

@@ -34,7 +34,7 @@
   }
 
   function handleOk() {
-    registerForm.value.submitForm();
+    return registerForm.value.submitForm();
   }
 
   function submitCallback() {

src/views/bg/xispeak/components/BgXiSpeakFeedbackViewModal.vue

@@ -0,0 +1,100 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="900"
+    :visible="visible"
+    :okButtonProps="{ class: { 'jee-hidden': true } }"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <BasicTable
+      size="small"
+      rowKey="id"
+      :canResize="false"
+      :showIndexColumn="false"
+      :showActionColumn="false"
+      :showTableSetting="false"
+      :clickToRowSelect="false"
+      :columns="columns"
+      :dataSource="feedbackTableData"
+      :loading="loading"
+      :pagination="false"
+      :bordered="false"
+    />
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed, defineExpose } from 'vue';
+  import { BasicTable } from '/@/components/Table';
+  import type { BasicColumn } from '/@/components/Table';
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  import { bgXiSpeakFeedbackList } from '../BgXiSpeak.api';
+
+  const visible = ref(false);
+  const loading = ref(false);
+  const feedbackTableData = ref<Recordable[]>([]);
+  const currentRecord = ref<Recordable>({});
+
+  const columns: BasicColumn[] = [
+    {
+      title: '反馈人',
+      dataIndex: 'responPersonname',
+      align: 'center',
+      width: 100,
+    },
+    {
+      title: '反馈部门',
+      dataIndex: 'responDeptname',
+      align: 'center',
+      width: 140,
+    },
+    {
+      title: '反馈措施',
+      dataIndex: 'method',
+      align: 'left',
+      ellipsis: true,
+    },
+    {
+      title: '完成状态',
+      dataIndex: 'completionStatus_dictText',
+      align: 'center',
+      width: 100,
+    },
+    {
+      title: '成果形式',
+      dataIndex: 'outcomeForm',
+      align: 'center',
+      width: 120,
+    },
+  ];
+
+  const title = computed(() => {
+    const count = loading.value ? '加载中' : `${feedbackTableData.value.length} 条`;
+    return `反馈信息（${count}）`;
+  });
+
+  async function open(record: Recordable) {
+    currentRecord.value = record;
+    visible.value = true;
+    loading.value = true;
+    try {
+      const res = await bgXiSpeakFeedbackList({
+        mainId: record.id,
+        pageNo: 1,
+        pageSize: 9999,
+        column: 'createTime',
+        order: 'desc',
+      });
+      feedbackTableData.value = Array.isArray(res) ? res : res?.records || [];
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({ open });
+</script>

src/views/bg/xispeak/components/BgXiSpeakForm.vue

@@ -5,8 +5,13 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BgXiSpeakForm">
           <a-row>
             <a-col :span="12">
-              <a-form-item label="重要讲话指示批示" v-bind="validateInfos.speakStatus" id="BgXiSpeakForm-speakStatus" name="speakStatus">
+              <a-form-item
-                <a-textarea v-model:value="formData.speakStatus" :rows="4" placeholder="请输入重要指示批示情况" allow-clear />
+                label="习近平总书记重要讲话指示批示情况"
+                v-bind="validateInfos.speakStatus"
+                id="BgXiSpeakForm-speakStatus"
+                name="speakStatus"
+              >
+                <a-textarea v-model:value="formData.speakStatus" :rows="4" placeholder="请输入习近平总书记重要讲话指示批示情况" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -14,23 +19,58 @@
                 <a-date-picker placeholder="请选择时间" v-model:value="formData.time" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="责任人" v-bind="validateInfos.responsiblePerson" id="BgXiSpeakForm-responsiblePerson" name="responsiblePerson">
-                <j-select-user v-model:value="formData.responsiblePerson" allow-clear />
-              </a-form-item>
-            </a-col>
             <a-col :span="12">
               <a-form-item label="企业负责同志批示情况" v-bind="validateInfos.elmComment" id="BgXiSpeakForm-elmComment" name="elmComment">
-                <a-input v-model:value="formData.elmComment" placeholder="请输入" allow-clear></a-input>
+                <a-input v-model:value="formData.elmComment" placeholder="请输入企业负责同志批示情况" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="学习传达研究部署情况" v-bind="validateInfos.status" id="BgXiSpeakForm-status" name="status">
-                <a-input v-model:value="formData.status" placeholder="请输入" allow-clear></a-input>
+                <a-input v-model:value="formData.status" placeholder="请输入学习传达研究部署情况" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="是否需要督办领导" v-bind="validateInfos.needSdwApproval" id="BgXiSpeakForm-needSdwApproval" name="needSdwApproval">
+              <a-form-item label="密级" v-bind="validateInfos.secretLevel" id="BgXiSpeakForm-secretLevel" name="secretLevel">
+                <j-dict-select-tag v-model:value="formData.secretLevel" dictCode="secret_level" placeholder="请选择密级" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="责任人" v-bind="validateInfos.responsiblePerson" id="BgXiSpeakForm-responsiblePerson" name="responsiblePerson">
+                <j-select-user v-model:value="formData.responsiblePerson" placeholder="请从所党委选择责任人" allow-clear />
+              </a-form-item>
+            </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="落实方案" v-bind="validateInfos.implPlan" id="BgXiSpeakForm-implPlan" name="implPlan">-->
+            <!--                <a-input v-model:value="formData.implPlan" placeholder="请输入落实方案" allow-clear></a-input>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
+            <a-col :span="12">
+              <a-form-item label="牵头部门" v-bind="validateInfos.implDept" id="BgXiSpeakForm-implDept" name="implDept">
+                <j-select-dept v-model:value="formData.implDept" :multiple="true" placeholder="请选择牵头部门" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="贯彻落实措施" v-bind="validateInfos.implMeasures" id="BgXiSpeakForm-implMeasures" name="implMeasures">
+                <a-input v-model:value="formData.implMeasures" placeholder="来源于党委会抄告" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item
+                label="会议决策数"
+                v-bind="validateInfos.numberOfResolutions"
+                id="BgXiSpeakForm-numberOfResolutions"
+                name="numberOfResolutions"
+              >
+                <a-input-number v-model:value="formData.numberOfResolutions" placeholder="请输入会议决策数" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item
+                label="是否需要所党委督办领导"
+                v-bind="validateInfos.needSdwApproval"
+                id="BgXiSpeakForm-needSdwApproval"
+                name="needSdwApproval"
+              >
                 <a-radio-group v-model:value="formData.needSdwApproval">
                   <a-radio :value="1">是</a-radio>
                   <a-radio :value="0">否</a-radio>
@@ -38,95 +78,96 @@
               </a-form-item>
             </a-col>
             <a-col v-if="formData.needSdwApproval === 1" :span="12">
-              <a-form-item label="督导领导列表" v-bind="validateInfos.sdwLeaderList" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
+              <a-form-item label="所党委督办领导列表" v-bind="validateInfos.sdwLeaderList" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
-                <j-select-user v-model:value="formData.sdwLeaderList" :multiple="true" allow-clear placeholder="请选择督导领导" />
+                <j-select-user v-model:value="formData.sdwLeaderList" :multiple="true" allow-clear placeholder="请选择督办领导" />
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="12">
+              <a-form-item label="指定落实措施条数" v-bind="validateInfos.implCount" id="BgXiSpeakForm-implCount" name="implCount">
+                <a-input-number
+                  v-model:value="formData.implCount"
+                  placeholder="指定落实措施条数无需输入，每增加一条反馈数量加1"
+                  style="width: 100%"
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="牵头部门" v-bind="validateInfos.leadDepartment" id="BgXiSpeakForm-leadDepartment" name="leadDepartment">
+              <a-form-item label="措施已闭环数量" v-bind="validateInfos.closedCount" id="BgXiSpeakForm-closedCount" name="closedCount">
-                <j-select-dept v-model:value="formData.leadDepartment" :multiple="true" checkStrictly allow-clear />
+                <a-input-number v-model:value="formData.closedCount" placeholder="措施已闭环数量无需输入，每一个牵头部门完成反馈全流程，增加相应反馈数量" style="width: 100%" />
               </a-form-item>
             </a-col>
+<!--            <a-col :span="12">-->
+<!--              <a-form-item label="落实情况" v-bind="validateInfos.implStatus" id="BgXiSpeakForm-implStatus" name="implStatus">-->
+<!--                <a-textarea v-model:value="formData.implStatus" :rows="4" placeholder="请输入" allow-clear />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <a-col :span="12">
-              <a-form-item label="落实部门" v-bind="validateInfos.implDept" id="BgXiSpeakForm-implDept" name="implDept">
+              <a-form-item
-                <j-select-dept v-model:value="formData.implDept" :multiple="true" checkStrictly allow-clear />
+                label="报告反馈情况"
-              </a-form-item>
+                v-bind="validateInfos.reportFeedbackStatus"
-            </a-col>
+                id="BgXiSpeakForm-reportFeedbackStatus"
-            <a-col :span="12">
+                name="reportFeedbackStatus"
-              <a-form-item label="落实方案" v-bind="validateInfos.implPlan" id="BgXiSpeakForm-implPlan" name="implPlan">
+              >
-                <a-input v-model:value="formData.implPlan" placeholder="请输入" allow-clear></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="贯彻落实措施" v-bind="validateInfos.implMeasures" id="BgXiSpeakForm-implMeasures" name="implMeasures">
-                <a-input v-model:value="formData.implMeasures" placeholder="请输入" allow-clear></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="会议决策数" v-bind="validateInfos.numberOfResolutions" id="BgXiSpeakForm-numberOfResolutions" name="numberOfResolutions">
-                <a-input-number v-model:value="formData.numberOfResolutions" placeholder="请输入" style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="落实条数" v-bind="validateInfos.implCount" id="BgXiSpeakForm-implCount" name="implCount">
-                <a-input-number v-model:value="formData.implCount" placeholder="请输入" style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="已闭环数量" v-bind="validateInfos.closedCount" id="BgXiSpeakForm-closedCount" name="closedCount">
-                <a-input-number v-model:value="formData.closedCount" placeholder="请输入" style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="落实情况" v-bind="validateInfos.implStatus" id="BgXiSpeakForm-implStatus" name="implStatus">
-                <a-textarea v-model:value="formData.implStatus" :rows="4" placeholder="请输入" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="报告反馈情况" v-bind="validateInfos.reportFeedbackStatus" id="BgXiSpeakForm-reportFeedbackStatus" name="reportFeedbackStatus">
                 <a-input v-model:value="formData.reportFeedbackStatus" placeholder="请输入" allow-clear></a-input>
               </a-form-item>
             </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="是否存在完成风险" id="BgXiSpeakForm-isCompletionRisk" name="isCompletionRisk">-->
+            <!--                <a-radio-group v-model:value="formData.isCompletionRisk">-->
+            <!--                  <a-radio :value="0">不存在</a-radio>-->
+            <!--                  <a-radio :value="1">存在</a-radio>-->
+            <!--                </a-radio-group>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="12">
-              <a-form-item label="是否存在完成风险" id="BgXiSpeakForm-isCompletionRisk" name="isCompletionRisk">
+              <a-form-item label="完成状态" v-bind="validateInfos.completionStatus" id="BgXiSpeakForm-completionStatus" name="completionStatus">
-                <a-radio-group v-model:value="formData.isCompletionRisk">
-                  <a-radio :value="0">不存在</a-radio>
-                  <a-radio :value="1">存在</a-radio>
-                </a-radio-group>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="完成状态" id="BgXiSpeakForm-completionStatus" name="completionStatus">
                 <JDictSelectTag v-model:value="formData.completionStatus" dictCode="db_status" placeholder="请选择完成状态" type="radio" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="截止日期" id="BgXiSpeakForm-deadline" name="deadline">
+              <a-form-item label="截止日期" v-bind="validateInfos.deadline" id="BgXiSpeakForm-deadline" name="deadline">
-                <a-date-picker placeholder="请选择截止日期" v-model:value="formData.deadline" value-format="YYYY-MM-DD HH:mm:ss" :show-time="true" style="width: 100%" allow-clear />
+                <a-date-picker
-              </a-form-item>
+                  placeholder="请选择截止日期"
-            </a-col>
+                  v-model:value="formData.deadline"
-            <a-col :span="12">
+                  value-format="YYYY-MM-DD HH:mm:ss"
-              <a-form-item label="拖期风险应对措施" v-bind="validateInfos.delayRiskMitigation" id="BgXiSpeakForm-delayRiskMitigation" name="delayRiskMitigation">
+                  :show-time="true"
-                <a-input v-model:value="formData.delayRiskMitigation" placeholder="请输入" allow-clear></a-input>
+                  style="width: 100%"
-              </a-form-item>
+                  allow-clear
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="督办次数" v-bind="validateInfos.supervisionCount" id="BgXiSpeakForm-supervisionCount" name="supervisionCount">
-                <a-input-number v-model:value="formData.supervisionCount" placeholder="请输入" style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="父级节点" v-bind="validateInfos.pid" id="BgXiSpeakForm-pid" name="pid">
-                <j-tree-select
-                  v-model:value="formData.pid"
-                  dict="bg_xi_speak,impl_status,id"
-                  pidField="pid"
-                  pidValue="0"
-                  hasChildField="has_child"
-                  :disabled="disabled"
                 />
               </a-form-item>
             </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item-->
+            <!--                label="拖期风险应对措施"-->
+            <!--                v-bind="validateInfos.delayRiskMitigation"-->
+            <!--                id="BgXiSpeakForm-delayRiskMitigation"-->
+            <!--                name="delayRiskMitigation"-->
+            <!--              >-->
+            <!--                <a-input v-model:value="formData.delayRiskMitigation" placeholder="请输入" allow-clear></a-input>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
+            <a-col :span="12">
+              <a-form-item label="督办次数" v-bind="validateInfos.supervisionCount" id="BgXiSpeakForm-supervisionCount" name="supervisionCount">
+                <a-input-number
+                  v-model:value="formData.supervisionCount"
+                  placeholder="督办次数无需输入，每次发起督办流程自动加1"
+                  style="width: 100%"
+                />
+              </a-form-item>
+            </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="父级节点" v-bind="validateInfos.pid" id="BgXiSpeakForm-pid" name="pid">-->
+            <!--                <j-tree-select-->
+            <!--                  v-model:value="formData.pid"-->
+            <!--                  dict="bg_xi_speak,impl_status,id"-->
+            <!--                  pidField="pid"-->
+            <!--                  pidValue="0"-->
+            <!--                  hasChildField="has_child"-->
+            <!--                  :disabled="disabled"-->
+            <!--                />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center">
               <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
             </a-col>
@@ -164,13 +205,13 @@
     pid: '',
     speakStatus: '',
     time: '',
-    elmComment: '',
+    elmComment: '经单位主要负责同时签批同意，由xx部做好贯彻落实',
-    status: '',
+    status: 'x月x日召开xxxx年第x次党委会议',
+    secretLevel: '',
     responsiblePerson: '',
     needSdwApproval: 0,
     sdwLeaderList: '',
     implPlan: '',
-    leadDepartment: '',
     implMeasures: '',
     numberOfResolutions: undefined,
     implStatus: '',
@@ -195,8 +236,19 @@
   const confirmLoading = ref<boolean>(false);
 
   const validatorRules = reactive({
+    speakStatus: [{ required: true, message: '请输入重要讲话指示批示情况' }],
+    time: [{ required: true, message: '请选择时间' }],
+    elmComment: [{ required: true, message: '请输入企业负责同志批示情况' }],
+    status: [{ required: true, message: '请输入学习传达研究部署情况' }],
+    secretLevel: [{ required: true, message: '请选择密级' }],
+    responsiblePerson: [{ required: true, message: '请选择责任人' }],
     needSdwApproval: [{ required: true, message: '请选择是否需要督办领导' }],
-    speakStatus: [{ required: true, message: '请输入指示批示情况' }],
+    implMeasures: [{ required: true, message: '请输入贯彻落实措施' }],
+    numberOfResolutions: [{ required: true, message: '请输入会议决策数' }],
+    reportFeedbackStatus: [{ required: true, message: '请输入报告反馈情况' }],
+    completionStatus: [{ required: true, message: '请选择完成状态' }],
+    deadline: [{ required: true, message: '请选择截止日期' }],
+    implDept: [{ required: true, message: '请选择牵头部门' }],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 

src/views/bg/xispeak/components/FeedbackRightNowModal.vue

@@ -1,6 +1,6 @@
 <template>
   <JModal
-    title="发起督办计划收集流程"
+    title="发起落实措施收集流程"
     :width="480"
     :visible="visible"
     :confirmLoading="confirming"
@@ -13,7 +13,7 @@
       <a-form-item>
         <a-radio-group v-model:value="feedbackRightNow">
           <a-space direction="vertical">
-            <a-radio :value="1">督办计划收集流程结束后需要立即反馈</a-radio>
+            <a-radio :value="1">落实措施收集流程结束后需要立即反馈</a-radio>
             <a-radio :value="0">无需立即反馈</a-radio>
           </a-space>
         </a-radio-group>