From 71c3b1a708749176221cca3417134d068c996a5b Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Thu, 2 Jul 2026 09:33:38 +0800
Subject: [PATCH 1/8] =?UTF-8?q?czh-20260702-=E9=87=8D=E5=A4=8D=E7=9D=A3?=
 =?UTF-8?q?=E5=8A=9E=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BB=85=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=87=8C=E6=99=A8=E4=B8=A4=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/components/semri/process/FlowScheduleStartModal.vue      | 5 ++---
 src/components/semri/process/FlowScheduleStartModalForBG.vue | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/semri/process/FlowScheduleStartModal.vue b/src/components/semri/process/FlowScheduleStartModal.vue
index 0b08f90..34cb412 100644
--- a/src/components/semri/process/FlowScheduleStartModal.vue
+++ b/src/components/semri/process/FlowScheduleStartModal.vue
@@ -77,8 +77,7 @@
         <a-form-item label="重复开始日期">
           <a-date-picker
             v-model:value="formData.intervalStartTime"
-            show-time
-            valueFormat="YYYY-MM-DD HH:mm:ss"
+            valueFormat="YYYY-MM-DD"
             placeholder="重复开始日期"
             style="width: 100%"
             :getPopupContainer="(node) => node?.parentNode"
@@ -279,7 +278,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
         triggerType: formData.triggerMode === 'recurring' ? 2 : 1,
         intervalType: formData.triggerMode === 'recurring' ? Number(formData.intervalType) : undefined,
         startCount: formData.triggerMode === 'recurring' ? Number(formData.startCount) : undefined,
-        intervalStartTime: formData.triggerMode === 'recurring' ? formData.intervalStartTime : undefined,
+        intervalStartTime: formData.triggerMode === 'recurring' && formData.intervalStartTime ? formData.intervalStartTime + ' 02:00:00' : undefined,
         deptId: formData.deptIds.join(','),
         deptIds: [...formData.deptIds],
         isNeedAppro: showSuoleaderFields.value ? formData.isNeedAppro : undefined,
diff --git a/src/components/semri/process/FlowScheduleStartModalForBG.vue b/src/components/semri/process/FlowScheduleStartModalForBG.vue
index ad113de..8d02830 100644
--- a/src/components/semri/process/FlowScheduleStartModalForBG.vue
+++ b/src/components/semri/process/FlowScheduleStartModalForBG.vue
@@ -76,8 +76,7 @@
         <a-form-item label="重复开始日期">
           <a-date-picker
             v-model:value="formData.intervalStartTime"
-            show-time
-            valueFormat="YYYY-MM-DD HH:mm:ss"
+            valueFormat="YYYY-MM-DD"
             placeholder="重复开始日期"
             style="width: 100%"
             :getPopupContainer="(node) => node?.parentNode"
@@ -251,7 +250,7 @@ import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervis
         triggerType: formData.triggerMode === 'recurring' ? 2 : 1,
         intervalType: formData.triggerMode === 'recurring' ? Number(formData.intervalType) : undefined,
         startCount: formData.triggerMode === 'recurring' ? Number(formData.startCount) : undefined,
-        intervalStartTime: formData.triggerMode === 'recurring' ? formData.intervalStartTime : undefined,
+        intervalStartTime: formData.triggerMode === 'recurring' && formData.intervalStartTime ? formData.intervalStartTime + ' 02:00:00' : undefined,
         title: taskTitle,
         deptId: formData.deptIds.join(','),
         deptIds: [...formData.deptIds],

From cd1b1401640460250688cf15a6a99e9558818cdb Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Thu, 2 Jul 2026 10:01:48 +0800
Subject: [PATCH 2/8] =?UTF-8?q?czh-20260702-=E6=9C=AA=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/api/common/api.ts                         |  9 +++++++++
 .../process/BusinessProcessListModal.vue      | 20 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index 2f6c189..8495558 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -18,6 +18,7 @@ enum Api {
   startProcessSchedules = '/tasktask/taskTask/flow-schedules',
   queryByBusinessId = '/tasktask/taskTask/queryByBusinessId',
   deleteSingleProcess = '/tasktask/taskTask/deleteSingleProcess',
+  deletePendingTask = '/tasktask/taskTask/deletePendingTask',
 }
 
 /**
@@ -184,6 +185,14 @@ export const deleteSingleProcess = (params) => {
   return defHttp.post({ url: Api.deleteSingleProcess, params }, { joinParamsToUrl: true, isTransformResponse: false });
 };
 
+/**
+ * 删除未发起的待处理任务（无流程实例ID的周期性任务记录）
+ * @param params { taskId: string }
+ */
+export const deletePendingTask = (params) => {
+  return defHttp.post({ url: Api.deletePendingTask, params }, { joinParamsToUrl: true, isTransformResponse: false });
+};
+
 /**
  * 【用于评论功能】自定义文件上传-方法
  */
diff --git a/src/components/semri/process/BusinessProcessListModal.vue b/src/components/semri/process/BusinessProcessListModal.vue
index eb3744e..22dad89 100644
--- a/src/components/semri/process/BusinessProcessListModal.vue
+++ b/src/components/semri/process/BusinessProcessListModal.vue
@@ -27,7 +27,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   import { useModal } from '/@/components/Modal';
   import { columns } from './QueryProcessList.data';
-  import { deleteSingleProcess, queryByBusinessId } from '/@/api/common/api';
+  import { deleteSingleProcess, deletePendingTask, queryByBusinessId } from '/@/api/common/api';
   import { useMessage } from '/@/hooks/web/useMessage';
   import TaskApprovalHistoryContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue';
 
@@ -143,8 +143,24 @@
 
   async function handleDeleteProcess(record) {
     const processInstId = record?.processInstId;
+    const taskId = record?.id;
+
     if (!processInstId) {
-      createMessage.error('流程未发起，请等待流程自动发起');
+      if (!taskId) {
+        createMessage.error('任务数据异常，无法删除');
+        return;
+      }
+      try {
+        const res = await deletePendingTask({ taskId });
+        if (res?.success) {
+          createMessage.success(res.message || '删除成功');
+          await reload();
+        } else {
+          createMessage.error(res?.message || '删除失败');
+        }
+      } catch (error) {
+        createMessage.error('删除失败');
+      }
       return;
     }
 

From ff997c90a2bf777ed8d26c648c51cf70fcea8fb0 Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Thu, 2 Jul 2026 13:36:25 +0800
Subject: [PATCH 3/8] =?UTF-8?q?czh-20260702-=E6=B5=81=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8E=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/api/common/api.ts                         |   9 ++
 .../process/BusinessProcessListModal.vue      | 104 +++++++++++++++++-
 2 files changed, 109 insertions(+), 4 deletions(-)

diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index 8495558..42da438 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -19,6 +19,7 @@ enum Api {
   queryByBusinessId = '/tasktask/taskTask/queryByBusinessId',
   deleteSingleProcess = '/tasktask/taskTask/deleteSingleProcess',
   deletePendingTask = '/tasktask/taskTask/deletePendingTask',
+  updateTitleAndDeadline = '/tasktask/taskTask/updateTitleAndDeadline',
 }
 
 /**
@@ -193,6 +194,14 @@ export const deletePendingTask = (params) => {
   return defHttp.post({ url: Api.deletePendingTask, params }, { joinParamsToUrl: true, isTransformResponse: false });
 };
 
+/**
+ * 修改流程标题和截止时间
+ * @param params { taskId: string, title: string, requireFinishDate: string }
+ */
+export const updateTitleAndDeadline = (params) => {
+  return defHttp.post({ url: Api.updateTitleAndDeadline, params }, { joinParamsToUrl: true, isTransformResponse: false });
+};
+
 /**
  * 【用于评论功能】自定义文件上传-方法
  */
diff --git a/src/components/semri/process/BusinessProcessListModal.vue b/src/components/semri/process/BusinessProcessListModal.vue
index 22dad89..5f5cb59 100644
--- a/src/components/semri/process/BusinessProcessListModal.vue
+++ b/src/components/semri/process/BusinessProcessListModal.vue
@@ -8,6 +8,33 @@
       </BasicTable>
     </div>
     <BpmPictureModal @register="registerBpmModal" />
+    <j-modal
+      title="修改流程信息"
+      :width="460"
+      :visible="editModalVisible"
+      :confirmLoading="editLoading"
+      wrapClassName="edit-process-modal"
+      @ok="handleEditConfirm"
+      @cancel="handleEditCancel"
+      cancelText="取消"
+    >
+      <div style="padding: 8px 16px 0;">
+        <a-form :model="editForm" :label-col="{ style: { width: '100px' } }" :wrapper-col="{ span: 24 }">
+          <a-form-item label="流程标题" style="margin-bottom: 14px;">
+            <a-input v-model:value="editForm.title" placeholder="请输入流程标题" allow-clear />
+          </a-form-item>
+          <a-form-item label="要求完成日期" style="margin-bottom: 0;">
+            <a-date-picker
+              v-model:value="editForm.requireFinishDate"
+              valueFormat="YYYY-MM-DD"
+              placeholder="请选择要求完成日期"
+              style="width: 100%"
+              :getPopupContainer="(node) => node?.parentNode"
+            />
+          </a-form-item>
+        </a-form>
+      </div>
+    </j-modal>
     <j-modal
       title="审批历史"
       :width="approvalHistoryModalWidth"
@@ -22,12 +49,12 @@
 </template>
 
 <script lang="ts" setup>
-  import { nextTick, ref } from 'vue';
+  import { nextTick, reactive, ref } from 'vue';
   import { BasicColumn, BasicTable, TableAction, useTable } from '/@/components/Table';
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   import { useModal } from '/@/components/Modal';
   import { columns } from './QueryProcessList.data';
-  import { deleteSingleProcess, deletePendingTask, queryByBusinessId } from '/@/api/common/api';
+  import { deleteSingleProcess, deletePendingTask, updateTitleAndDeadline, queryByBusinessId } from '/@/api/common/api';
   import { useMessage } from '/@/hooks/web/useMessage';
   import TaskApprovalHistoryContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue';
 
@@ -51,6 +78,13 @@
   const approvalHistoryVisible = ref(false);
   const approvalHistoryFormData = ref<Recordable>({});
   const approvalHistoryRef = ref();
+  const editModalVisible = ref(false);
+  const editLoading = ref(false);
+  const currentEditRecord = ref<Recordable>({});
+  const editForm = reactive({
+    title: '',
+    requireFinishDate: undefined as string | undefined,
+  });
   const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
 
   const [registerTable, { setColumns, setTableData, reload, clearSelectedRowKeys }] = useTable({
@@ -76,12 +110,12 @@
     actionColumn: {
       title: '操作',
       dataIndex: 'action',
-      width: 240,
+      width: 320,
       fixed: 'right',
       slots: { customRender: 'action' },
     },
     scroll: {
-      x: tableScrollX,
+      x: tableScrollX + 80,
       y: tableBodyHeight,
     },
   });
@@ -110,6 +144,7 @@
     setColumns(defaultColumns);
     setTableData([]);
     handleApprovalHistoryCancel();
+    handleEditCancel();
     clearSelectedRowKeys();
   }
 
@@ -141,6 +176,53 @@
     approvalHistoryFormData.value = {};
   }
 
+  function handleEditProcess(record) {
+    currentEditRecord.value = record;
+    editForm.title = record?.title || '';
+    editForm.requireFinishDate = record?.requireFinishDate
+      ? record.requireFinishDate.length > 10
+        ? record.requireFinishDate.substring(0, 10)
+        : record.requireFinishDate
+      : undefined;
+    editModalVisible.value = true;
+  }
+
+  async function handleEditConfirm() {
+    if (!editForm.title?.trim()) {
+      createMessage.error('标题不能为空');
+      return;
+    }
+    if (!editForm.requireFinishDate) {
+      createMessage.error('要求完成日期不能为空');
+      return;
+    }
+    const taskId = currentEditRecord.value?.id;
+    if (!taskId) {
+      createMessage.error('任务数据异常');
+      return;
+    }
+    editLoading.value = true;
+    try {
+      const res = await updateTitleAndDeadline({ taskId, title: editForm.title, requireFinishDate: editForm.requireFinishDate });
+      if (res?.success) {
+        createMessage.success(res.message || '修改成功');
+        editModalVisible.value = false;
+        await reload();
+      } else {
+        createMessage.error(res?.message || '修改失败');
+      }
+    } catch (error) {
+      createMessage.error('修改失败');
+    } finally {
+      editLoading.value = false;
+    }
+  }
+
+  function handleEditCancel() {
+    editModalVisible.value = false;
+    editLoading.value = false;
+  }
+
   async function handleDeleteProcess(record) {
     const processInstId = record?.processInstId;
     const taskId = record?.id;
@@ -187,6 +269,10 @@
         label: '审批历史',
         onClick: handlePreviewApprovalHistory.bind(null, record),
       },
+      {
+        label: '修改信息',
+        onClick: handleEditProcess.bind(null, record),
+      },
       {
         label: '删除流程',
         popConfirm: {
@@ -255,3 +341,13 @@
     }
   }
 </style>
+
+<style lang="less">
+  .edit-process-modal {
+    .ant-modal-body {
+      height: auto !important;
+      min-height: 160px;
+      overflow: visible !important;
+    }
+  }
+</style>

From db32ccd7dca8a65ce51fde904be24cd89750df09 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 2 Jul 2026 14:22:04 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix(bgpartymatter):=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=92=8C=E4=B8=8B=E8=BD=BD=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=96=87=E4=BB=B6=E5=90=8D=E6=A0=B9=E6=8D=AE=20meetin?=
 =?UTF-8?q?gType=20=E5=8C=BA=E5=88=86=E5=85=9A=E5=A7=94=E4=BC=9A/=E6=89=80?=
 =?UTF-8?q?=E5=8A=A1=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/views/bg/bgpartymatter/BgPartymatterList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue
index 2c118ed..58dc481 100644
--- a/src/views/bg/bgpartymatter/BgPartymatterList.vue
+++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue
@@ -238,7 +238,7 @@
       },
     },
     exportConfig: {
-      name: props.ledgerTitle,
+      name: props.meetingType === 'office' ? '所务会' : '党委会',
       url: getExportUrl,
       params: getLedgerQueryParams,
     },
@@ -638,7 +638,7 @@
     const blob = new Blob([data]);
     const link = document.createElement('a');
     link.href = URL.createObjectURL(blob);
-    link.download = '党建议题-导入模板.xls';
+    link.download = props.meetingType === 'office' ? '所务会-导入模板.xls' : '党委会-导入模板.xls';
     link.click();
     URL.revokeObjectURL(link.href);
   }

From 1cf1ce68454787fcd14964e7b9ae04577c547f73 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 2 Jul 2026 15:11:23 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix(xispeak):=20=E7=BA=AA=E6=A3=80=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=AF=E7=BC=96=E8=BE=91=E6=97=B6=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA"=E7=9B=91=E5=AF=9F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 90bcdcd..21bf17e 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -213,7 +213,7 @@
             <span v-else>-</span>
           </template>
           <template v-if="column.key === 'feedbackAction'">
-            <a-button type="link" size="small" @click="handleEditFeedback(record)">编辑</a-button>
+            <a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields ? '监察' : '编辑' }}</a-button>
             <a-popconfirm title="确定删除该反馈吗？" @confirm="handleDeleteFeedback(record)">
               <a-button type="link" size="small" danger>删除</a-button>
             </a-popconfirm>

From 058344d99eb9e443ea10a63155e4fc5813058740 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 2 Jul 2026 16:36:47 +0800
Subject: [PATCH 6/8] =?UTF-8?q?refactor(xispeak):=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E6=94=B9=E4=B8=BA=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E9=85=8D=E7=BD=AE=20+=20=E6=96=B0=E5=A2=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除前端写死的 handleReasonTemplateMap，改为走 BPM_NODE_PERMISSIONS 节点配置的 defaultOpinion
- 新增 useSelectNameResolver 翻译 responsiblePerson/implDept/sdwLeaderList 为 Names 字段
- 新增 subApproveUserNames 变量，@confirm 事件即时获取经办人 realname
- 新增 isEnd 反向同步到 formData.vars，供 conditionalDefaultOpinion 条件变量判断
- 监察按钮文案条件改为 showJiJianFields && nonJiJianFieldsReadonly

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../xispeak/components/BgXiSpeakBPMForm.vue   | 99 +++++++------------
 1 file changed, 36 insertions(+), 63 deletions(-)

diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 21bf17e..86ff6d6 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -58,7 +58,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="责任人" name="responsiblePerson">
-                <j-select-user v-model:value="mainForm.responsiblePerson" :disabled="mainDisabled" allow-clear />
+                <j-select-user v-model:value="mainForm.responsiblePerson" :disabled="mainDisabled" allow-clear @select="selectHandler('responsiblePerson')" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -213,7 +213,7 @@
             <span v-else>-</span>
           </template>
           <template v-if="column.key === 'feedbackAction'">
-            <a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields ? '监察' : '编辑' }}</a-button>
+            <a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields && nonJiJianFieldsReadonly ? '监察' : '编辑' }}</a-button>
             <a-popconfirm title="确定删除该反馈吗？" @confirm="handleDeleteFeedback(record)">
               <a-button type="link" size="small" danger>删除</a-button>
             </a-popconfirm>
@@ -246,7 +246,7 @@
             </a-col>
             <a-col v-if="showSubApproveUserSelector" :span="12">
               <a-form-item label="部门经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-                <sz-dept-user-modal v-model:value="subApproveUser" :disabled="savingSubApproveUser" />
+                <sz-dept-user-modal v-model:value="subApproveUser" :disabled="savingSubApproveUser" @confirm="onSubApproveUserConfirm" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -256,7 +256,6 @@
           :claim="claim"
           :showSelnextUser="showSelnextUser"
           :beforeHandle="saveMainFormBeforeProcessHandle"
-          :defaultReason="defaultHandleReason"
           @success="handleProcessSuccess"
           @claimSuccess="handleClaimSuccess"
         />
@@ -285,16 +284,8 @@
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
   import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
 import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision';
-import {
-  buildApproveReason,
-  buildDeptHandlerFeedbackReason,
-  buildDeptLeaderAssignReason,
-  buildDeptLeaderDirectFeedbackReason,
-  buildSuperviseConfirmAllReason,
-  buildSuperviseCheckReason,
-  buildJiJianCheckReason,
-  normalizeDeptNames,
-} from '/@/composables/useDefaultApprovalReason';
+import { normalizeDeptNames } from '/@/composables/useDefaultApprovalReason';
+import { useSelectNameResolver } from '/@/composables/useSelectNameResolver';
 
   const { isDisabledAuth, hasPermission, initBpmFormData } = usePermission();
   const userStore = useUserStore();
@@ -329,7 +320,7 @@ import {
   const showFeedbackDetail = ref(true);
   const feedbackList = ref<any[]>([]);
   const subApproveUser = ref('');
-  const subApproveUserNameText = ref('');
+  const subApproveUserNames = ref('');
   const userResolveVersion = ref(0);
   const isEnd = ref(0);
 
@@ -342,8 +333,10 @@ import {
     status: '',
     secretLevel: '',
     responsiblePerson: '',
+    responsiblePersonNames: '',
     needSdwApproval: 0,
     sdwLeaderList: '',
+    sdwLeaderListNames: '',
     implPlan: '',
     implMeasures: '',
     numberOfResolutions: undefined,
@@ -356,12 +349,19 @@ import {
     completionStatus: undefined,
     deadline: '',
     implDept: '',
+    implDeptNames: '',
     treeDepth: undefined,
     sortOrder: undefined,
     bpmStatus: '',
     supervisionCount: undefined,
   });
 
+  const { resolveAll, selectHandler } = useSelectNameResolver(mainForm, [
+    { field: 'responsiblePerson', type: 'user' },
+    { field: 'implDept', type: 'dept' },
+    { field: 'sdwLeaderList', type: 'user' },
+  ]);
+
   const feedbackColumns = computed(() => {
     const cols: any[] = [
       { title: '序号', key: 'seq', align: 'center', width: 60 },
@@ -445,59 +445,19 @@ import {
     processTableName: props.formData?.processTableName,
   }));
 
-  // ==================== 默认审批意见 ====================
-  const handleReasonTemplateMap: Record<string, () => string> = {
-    // 部门负责人审批 / 所党委审批 / 督办部门负责人审批 / 纪检负责人审批
-    Task_15sm4w5: buildApproveReason,
-    Task_00i7rrp: buildApproveReason,
-    Task_04bazej: buildApproveReason,
-    Task_0bj578x: buildApproveReason,
-    Task_0mf32ge: buildApproveReason,
-    Task_0zmn6ik: buildApproveReason,
-    Task_133caii: buildApproveReason,
-    Task_175afz2: buildApproveReason,
-    Task_1ogk921: buildApproveReason,
-    Task_1w4vxgc: buildApproveReason,
-    Task_1wfkrvj: buildApproveReason,
-    // 反馈流程节点
-    Task_005iiwi: buildApproveReason,
-    Task_06di2wf: buildApproveReason,
-    Task_1l650tz: buildApproveReason,
-    // 部门经办人反馈完成情况 / 收集流程部门经办人填写 / 反馈流程部门经办人填写反馈
-    Task_00v3pcv: buildDeptHandlerFeedbackReason,
-    Task_08zb04x: buildDeptHandlerFeedbackReason,
-    Task_0jrgrzs: buildDeptHandlerFeedbackReason,
-    Task_12vdqzv: buildDeptHandlerFeedbackReason,
-    // 部门负责人接受任务并分配
-    Task_1v9ce78: () => buildDeptLeaderAssignReason(
-      normalizeDeptNames(subApproveUserNameText.value || subApproveUser.value),
-    ),
-    // 部门负责人直接反馈
-    Task_0sialna: buildDeptLeaderDirectFeedbackReason,
-    // 督办部门经办人确认全部反馈事项
-    // (暂无映射，预留 buildSuperviseConfirmAllReason)
-    // 督办经办人核查 / 反馈流程督办经办人核查
-    Task_13olnz1: buildSuperviseCheckReason,
-    // 纪检经办人监察
-    Task_0bahwr8: buildJiJianCheckReason,
-  };
-
-  const defaultHandleReason = computed(() => {
-    const builder = handleReasonTemplateMap[String(processInfo.value.taskDefKey || '')];
-    return builder ? builder() : '';
-  });
-
   // 合并 mainForm + 表单局部变量，供占位符 ${变量名} 解析
   const formScope = computed(() => ({
     ...mainForm,
     isEnd: isEnd.value,
     subApproveUser: subApproveUser.value,
-    subApproveUserNameText: subApproveUserNameText.value,
+    subApproveUserNames: subApproveUserNames.value,
+    responsiblePersonNames: mainForm.responsiblePersonNames,
+    implDeptNames: mainForm.implDeptNames,
+    sdwLeaderListNames: mainForm.sdwLeaderListNames,
   }));
 
   provide('extraVars', formScope);
   provide('flowVars', computed(() => props.formData?.vars || {}));
-  provide('formDefaultReason', defaultHandleReason);
 
   onMounted(() => {
     initFormData();
@@ -525,6 +485,14 @@ import {
     },
     { immediate: true }
   );
+  // 反向同步：本地切换 isEnd 时更新 formData.vars，使 conditionalDefaultOpinion 响应
+  watch(isEnd, (val) => {
+    const vars = props.formData?.vars;
+    if (vars) {
+      vars.is_end = String(val);
+      vars.isEnd = String(val);
+    }
+  });
 
   watch(
     subApproveUser,
@@ -544,6 +512,7 @@ import {
     try {
       const data = await defHttp.get({ url: queryByIdUrl, params: { id: dataId } });
       setMainForm(data || {});
+      await resolveAll();
       await loadFeedbackList();
     } finally {
       loading.value = false;
@@ -771,15 +740,19 @@ import {
       .join(',');
   }
 
+  function onSubApproveUserConfirm(userIds: string, realnames: string) {
+    subApproveUserNames.value = normalizeDeptNames(realnames || '');
+  }
+
   async function resolveSubApproveUserName(value: any) {
     const resolveVersion = ++userResolveVersion.value;
     const usernames = normalizeUsernameList(value);
     if (!usernames) {
-      subApproveUserNameText.value = '';
+      subApproveUserNames.value = '';
       return;
     }
 
-    subApproveUserNameText.value = normalizeDeptNames(usernames);
+    subApproveUserNames.value = normalizeDeptNames(usernames);
     try {
       const res = await getUserList({ username: usernames, isMultiTranslate: 'true', pageNo: 1, pageSize: 999 });
       if (resolveVersion !== userResolveVersion.value) {
@@ -800,10 +773,10 @@ import {
         .split(',')
         .map((username) => userNameMap[username] || username)
         .filter(Boolean);
-      subApproveUserNameText.value = normalizeDeptNames(names.join(','));
+      subApproveUserNames.value = normalizeDeptNames(names.join(','));
     } catch {
       if (resolveVersion === userResolveVersion.value) {
-        subApproveUserNameText.value = normalizeDeptNames(usernames);
+        subApproveUserNames.value = normalizeDeptNames(usernames);
       }
     }
   }

From 6c85017845090b45dda7035cbdadaa0761c66d1a Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 2 Jul 2026 17:34:46 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat(xispeak):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=98=B6=E6=AE=B5=E7=AD=9B=E9=80=89=20+=20?=
 =?UTF-8?q?=E7=9B=91=E5=AF=9F=E6=8C=89=E9=92=AE=E6=9D=A1=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20+=20=E6=B5=81=E7=A8=8B=E9=98=B6=E6=AE=B5=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 列表页新增"流程阶段"下拉筛选（绑定 queryParam.completedStage）
- 编辑表单新增 completedStage 手动选择字段
- BPM 表单监察按钮仅 showJiJianFields && nonJiJianFieldsReadonly 时渲染为"监察"

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/views/bg/xispeak/BgXiSpeakList.vue               | 11 +++++++++++
 src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue |  2 +-
 src/views/bg/xispeak/components/BgXiSpeakForm.vue    | 12 ++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index 8735da6..022dee4 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -19,6 +19,17 @@
               <JDictSelectTag v-model:value="queryParam.completionStatus" dictCode="db_status" placeholder="请选择完成状态" allow-clear @change="searchQuery" />
             </a-form-item>
           </a-col>
+          <a-col :lg="6">
+            <a-form-item name="completedStage" label="流程阶段">
+              <a-select v-model:value="queryParam.completedStage" placeholder="请选择" allow-clear @change="searchQuery">
+                <a-select-option :value="0">未发起流程</a-select-option>
+                <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>
+            </a-form-item>
+          </a-col>
           <a-col :lg="4" :md="8" :sm="12">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 86ff6d6..56c9256 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -213,7 +213,7 @@
             <span v-else>-</span>
           </template>
           <template v-if="column.key === 'feedbackAction'">
-            <a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields && nonJiJianFieldsReadonly ? '监察' : '编辑' }}</a-button>
+            <a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields && nonJiJianFieldsReadonly ? '督察' : '编辑' }}</a-button>
             <a-popconfirm title="确定删除该反馈吗？" @confirm="handleDeleteFeedback(record)">
               <a-button type="link" size="small" danger>删除</a-button>
             </a-popconfirm>
diff --git a/src/views/bg/xispeak/components/BgXiSpeakForm.vue b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
index 6217dea..e60283a 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
@@ -107,6 +107,17 @@
                 <a-input-number v-model:value="formData.supervisionCount" placeholder="每次发起督办流程自动加1" style="width: 100%" disabled />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="流程阶段" name="completedStage">
+                <a-select v-model:value="formData.completedStage" placeholder="请选择流程阶段" allow-clear>
+                  <a-select-option :value="0">未发起流程</a-select-option>
+                  <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>
+              </a-form-item>
+            </a-col>
           </a-row>
 
           <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center; margin-top: 16px;">
@@ -172,6 +183,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
       delFlag: undefined,
       bpmStatus: undefined,
       supervisionCount: undefined,
+      completedStage: undefined,
     };
   }
 

From 7b68e80fac247bf611c103384d2143fe78747356 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 2 Jul 2026 17:47:07 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix(xispeak):=20=E4=BF=AE=E5=A4=8D=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E8=90=BD=E5=AE=9E=E6=8E=AA=E6=96=BD=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AC=AC=E4=BA=8C=E4=B8=AA=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将 SzUserSelectByDeptRoleSecurityModal 移出 a-form-item 避免干扰表单布局，
并在关闭第一个弹窗后通过 nextTick 延迟打开第二个弹窗，避免模态框叠加冲突。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../semri/process/FlowScheduleStartModal.vue  | 17 ++++++++--------
 src/views/bg/xispeak/BgXiSpeakList.vue        | 20 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/components/semri/process/FlowScheduleStartModal.vue b/src/components/semri/process/FlowScheduleStartModal.vue
index 34cb412..1a491fb 100644
--- a/src/components/semri/process/FlowScheduleStartModal.vue
+++ b/src/components/semri/process/FlowScheduleStartModal.vue
@@ -49,14 +49,6 @@
               <SearchOutlined @click="openSdwLeaderModal" />
             </template>
           </a-input>
-          <SzUserSelectByDeptRoleSecurityModal
-            v-model:open="sdwLeaderModalOpen"
-            title="请选择所党委领导"
-            :deptId="sdwLeaderDeptId"
-            :roleId="sdwLeaderRoleId"
-            :securityValue="sdwLeaderSecurityValue"
-            @confirm="handleSdwLeaderConfirm"
-          />
         </a-form-item>
       </template>
 
@@ -86,6 +78,15 @@
       </template>
     </a-form>
 
+    <SzUserSelectByDeptRoleSecurityModal
+      v-model:open="sdwLeaderModalOpen"
+      title="请选择所党委领导"
+      :deptId="sdwLeaderDeptId"
+      :roleId="sdwLeaderRoleId"
+      :securityValue="sdwLeaderSecurityValue"
+      @confirm="handleSdwLeaderConfirm"
+    />
+
     <template #footer>
       <a-button @click="handleCancel">取消</a-button>
       <a-button type="primary" @click="handleOk">提交</a-button>
diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index 022dee4..d28c142 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -107,7 +107,7 @@
 </template>
 
 <script lang="ts" name="bg.xispeak-bgXiSpeak" setup>
-  import { ref, reactive, unref, computed, provide } from 'vue';
+  import { ref, reactive, unref, computed, provide, nextTick } from 'vue';
   import { BasicTable, useTable } from '/@/components/Table';
   import { Dropdown } from '/@/components/Dropdown';
   import { useListPage } from '/@/hooks/system/useListPage';
@@ -630,14 +630,16 @@ import { defHttp } from '/@/utils/http/axios';
 
   function handleFeedbackRightNowConfirm({ record, feedbackRightNow }) {
     pendingFeedbackRightNow.value = feedbackRightNow;
-    flowScheduleModalRef.value?.open({
-      title: '发起落实措施收集流程',
-      payload: { record },
-      deptOptions: getLeadDeptOptions(record),
-      showSuoleaderFields: true,
-      isNeedAppro: record?.needSdwApproval,
-      supDeptleaderid: record?.sdwLeaderList,
-      supDeptleaderName: record?.sdwLeaderList_dictText,
+    nextTick(() => {
+      flowScheduleModalRef.value?.open({
+        title: '发起落实措施收集流程',
+        payload: { record },
+        deptOptions: getLeadDeptOptions(record),
+        showSuoleaderFields: true,
+        isNeedAppro: record?.needSdwApproval,
+        supDeptleaderid: record?.sdwLeaderList,
+        supDeptleaderName: record?.sdwLeaderList_dictText,
+      });
     });
   }