From af956a0e7535124eb11a86fd4a4ed74149cd2e44 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 11 Jun 2026 10:21:26 +0800
Subject: [PATCH 01/10] =?UTF-8?q?docs(xispeak):=20=E6=9B=B4=E6=96=B0BPM?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增反馈流程部门负责人反馈节点配置
- 修正所纪委审批和分管领导审批节点URL参数
- 补充习反馈流程纪检负责人审批taskDefKey

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md             | 8 ++++++--
 src/views/bg/xispeak/BPM_NODE_PERMISSIONS_XI_FEEDBACK.md | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md b/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md
index ff2efe8..72cb190 100644
--- a/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md
+++ b/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md
@@ -61,6 +61,10 @@ showFeedbackInfo         → 反馈信息区域（表格 + 表头）
 * bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1
 ---
 
+### 节点：<反馈流程部门负责人反馈>
+Task_133caii
+bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&showAddFeedback=1&showEditFeedback=1&showDeptFeedback=1
+
 ### 节点: <所党委审批>
 * taskDefKey: `<Task_15sm4w5>`
 
@@ -169,7 +173,7 @@ showFeedbackInfo         → 反馈信息区域（表格 + 表头）
       * **showEditFeedback** `0` —— 编辑/删除操作列
       * **showDeptFeedback** `0` —— 按部门过滤反馈
       * **showJiJianFields** `0` —— 纪检字段列
-* bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1
+* bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&showEditFeedback=1&nonJiJianFieldsReadonly=1&showJiJianFields=1
 ---
 
 
@@ -215,7 +219,7 @@ showFeedbackInfo         → 反馈信息区域（表格 + 表头）
         * **jiJianFieldsReadonly** `0` —— 弹窗内纪检字段只读
       * **showDeptFeedback** `0` —— 按部门过滤反馈
       * **showJiJianFields** `1` —— 纪检字段列
-* bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&showJiJianFields=1
+* bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&showEditFeedback=0&showJiJianFields=1
 ---
 
 ### 节点: <督办部门经办人确认全部反馈事项>
diff --git a/src/views/bg/xispeak/BPM_NODE_PERMISSIONS_XI_FEEDBACK.md b/src/views/bg/xispeak/BPM_NODE_PERMISSIONS_XI_FEEDBACK.md
index 522c855..b141a6e 100644
--- a/src/views/bg/xispeak/BPM_NODE_PERMISSIONS_XI_FEEDBACK.md
+++ b/src/views/bg/xispeak/BPM_NODE_PERMISSIONS_XI_FEEDBACK.md
@@ -34,7 +34,8 @@ showFeedbackInfo         → 反馈信息区域（表格 + 表头）
 ## 习讲话经办人反馈流程
 
 ### 节点: <纪检负责人审批>
-* bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&showJiJianFields=1
+* taskDefKey: `<Task_005iiwi>`
+  * bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&showJiJianFields=1
 ---
 
 ### 节点: <部门负责人审批>

From 9c2d5d1363e5788839fd4a9ee9737dcde177ec1b Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 11 Jun 2026 14:29:29 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix(xispeak):=20=E4=BF=AE=E5=A4=8DBPM?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=BE=93=E5=85=A5=E8=A2=AB=E5=88=B7=E6=8E=89?=
 =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95=E5=B8=A6=E5=85=A5?=
 =?UTF-8?q?=E6=97=A7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BPM表单：processInstanceId变化时仅刷新反馈列表，不再全量重载主表数据
- 编辑表单：新增时同步重置为默认值，弹窗强制重建组件避免数据残留

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../xispeak/components/BgXiSpeakBPMForm.vue   | 11 ++-
 .../bg/xispeak/components/BgXiSpeakForm.vue   | 77 +++++++++++--------
 .../bg/xispeak/components/BgXiSpeakModal.vue  |  9 ++-
 3 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 2b0d450..445caf1 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -497,7 +497,16 @@
     initFormData();
   });
 
-  watch([() => props.formData?.dataId, () => processInfo.value.processInstanceId], () => initFormData());
+  watch(
+    () => props.formData?.dataId,
+    () => initFormData()
+  );
+  watch(
+    () => processInfo.value.processInstanceId,
+    (newVal) => {
+      if (newVal) loadFeedbackList();
+    }
+  );
 
   watch(showDeptFeedback, () => {
     loadFeedbackList();
diff --git a/src/views/bg/xispeak/components/BgXiSpeakForm.vue b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
index bae6636..d2b21cd 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
@@ -161,35 +161,39 @@
   const emit = defineEmits(['register', 'ok']);
   let model: Nullable<Recordable> = null;
 
-  const formData = reactive<Record<string, any>>({
-    id: '',
-    pid: '',
-    speakStatus: '',
-    time: '',
-    elmComment: '经单位主要负责同时签批同意，由xx部做好贯彻落实',
-    status: 'x月x日召开xxxx年第x次党委会议',
-    secretLevel: '',
-    responsiblePerson: '',
-    needSdwApproval: 0,
-    sdwLeaderList: '',
-    implPlan: '',
-    implMeasures: '',
-    numberOfResolutions: undefined,
-    implStatus: '',
-    implCount: undefined,
-    closedCount: undefined,
-    reportFeedbackStatus: '',
-    isCompletionRisk: undefined,
-    delayRiskMitigation: '',
-    completionStatus: undefined,
-    deadline: '',
-    implDept: '',
-    treeDepth: undefined,
-    sortOrder: undefined,
-    delFlag: undefined,
-    bpmStatus: undefined,
-    supervisionCount: undefined,
-  });
+  function getDefaultFormData(): Record<string, any> {
+    return {
+      id: '',
+      pid: '',
+      speakStatus: '',
+      time: '',
+      elmComment: '经单位主要负责同时签批同意，由xx部做好贯彻落实',
+      status: 'x月x日召开xxxx年第x次党委会议',
+      secretLevel: '',
+      responsiblePerson: '',
+      needSdwApproval: 0,
+      sdwLeaderList: '',
+      implPlan: '',
+      implMeasures: '',
+      numberOfResolutions: undefined,
+      implStatus: '',
+      implCount: undefined,
+      closedCount: undefined,
+      reportFeedbackStatus: '',
+      isCompletionRisk: undefined,
+      delayRiskMitigation: '',
+      completionStatus: undefined,
+      deadline: '',
+      implDept: '',
+      treeDepth: undefined,
+      sortOrder: undefined,
+      delFlag: undefined,
+      bpmStatus: undefined,
+      supervisionCount: undefined,
+    };
+  }
+
+  const formData = reactive<Record<string, any>>(getDefaultFormData());
 
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } });
@@ -289,13 +293,24 @@
   }
 
   function edit(record) {
+    // 新增：同步重置，不带入任何旧数据
+    if (!record.id) {
+      const defaults = getDefaultFormData();
+      for (const key of Object.keys(formData)) {
+        formData[key] = defaults[key];
+      }
+      sdwLeaderNames.value = '';
+      model = {};
+      return;
+    }
+
+    // 编辑/详情
     nextTick(async () => {
       resetFields();
       expandedRowKeys.value = [];
 
-      // 非BPM模式且有ID时，从API查询完整数据，避免列表行数据不完整导致字段不显示
       let data = record;
-      if (record.id && !props.formBpm) {
+      if (!props.formBpm) {
         try {
           const res = await defHttp.get({ url: queryByIdUrl, params: { id: record.id } });
           data = res || record;
diff --git a/src/views/bg/xispeak/components/BgXiSpeakModal.vue b/src/views/bg/xispeak/components/BgXiSpeakModal.vue
index e0e9b39..1e98cc5 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakModal.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakModal.vue
@@ -1,6 +1,6 @@
 <template>
   <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <BgXiSpeakForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BgXiSpeakForm>
+    <BgXiSpeakForm ref="registerForm" :key="formKey" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BgXiSpeakForm>
     <template #footer>
       <a-button @click="handleCancel">取消</a-button>
       <a-button :class="{ 'jee-hidden': disableSubmit }" type="primary" @click="handleOk">确认</a-button>
@@ -20,24 +20,27 @@
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();
+  const formKey = ref(0);
   const emit = defineEmits(['register', 'success']);
-  
+
   /**
    * 新增
    */
   function add(obj={}) {
+    formKey.value++;
     title.value = '新增';
     visible.value = true;
     nextTick(() => {
       registerForm.value.add(obj);
     });
   }
-  
+
   /**
    * 编辑
    * @param record
    */
   function edit(record) {
+    formKey.value++;
     title.value = disableSubmit.value ? '详情' : '编辑';
     visible.value = true;
     nextTick(() => {

From d936cd35b7daaa683f2d2ba0a9126f1d2b7e48f0 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 11 Jun 2026 14:53:18 +0800
Subject: [PATCH 03/10] =?UTF-8?q?refactor(xispeak):=20=E6=8A=BD=E5=8F=96?=
 =?UTF-8?q?=E7=9D=A3=E5=8A=9E=E9=A2=86=E5=AF=BC=E9=80=89=E6=8B=A9=E4=B8=BA?=
 =?UTF-8?q?DeptRoleSelectUser=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 去除弹窗选人模式，改为按部门+角色查询后直接radio-group展示
- 两个表单复用同一组件，净减少约110行代码

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../xispeak/components/BgXiSpeakBPMForm.vue   | 68 ++----------------
 .../bg/xispeak/components/BgXiSpeakForm.vue   | 72 ++-----------------
 .../xispeak/components/DeptRoleSelectUser.vue | 39 ++++++++++
 3 files changed, 52 insertions(+), 127 deletions(-)
 create mode 100644 src/views/bg/xispeak/components/DeptRoleSelectUser.vue

diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 445caf1..e23e455 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -141,26 +141,11 @@
             </a-col>
             <a-col v-if="mainForm.needSdwApproval === 1" :span="12">
               <a-form-item label="督导领导列表" name="sdwLeaderList">
-                <a-input
-                  v-model:value="sdwLeaderNames"
-                  placeholder="请选择督导领导"
+                <DeptRoleSelectUser
+                  v-model:value="mainForm.sdwLeaderList"
+                  deptId="2044677562460508161"
+                  roleId="2044676455280570370"
                   :disabled="mainDisabled"
-                  readonly
-                  allow-clear
-                  @click="openSdwLeaderModal"
-                  @clear="handleClearSdwLeader"
-                >
-                  <template #suffix>
-                    <SearchOutlined @click="openSdwLeaderModal" />
-                  </template>
-                </a-input>
-                <SzUserSelectByDeptRoleSecurityModal
-                  v-model:open="sdwLeaderModalOpen"
-                  title="请选择所党委领导"
-                  :deptId="sdwLeaderDeptId"
-                  :roleId="sdwLeaderRoleId"
-                  :securityValue="sdwLeaderSecurityValue"
-                  @confirm="handleSdwLeaderConfirm"
                 />
               </a-form-item>
             </a-col>
@@ -288,7 +273,7 @@
 <script lang="ts" setup>
   import { computed, onMounted, reactive, ref, watch } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
-  import { getUserList } from '/@/api/common/api';
+
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUserStore } from '/@/store/modules/user';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
@@ -307,8 +292,7 @@
   import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
   import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
-  import SzUserSelectByDeptRoleSecurityModal from '/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue';
-  import { SearchOutlined } from '@ant-design/icons-vue';
+  import DeptRoleSelectUser from './DeptRoleSelectUser.vue';
 
   const { isDisabledAuth, hasPermission, initBpmFormData } = usePermission();
   const userStore = useUserStore();
@@ -345,42 +329,6 @@
   const subApproveUser = ref('');
   const isEnd = ref(0);
 
-  // 督导领导选人弹窗
-  const sdwLeaderModalOpen = ref(false);
-  const sdwLeaderNames = ref('');
-  const sdwLeaderDeptId = ref('2044677562460508161');
-  const sdwLeaderRoleId = ref('2044676455280570370');
-  const sdwLeaderSecurityValue = ref(5);
-
-  function openSdwLeaderModal() {
-    sdwLeaderModalOpen.value = true;
-  }
-
-  function handleClearSdwLeader() {
-    mainForm.sdwLeaderList = '';
-    sdwLeaderNames.value = '';
-  }
-
-  function handleSdwLeaderConfirm(rows: Array<{ id: string; realname: string }>) {
-    if (rows && rows.length > 0) {
-      mainForm.sdwLeaderList = rows.map((r) => r.username).join(',');
-      sdwLeaderNames.value = rows.map((r) => r.realname).join(',');
-    } else {
-      mainForm.sdwLeaderList = '';
-      sdwLeaderNames.value = '';
-    }
-  }
-
-  async function resolveSdwLeaderNames(ids: string) {
-    try {
-      const res = await getUserList({ username: ids, pageSize: 999 });
-      const records = res?.records || res?.result?.records || [];
-      sdwLeaderNames.value = records.map((u: any) => u.realname).join(',');
-    } catch {
-      sdwLeaderNames.value = '';
-    }
-  }
-
   const mainForm = reactive<Record<string, any>>({
     id: '',
     pid: '',
@@ -540,10 +488,6 @@
     Object.keys(mainForm).forEach((key) => {
       mainForm[key] = record[key] ?? '';
     });
-    sdwLeaderNames.value = record.sdwLeaderList_dictText || '';
-    if (!sdwLeaderNames.value && mainForm.sdwLeaderList) {
-      resolveSdwLeaderNames(mainForm.sdwLeaderList);
-    }
     // 从 approveInfo JSON 初始化当前部门的 isEnd 和 subApproveUser
     const approveInfo = record.approveInfo;
     const deptId = getCurrentUserDeptId();
diff --git a/src/views/bg/xispeak/components/BgXiSpeakForm.vue b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
index d2b21cd..5e15cde 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
@@ -59,7 +59,7 @@
               </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.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>
@@ -67,26 +67,11 @@
               </a-form-item>
             </a-col>
             <a-col v-if="formData.needSdwApproval === 1" :span="12">
-              <a-form-item label="督办领导列表" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
-                <a-input
-                  v-model:value="sdwLeaderNames"
-                  placeholder="请选择督办领导"
-                  readonly
-                  allow-clear
-                  @click="openSdwLeaderModal"
-                  @clear="handleClearSdwLeader"
-                >
-                  <template #suffix>
-                    <SearchOutlined @click="openSdwLeaderModal" />
-                  </template>
-                </a-input>
-                <SzUserSelectByDeptRoleSecurityModal
-                  v-model:open="sdwLeaderModalOpen"
-                  title="请选择所党委领导"
-                  :deptId="sdwLeaderDeptId"
-                  :roleId="sdwLeaderRoleId"
-                  :securityValue="sdwLeaderSecurityValue"
-                  @confirm="handleSdwLeaderConfirm"
+              <a-form-item label="所党委领导列表" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
+                <DeptRoleSelectUser
+                  v-model:value="formData.sdwLeaderList"
+                  deptId="2044677562460508161"
+                  roleId="2044676455280570370"
                 />
               </a-form-item>
             </a-col>
@@ -144,9 +129,7 @@
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
   import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import SzUserSelectByDeptRoleSecurityModal from '/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue';
-  import { SearchOutlined } from '@ant-design/icons-vue';
-  import { getUserList } from '/@/api/common/api';
+  import DeptRoleSelectUser from './DeptRoleSelectUser.vue';
   import { getValueType } from '/@/utils';
   import { loadTreeData, saveOrUpdateDict } from '../BgXiSpeak.api';
   import { Form } from 'ant-design-vue';
@@ -200,42 +183,6 @@
   const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 18 } });
   const confirmLoading = ref<boolean>(false);
 
-  // 督办领导选人弹窗
-  const sdwLeaderModalOpen = ref(false);
-  const sdwLeaderNames = ref('');
-  const sdwLeaderDeptId = ref('2044677562460508161');
-  const sdwLeaderRoleId = ref('2044676455280570370');
-  const sdwLeaderSecurityValue = ref(5);
-
-  function openSdwLeaderModal() {
-    sdwLeaderModalOpen.value = true;
-  }
-
-  function handleClearSdwLeader() {
-    formData.sdwLeaderList = '';
-    sdwLeaderNames.value = '';
-  }
-
-  function handleSdwLeaderConfirm(rows: Array<{ id: string; realname: string }>) {
-    if (rows && rows.length > 0) {
-      formData.sdwLeaderList = rows.map((r) => r.username).join(',');
-      sdwLeaderNames.value = rows.map((r) => r.realname).join(',');
-    } else {
-      formData.sdwLeaderList = '';
-      sdwLeaderNames.value = '';
-    }
-  }
-
-  async function resolveSdwLeaderNames(ids: string) {
-    try {
-      const res = await getUserList({ username: ids, pageSize: 999 });
-      const records = res?.records || res?.result?.records || [];
-      sdwLeaderNames.value = records.map((u: any) => u.realname).join(',');
-    } catch {
-      sdwLeaderNames.value = '';
-    }
-  }
-
   const validatorRules = reactive({
     speakStatus: [{ required: true, message: '请输入重要讲话指示批示情况' }],
     time: [{ required: true, message: '请选择时间' }],
@@ -299,7 +246,6 @@
       for (const key of Object.keys(formData)) {
         formData[key] = defaults[key];
       }
-      sdwLeaderNames.value = '';
       model = {};
       return;
     }
@@ -327,10 +273,6 @@
       });
 
       Object.assign(formData, tmpData);
-      sdwLeaderNames.value = data.sdwLeaderList_dictText || '';
-      if (!sdwLeaderNames.value && formData.sdwLeaderList) {
-        resolveSdwLeaderNames(formData.sdwLeaderList);
-      }
       model = { ...tmpData };
     });
   }
diff --git a/src/views/bg/xispeak/components/DeptRoleSelectUser.vue b/src/views/bg/xispeak/components/DeptRoleSelectUser.vue
new file mode 100644
index 0000000..0390eec
--- /dev/null
+++ b/src/views/bg/xispeak/components/DeptRoleSelectUser.vue
@@ -0,0 +1,39 @@
+<template>
+  <a-radio-group v-model:value="modelValue" :disabled="disabled">
+    <a-radio v-for="user in userList" :key="user.username" :value="user.username">
+      {{ user.realname }}
+    </a-radio>
+  </a-radio-group>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+
+const props = defineProps<{
+  deptId: string;
+  roleId: string;
+  disabled?: boolean;
+}>();
+
+const modelValue = defineModel<string>('value', { default: '' });
+
+const userList = ref<Array<{ username: string; realname: string }>>([]);
+
+onMounted(async () => {
+  try {
+    const params = {
+      departId: props.deptId,
+      roleId: props.roleId,
+      searchSecurityLevel: 5,
+      pageNo: 1,
+      pageSize: 999,
+    };
+    const res = await defHttp.get({ url: '/sys/user/queryUserRoleComponentData', params });
+    const records = res?.records || res?.result?.records || [];
+    userList.value = records;
+  } catch {
+    userList.value = [];
+  }
+});
+</script>

From 06b66689d31a3d89ecbe1d80b10ddfe134fac508 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 11 Jun 2026 15:46:39 +0800
Subject: [PATCH 04/10] =?UTF-8?q?fix(xispeak):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E5=90=8E=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 收集流程发起后bpmStatus设为'3'，区分"仅收集已发起"和"经办人已发起"
- 新增bpmStatus=='3'分支显示"发起经办人执行反馈流程"（首次）
- 更新BPM节点权限文档所纪委审批节点URL参数

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

diff --git a/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md b/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md
index 72cb190..438ce71 100644
--- a/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md
+++ b/src/views/bg/xispeak/BPM_NODE_PERMISSIONS.md
@@ -173,7 +173,7 @@ bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&sh
       * **showEditFeedback** `0` —— 编辑/删除操作列
       * **showDeptFeedback** `0` —— 按部门过滤反馈
       * **showJiJianFields** `0` —— 纪检字段列
-* bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1&showEditFeedback=1&nonJiJianFieldsReadonly=1&showJiJianFields=1
+* bg/xispeak/components/BgXiSpeakBPMForm?showProcessHandle=1&showFeedbackInfo=1
 ---
 
 
diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index 068c44a..5090ba9 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -529,6 +529,12 @@
         onClick: handleProcessJbr.bind(null, record),
       });
     }
+    if (record.bpmStatus == '3') {
+      dropDownAction.push({
+        label: '发起经办人执行反馈流程',
+        onClick: handleProcessJbr.bind(null, record),
+      });
+    }
     if (record.bpmStatus == '2') {
       dropDownAction.push({
         label: '再次发起经办人执行反馈流程',
@@ -711,7 +717,7 @@
     };
 
     await startProcessSchedules(params);
-    await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
+    await saveOrUpdateDict({ id: record.id, bpmStatus: '3', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
     createMessage.success('发起成功');
     reload();
   }

From 871e296f0636dc962d46294cdc777e48c46ee961 Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Fri, 12 Jun 2026 10:48:32 +0800
Subject: [PATCH 05/10] =?UTF-8?q?czh-20260612-=E6=96=B0=E5=A2=9E=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |   3 +
 .env.production                      |   3 +
 src/api/sys/autologin.ts             |  16 ++
 src/enums/pageEnum.ts                |   6 +-
 src/router/guard/permissionGuard.ts  |   6 +-
 src/router/routes/index.ts           |  22 +-
 src/store/modules/user.ts            |  17 +-
 src/views/sys/login/AutoLogin.vue    | 287 +++++++++++++++++++++++++++
 src/views/sys/login/LogoutResult.vue | 251 +++++++++++++++++++++++
 9 files changed, 605 insertions(+), 6 deletions(-)
 create mode 100644 src/api/sys/autologin.ts
 create mode 100644 src/views/sys/login/AutoLogin.vue
 create mode 100644 src/views/sys/login/LogoutResult.vue

diff --git a/.env.development b/.env.development
index fdc813c..8bc17b0 100644
--- a/.env.development
+++ b/.env.development
@@ -31,3 +31,6 @@ VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
 
 # 在线文档编辑版本。可选属性：wps, onlyoffice
 VITE_GLOB_ONLINE_DOCUMENT_VERSION=wps
+
+# AutoLogin SSO - 指向 demo 网关
+VITE_AUTOLOGIN_URL=http://localhost:9100/api/sys/autoLogin
diff --git a/.env.production b/.env.production
index 6f389f4..f29f56f 100644
--- a/.env.production
+++ b/.env.production
@@ -32,3 +32,6 @@ VITE_GLOB_API_URL_PREFIX=
 
 # 在线文档编辑版本。可选属性：wps, onlyoffice
 VITE_GLOB_ONLINE_DOCUMENT_VERSION=wps
+
+# AutoLogin SSO - 指向生产网关（地址由运维提供）
+VITE_AUTOLOGIN_URL=http://200.100.65.101:9100/api/sys/autoLogin
diff --git a/src/api/sys/autologin.ts b/src/api/sys/autologin.ts
new file mode 100644
index 0000000..53a33dd
--- /dev/null
+++ b/src/api/sys/autologin.ts
@@ -0,0 +1,16 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum AutoLoginApi {
+  AutoLogin = '/sys/autoLogin',
+  IpAutoLogin = '/sys/ipAutoLogin',
+}
+
+/** 自动登录 — 请求网关地址（由 VITE_AUTOLOGIN_URL 控制），form 表单格式 */
+export function autoLoginApi() {
+  const url = import.meta.env.VITE_AUTOLOGIN_URL || AutoLoginApi.AutoLogin;
+  return defHttp.post({
+    url,
+    data: 'username=&password=',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+  });
+}
diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index 58651ac..ba3cf52 100644
--- a/src/enums/pageEnum.ts
+++ b/src/enums/pageEnum.ts
@@ -12,5 +12,9 @@ export enum PageEnum {
   //文件路由
   SYS_FILES_PATH = '/file/share',
   // 邮件中的跳转地址
-  TOKEN_LOGIN = '/tokenLogin'
+  TOKEN_LOGIN = '/tokenLogin',
+  // 自动登录路径
+  AUTOLOGIN_PATH = '/user/autoLogin',
+  // 登出结果页路径
+  LOGOUT_RESULT_PATH = '/logoutResult',
 }
diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts
index 89a297f..0abc35b 100644
--- a/src/router/guard/permissionGuard.ts
+++ b/src/router/guard/permissionGuard.ts
@@ -28,7 +28,7 @@ const ROOT_PATH = RootRoute.path;
 
 //update-begin---author:wangshuai ---date:20220629  for：[issues/I5BG1I]vue3不支持auth2登录------------
 //update-begin---author:wangshuai ---date:20221111  for: [VUEN-2472]分享免登录------------
-const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN ];
+const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN, PageEnum.AUTOLOGIN_PATH, PageEnum.LOGOUT_RESULT_PATH ];
 //update-end---author:wangshuai ---date:20221111  for: [VUEN-2472]分享免登录------------
 //update-end---author:wangshuai ---date:20220629  for：[issues/I5BG1I]vue3不支持auth2登录------------
 
@@ -57,7 +57,7 @@ export function createPermissionGuard(router: Router) {
 
     // Whitelist can be directly entered
     if (whitePathList.includes(to.path as PageEnum)) {
-      if (to.path === LOGIN_PATH && token) {
+      if ((to.path === LOGIN_PATH || to.path === PageEnum.AUTOLOGIN_PATH) && token) {
         const isSessionTimeout = userStore.getSessionTimeout;
         
         //update-begin---author:scott ---date:2023-04-24  for：【QQYUN-4713】登录代码调整逻辑有问题，改造待观察--
@@ -122,7 +122,7 @@ export function createPermissionGuard(router: Router) {
         //---------【首次登陆并且是企业微信或者钉钉的情况下才会调用】------------------------------------------------
         //update-end---author:wangshuai ---date:20230302  for：只有首次登陆并且是企业微信或者钉钉的情况下才会调用------------
         // 如果当前是在OAuth2APP环境，就跳转到OAuth2登录页面，否则跳转到登录页面
-        path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : LOGIN_PATH;
+        path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : PageEnum.AUTOLOGIN_PATH;
       }
       //update-end---author:wangshuai ---date:20220629  for：[issues/I5BG1I]vue3 Auth2未实现------------
       // redirect login page
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 3a1ed5c..ea1b22f 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -65,6 +65,26 @@ export const TokenLoginRoute: AppRouteRecordRaw = {
   },
 };
 // update-begin--author:liaozhiyang---date:20240301---for：【QQYUN-7967】新增、编辑路由访问
+export const AutoLoginRoute: AppRouteRecordRaw = {
+  path: '/user/autoLogin',
+  name: 'AutoLogin',
+  component: () => import('/@/views/sys/login/AutoLogin.vue'),
+  meta: {
+    title: '自动登录',
+    ignoreAuth: true,
+  },
+};
+
+export const LogoutResultRoute: AppRouteRecordRaw = {
+  path: '/logoutResult',
+  name: 'LogoutResult',
+  component: () => import('/@/views/sys/login/LogoutResult.vue'),
+  meta: {
+    title: '退出登录',
+    ignoreAuth: true,
+  },
+};
+
 export const formUrlDetail = {
   path: '/online/formUrlDetail/:id/:dataId',
   name: 'formUrlDetail',
@@ -107,4 +127,4 @@ export const formUrlSuccess = {
 // update-end--author:liaozhiyang---date:20240301---for：【QQYUN-7967】新增、编辑路由访问
 
 // Basic routing without permission
-export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,formUrlDetail, formUrlAdd, formUrlEdit, formUrlSuccess];
+export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute, AutoLoginRoute, LogoutResultRoute,formUrlDetail, formUrlAdd, formUrlEdit, formUrlSuccess];
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 099710d..2c97c87 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@ import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, LOGIN_INFO_KEY, DB_DICT_DATA_KEY,
 import { getAuthCache, setAuthCache, removeAuthCache } from '/@/utils/auth';
 import { GetUserInfoModel, LoginParams, ThirdLoginParams } from '/@/api/sys/model/userModel';
 import { doLogout, getUserInfo, loginApi, phoneLoginApi, thirdLogin } from '/@/api/sys/user';
+  import { autoLoginApi } from '/@/api/sys/autologin';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
@@ -161,6 +162,20 @@ export const useUserStore = defineStore({
         return Promise.reject(error);
       }
     },
+    /**
+     * 网关自动登录 — 跳过密码，由网关注入身份
+     */
+    async autoLogin(goHome = true): Promise<GetUserInfoModel | null> {
+      try {
+        const data = await autoLoginApi();
+        const { token, userInfo } = data;
+        this.setToken(token);
+        this.setTenant(userInfo.loginTenantId);
+        return this.afterLoginAction(goHome, data);
+      } catch (error) {
+        return Promise.reject(error);
+      }
+    },
     /**
      * 扫码登录事件
      */
@@ -330,7 +345,7 @@ export const useUserStore = defineStore({
       }else{
         // update-begin-author:sunjianlei date:20230306 for: 修复登录成功后，没有正确重定向的问题
         goLogin && (await router.push({
-          path: PageEnum.BASE_LOGIN,
+          path: PageEnum.LOGOUT_RESULT_PATH,
           query: {
             // 传入当前的路由，登录成功后跳转到当前路由
             redirect: router.currentRoute.value.fullPath,
diff --git a/src/views/sys/login/AutoLogin.vue b/src/views/sys/login/AutoLogin.vue
new file mode 100644
index 0000000..ddb49c0
--- /dev/null
+++ b/src/views/sys/login/AutoLogin.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="login-wrapper">
+    <div class="decorations">
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="line line-1"></span>
+      <span class="line line-2"></span>
+      <span class="line line-3"></span>
+    </div>
+    <div class="login-main">
+      <!-- 研究所标识 -->
+      <div class="institute-logo">
+        <img src="/resource/img/institute_logo.png" alt="七〇四研究所" />
+      </div>
+
+      <!-- 系统标题 -->
+      <div class="system-title">
+        <img class="system-logo" src="/resource/img/logo.png" alt="Logo" />
+        <span class="system-name">事项督办系统</span>
+      </div>
+
+      <!-- 单点登录卡片 -->
+      <div class="login-card">
+        <template v-if="loading">
+          <div class="loading-spinner"></div>
+          <div class="card-title">正在单点登录</div>
+          <div class="card-desc">正在验证身份，请稍候...</div>
+        </template>
+        <template v-else>
+          <div class="card-icon error-icon">!</div>
+          <div class="card-title">登录失败</div>
+          <div class="card-desc">{{ errorMsg }}</div>
+          <button class="retry-btn" @click="handleRetry">重试</button>
+        </template>
+      </div>
+    </div>
+
+    <!-- 底部版权 -->
+    <div class="footer-text">
+      中国船舶集团有限公司第七〇四研究所 数智化中心&copy;2026
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref, onMounted } from 'vue';
+  import { useRouter } from 'vue-router';
+  import { useUserStore } from '/@/store/modules/user';
+
+  const router = useRouter();
+  const userStore = useUserStore();
+  const loading = ref(true);
+  const errorMsg = ref('');
+
+  async function doAutoLogin() {
+    loading.value = true;
+    errorMsg.value = '';
+    try {
+      await userStore.autoLogin(true);
+    } catch (error: any) {
+      loading.value = false;
+      errorMsg.value = error?.message || '单点登录失败，请稍后重试';
+    }
+  }
+
+  function handleRetry() {
+    doAutoLogin();
+  }
+
+
+  onMounted(() => {
+    doAutoLogin();
+  });
+</script>
+
+<style lang="less" scoped>
+  .login-wrapper {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-height: 100vh;
+    background: #fff;
+    overflow: hidden;
+
+    &::before,
+    &::after {
+      content: '';
+      position: absolute;
+      border-radius: 50%;
+      opacity: 0.6;
+      pointer-events: none;
+    }
+
+    &::before {
+      width: 600px;
+      height: 600px;
+      bottom: -280px;
+      left: -120px;
+      background: radial-gradient(circle, rgba(59, 130, 246, 0.12), transparent 70%);
+    }
+
+    &::after {
+      width: 500px;
+      height: 500px;
+      bottom: -200px;
+      right: -100px;
+      background: radial-gradient(circle, rgba(16, 185, 129, 0.10), transparent 70%);
+    }
+  }
+
+  .decorations {
+    position: absolute;
+    inset: 0;
+    pointer-events: none;
+    z-index: 0;
+
+    .dot {
+      position: absolute;
+      border-radius: 50%;
+      opacity: 0.55;
+    }
+
+    .dot:nth-child(1) { width: 18px; height: 18px; bottom: 22%; left: 12%; background: #3b82f6; opacity: 0.35; }
+    .dot:nth-child(2) { width: 12px; height: 12px; bottom: 32%; right: 15%; background: #f59e0b; opacity: 0.45; }
+    .dot:nth-child(3) { width: 24px; height: 24px; bottom: 15%; left: 30%; background: #10b981; opacity: 0.3; }
+    .dot:nth-child(4) { width: 10px; height: 10px; bottom: 28%; right: 28%; background: #8b5cf6; opacity: 0.5; }
+    .dot:nth-child(5) { width: 16px; height: 16px; bottom: 18%; left: 55%; background: #ec4899; opacity: 0.35; }
+    .dot:nth-child(6) { width: 20px; height: 20px; bottom: 10%; right: 10%; background: #06b6d4; opacity: 0.4; }
+    .dot:nth-child(7) { width: 8px; height: 8px; bottom: 35%; left: 20%; background: #f97316; opacity: 0.5; }
+    .dot:nth-child(8) { width: 14px; height: 14px; bottom: 8%; left: 45%; background: #6366f1; opacity: 0.4; }
+    .dot:nth-child(9) { width: 20px; height: 20px; top: 8%; left: 10%; background: #3b82f6; opacity: 0.25; }
+    .dot:nth-child(10) { width: 10px; height: 10px; top: 14%; right: 18%; background: #ec4899; opacity: 0.35; }
+    .dot:nth-child(11) { width: 16px; height: 16px; top: 5%; right: 8%; background: #10b981; opacity: 0.3; }
+    .dot:nth-child(12) { width: 8px; height: 8px; top: 18%; left: 25%; background: #f59e0b; opacity: 0.4; }
+
+    .line {
+      position: absolute;
+      pointer-events: none;
+      border-radius: 2px;
+      opacity: 0.15;
+    }
+
+    .line-1 { top: 12%; right: 5%; width: 120px; height: 2px; background: #3b82f6; transform: rotate(-15deg); }
+    .line-2 { top: 20%; left: 8%; width: 80px; height: 2px; background: #ec4899; transform: rotate(10deg); }
+    .line-3 { top: 6%; right: 15%; width: 60px; height: 2px; background: #10b981; transform: rotate(-8deg); }
+  }
+
+  .login-main {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 40px 24px;
+    z-index: 1;
+  }
+
+  .institute-logo {
+    margin-bottom: 48px;
+
+    img {
+      width: 400px;
+      height: auto;
+      display: block;
+    }
+  }
+
+  .system-title {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: 48px;
+
+    .system-logo {
+      width: 72px;
+      height: 72px;
+    }
+
+    .system-name {
+      font-size: 28px;
+      font-weight: 600;
+      color: #1a1a1a;
+      letter-spacing: 2px;
+    }
+  }
+
+  .login-card {
+    width: 100%;
+    max-width: 360px;
+    padding: 40px 32px;
+    background: #fafbfc;
+    border-radius: 12px;
+    text-align: center;
+  }
+
+  .loading-spinner {
+    width: 40px;
+    height: 40px;
+    margin: 0 auto 20px;
+    border: 3px solid #e5e7eb;
+    border-top-color: #1a6dd4;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+  }
+
+  @keyframes spin {
+    to { transform: rotate(360deg); }
+  }
+
+  .card-icon {
+    width: 48px;
+    height: 48px;
+    margin: 0 auto 16px;
+    border-radius: 50%;
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 48px;
+  }
+
+  .error-icon {
+    background: #fee2e2;
+    color: #ef4444;
+  }
+
+  .card-title {
+    font-size: 18px;
+    font-weight: 600;
+    color: #1a1a1a;
+    margin-bottom: 8px;
+  }
+
+  .card-desc {
+    font-size: 14px;
+    color: rgba(0, 0, 0, 0.45);
+    margin-bottom: 24px;
+  }
+
+  .retry-btn {
+    width: 100%;
+    height: 44px;
+    border: none;
+    border-radius: 8px;
+    background: #1a6dd4;
+    color: #fff;
+    font-size: 15px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: background 0.2s;
+    margin-bottom: 12px;
+
+    &:hover {
+      background: #155ab0;
+    }
+  }
+
+  .login-link {
+    display: inline-block;
+    font-size: 14px;
+    color: #1a6dd4;
+    cursor: pointer;
+
+    &:hover {
+      color: #155ab0;
+      text-decoration: underline;
+    }
+  }
+
+  .footer-text {
+    position: relative;
+    z-index: 1;
+    text-align: center;
+    font-size: 13px;
+    color: rgba(0, 0, 0, 0.65);
+    padding: 16px 0;
+  }
+</style>
diff --git a/src/views/sys/login/LogoutResult.vue b/src/views/sys/login/LogoutResult.vue
new file mode 100644
index 0000000..76b48b8
--- /dev/null
+++ b/src/views/sys/login/LogoutResult.vue
@@ -0,0 +1,251 @@
+<template>
+  <div class="login-wrapper">
+    <div class="decorations">
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="line line-1"></span>
+      <span class="line line-2"></span>
+      <span class="line line-3"></span>
+    </div>
+    <div class="login-main">
+      <!-- 研究所标识 -->
+      <div class="institute-logo">
+        <img src="/resource/img/institute_logo.png" alt="七〇四研究所" />
+      </div>
+
+      <!-- 系统标题 -->
+      <div class="system-title">
+        <img class="system-logo" src="/resource/img/logo.png" alt="Logo" />
+        <span class="system-name">事项督办系统</span>
+      </div>
+
+      <!-- 退出登录卡片 -->
+      <div class="login-card">
+        <div class="card-icon success-icon">
+          <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+            <polyline points="20 6 9 17 4 12"></polyline>
+          </svg>
+        </div>
+        <div class="card-title">已退出登录</div>
+        <div class="card-desc">您已安全退出系统</div>
+        <button class="sso-btn" @click="handleAutoLogin">重新单点登录</button>
+      </div>
+    </div>
+
+    <!-- 底部版权 -->
+    <div class="footer-text">
+      中国船舶集团有限公司第七〇四研究所 数智化中心&copy;2026
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { useRouter } from 'vue-router';
+
+  const router = useRouter();
+
+  function handleAutoLogin() {
+    router.replace('/user/autoLogin');
+  }
+
+
+</script>
+
+<style lang="less" scoped>
+  .login-wrapper {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-height: 100vh;
+    background: #fff;
+    overflow: hidden;
+
+    &::before,
+    &::after {
+      content: '';
+      position: absolute;
+      border-radius: 50%;
+      opacity: 0.6;
+      pointer-events: none;
+    }
+
+    &::before {
+      width: 600px;
+      height: 600px;
+      bottom: -280px;
+      left: -120px;
+      background: radial-gradient(circle, rgba(59, 130, 246, 0.12), transparent 70%);
+    }
+
+    &::after {
+      width: 500px;
+      height: 500px;
+      bottom: -200px;
+      right: -100px;
+      background: radial-gradient(circle, rgba(16, 185, 129, 0.10), transparent 70%);
+    }
+  }
+
+  .decorations {
+    position: absolute;
+    inset: 0;
+    pointer-events: none;
+    z-index: 0;
+
+    .dot {
+      position: absolute;
+      border-radius: 50%;
+      opacity: 0.55;
+    }
+
+    .dot:nth-child(1) { width: 18px; height: 18px; bottom: 22%; left: 12%; background: #3b82f6; opacity: 0.35; }
+    .dot:nth-child(2) { width: 12px; height: 12px; bottom: 32%; right: 15%; background: #f59e0b; opacity: 0.45; }
+    .dot:nth-child(3) { width: 24px; height: 24px; bottom: 15%; left: 30%; background: #10b981; opacity: 0.3; }
+    .dot:nth-child(4) { width: 10px; height: 10px; bottom: 28%; right: 28%; background: #8b5cf6; opacity: 0.5; }
+    .dot:nth-child(5) { width: 16px; height: 16px; bottom: 18%; left: 55%; background: #ec4899; opacity: 0.35; }
+    .dot:nth-child(6) { width: 20px; height: 20px; bottom: 10%; right: 10%; background: #06b6d4; opacity: 0.4; }
+    .dot:nth-child(7) { width: 8px; height: 8px; bottom: 35%; left: 20%; background: #f97316; opacity: 0.5; }
+    .dot:nth-child(8) { width: 14px; height: 14px; bottom: 8%; left: 45%; background: #6366f1; opacity: 0.4; }
+    .dot:nth-child(9) { width: 20px; height: 20px; top: 8%; left: 10%; background: #3b82f6; opacity: 0.25; }
+    .dot:nth-child(10) { width: 10px; height: 10px; top: 14%; right: 18%; background: #ec4899; opacity: 0.35; }
+    .dot:nth-child(11) { width: 16px; height: 16px; top: 5%; right: 8%; background: #10b981; opacity: 0.3; }
+    .dot:nth-child(12) { width: 8px; height: 8px; top: 18%; left: 25%; background: #f59e0b; opacity: 0.4; }
+
+    .line {
+      position: absolute;
+      pointer-events: none;
+      border-radius: 2px;
+      opacity: 0.15;
+    }
+
+    .line-1 { top: 12%; right: 5%; width: 120px; height: 2px; background: #3b82f6; transform: rotate(-15deg); }
+    .line-2 { top: 20%; left: 8%; width: 80px; height: 2px; background: #ec4899; transform: rotate(10deg); }
+    .line-3 { top: 6%; right: 15%; width: 60px; height: 2px; background: #10b981; transform: rotate(-8deg); }
+  }
+
+  .login-main {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 40px 24px;
+    z-index: 1;
+  }
+
+  .institute-logo {
+    margin-bottom: 48px;
+
+    img {
+      width: 400px;
+      height: auto;
+      display: block;
+    }
+  }
+
+  .system-title {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: 48px;
+
+    .system-logo {
+      width: 72px;
+      height: 72px;
+    }
+
+    .system-name {
+      font-size: 28px;
+      font-weight: 600;
+      color: #1a1a1a;
+      letter-spacing: 2px;
+    }
+  }
+
+  .login-card {
+    width: 100%;
+    max-width: 360px;
+    padding: 40px 32px;
+    background: #fafbfc;
+    border-radius: 12px;
+    text-align: center;
+  }
+
+  .card-icon {
+    width: 56px;
+    height: 56px;
+    margin: 0 auto 16px;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .success-icon {
+    background: #dcfce7;
+    color: #22c55e;
+  }
+
+  .card-title {
+    font-size: 18px;
+    font-weight: 600;
+    color: #1a1a1a;
+    margin-bottom: 8px;
+  }
+
+  .card-desc {
+    font-size: 14px;
+    color: rgba(0, 0, 0, 0.45);
+    margin-bottom: 24px;
+  }
+
+  .sso-btn {
+    width: 100%;
+    height: 44px;
+    border: none;
+    border-radius: 8px;
+    background: #1a6dd4;
+    color: #fff;
+    font-size: 15px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: background 0.2s;
+    margin-bottom: 12px;
+
+    &:hover {
+      background: #155ab0;
+    }
+  }
+
+  .login-link {
+    display: inline-block;
+    font-size: 14px;
+    color: #1a6dd4;
+    cursor: pointer;
+
+    &:hover {
+      color: #155ab0;
+      text-decoration: underline;
+    }
+  }
+
+  .footer-text {
+    position: relative;
+    z-index: 1;
+    text-align: center;
+    font-size: 13px;
+    color: rgba(0, 0, 0, 0.65);
+    padding: 16px 0;
+  }
+</style>

From 7d11d759b99d3e5a299495d4ca5819b3c63dd810 Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Fri, 12 Jun 2026 15:56:56 +0800
Subject: [PATCH 06/10] =?UTF-8?q?czh-20260612-=E5=A2=9E=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E9=97=A8=E9=80=89=E4=BA=BA=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=BD=93=E5=89=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=89=80=E5=9C=A8=E7=9A=84=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deptUserComponent/SzDeptUserModal.vue     | 158 +++++++
 .../deptUserComponent/SzDeptUserSelect.vue    | 389 ++++++++++++++++++
 .../SzDeptUserSelectedList.vue                |  55 +++
 .../semri/deptUserComponent/types.ts          |  68 +++
 .../components/BgPartymatterBPMForm.vue       |  13 +-
 5 files changed, 675 insertions(+), 8 deletions(-)
 create mode 100644 src/components/semri/deptUserComponent/SzDeptUserModal.vue
 create mode 100644 src/components/semri/deptUserComponent/SzDeptUserSelect.vue
 create mode 100644 src/components/semri/deptUserComponent/SzDeptUserSelectedList.vue
 create mode 100644 src/components/semri/deptUserComponent/types.ts

diff --git a/src/components/semri/deptUserComponent/SzDeptUserModal.vue b/src/components/semri/deptUserComponent/SzDeptUserModal.vue
new file mode 100644
index 0000000..d7b0f4e
--- /dev/null
+++ b/src/components/semri/deptUserComponent/SzDeptUserModal.vue
@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <a-row class="j-select-row" type="flex" :gutter="8">
+      <a-col class="left">
+        <a-select
+          :value="selectDisplayValue"
+          :placeholder="'请选择人员'"
+          :disabled="disabled"
+          :open="false"
+          mode="multiple"
+          :maxTagCount="3"
+          style="width: 100%"
+        />
+      </a-col>
+      <a-col class="right">
+        <a-button type="primary" @click="openModal()" :disabled="disabled">选择</a-button>
+      </a-col>
+    </a-row>
+    <a-modal
+      :width="1200"
+      title="选择人员"
+      v-model:open="visible"
+      centered
+      :confirm-loading="confirmLoading"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      :mask-closable="false"
+    >
+      <SzDeptUserSelect
+        :checkedUser="tempSelectedUsers"
+        @update:checkedUser="handleTempUsersChange"
+        :secLevel="secLevel"
+        :departId="innerDepartId"
+        :role="role"
+        :isSpecial="isSpecial"
+        :multi="multi"
+      />
+      <template #footer>
+        <a-button @click="handleCancel">取消</a-button>
+        <a-button type="primary" :loading="confirmLoading" @click="handleOk">确定</a-button>
+      </template>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, watch } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useUserStore } from '/@/store/modules/user';
+import SzDeptUserSelect from './SzDeptUserSelect.vue';
+import SzDeptUserSelectedList from './SzDeptUserSelectedList.vue';
+import type { UserItem } from './types';
+
+const props = withDefaults(
+  defineProps<{
+    value?: string;
+    departId?: string;
+    secLevel?: any;
+    role?: string | number;
+    isSpecial?: number;
+    disabled?: boolean;
+    multi?: boolean;
+  }>(),
+  {
+    value: '',
+    departId: '',
+    secLevel: 0,
+    role: 1,
+    isSpecial: 0,
+    disabled: false,
+    multi: true,
+  }
+);
+
+const emit = defineEmits(['update:value', 'change']);
+
+const userStore = useUserStore();
+const visible = ref(false);
+const confirmLoading = ref(false);
+const innerSelectedUsers = ref<UserItem[]>([]);
+const tempSelectedUsers = ref<UserItem[]>([]);
+
+const innerDepartId = computed(() => {
+  return props.departId || userStore.getUserInfo?.orgCode || '';
+});
+
+const selectDisplayValue = computed(() => {
+  return innerSelectedUsers.value.map((u) => u.realname);
+});
+
+watch(
+  () => props.value,
+  (newVal) => {
+    if (newVal) {
+      loadUsersByUsernames(newVal);
+    } else {
+      innerSelectedUsers.value = [];
+    }
+  },
+  { immediate: true }
+);
+
+async function loadUsersByUsernames(usernames: string) {
+  try {
+    const res: any = await defHttp.get({
+      url: '/sys/user/queryUserComponentData',
+      params: { username: usernames, isMultiTranslate: 'true', pageNo: 1, pageSize: 9999 },
+    });
+    innerSelectedUsers.value = [...(res.records || res)];
+  } catch {
+    innerSelectedUsers.value = [];
+  }
+}
+
+function openModal() {
+  if (props.disabled) return;
+  tempSelectedUsers.value = [...innerSelectedUsers.value];
+  visible.value = true;
+}
+
+function handleTempUsersChange(users: UserItem[]) {
+  tempSelectedUsers.value = [...users];
+}
+
+function clearTemp() {
+  tempSelectedUsers.value = [];
+}
+
+function handleOk() {
+  innerSelectedUsers.value = [...tempSelectedUsers.value];
+  const usernames = innerSelectedUsers.value.map((u) => u.username).join(',');
+  emit('update:value', usernames);
+  emit('change', usernames);
+  visible.value = false;
+}
+
+function handleCancel() {
+  visible.value = false;
+}
+</script>
+
+<style lang="less" scoped>
+.j-select-row {
+  @width: 82px;
+
+  .left {
+    width: calc(100% - @width - 8px);
+  }
+
+  .right {
+    width: @width;
+  }
+
+  :deep(.ant-select-search__field) {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/semri/deptUserComponent/SzDeptUserSelect.vue b/src/components/semri/deptUserComponent/SzDeptUserSelect.vue
new file mode 100644
index 0000000..f994eb4
--- /dev/null
+++ b/src/components/semri/deptUserComponent/SzDeptUserSelect.vue
@@ -0,0 +1,389 @@
+<template>
+  <a-row :gutter="0" style="height: 556px">
+    <!-- 部门树 -->
+    <a-col :span="6" style="height: 100%; border-right: 1px solid #e8e8e8; padding: 0 12px; display: flex; flex-direction: column">
+      <a-input-search v-model:value="searchDepartValue" style="margin-bottom: 12px; margin-top: 0" placeholder="请输入部门名称" />
+      <a-directory-tree
+        selectable
+        v-model:selectedKeys="selectedDepIds"
+        :check-strictly="true"
+        :dropdown-style="{ maxHeight: '200px', overflow: 'auto' }"
+        :tree-data="filterDepartTreeData"
+        :expand-action="false"
+        v-model:expandedKeys="expandedKeys"
+        @select="onDepSelect"
+        style="height: 500px; overflow: auto"
+      />
+    </a-col>
+    <!-- 人员表格 -->
+    <a-col :span="10" style="height: 100%; padding: 0 12px; border-right: 1px solid #e8e8e8; display: flex; flex-direction: column">
+      <div style="margin-bottom: 12px; margin-top: 0; display: flex; align-items: center; gap: 8px; flex-wrap: wrap">
+        <a-input-search
+          style="flex: 1; min-width: 120px"
+          placeholder="输入姓名"
+          v-model:value="queryParam.realname"
+          @search="onSearch"
+        />
+        <a-button @click="searchReset(1)">重置</a-button>
+        <a-button type="primary" @click="selectAll">全选</a-button>
+        <a-button type="danger" @click="unselectAll">清空</a-button>
+      </div>
+      <div style="flex: 1; min-height: 0; overflow: auto">
+        <a-empty v-if="selectedDepIds.length === 0" description="请先选择部门！" />
+        <a-table
+          v-else
+          :scroll="{ y: 430 }"
+          size="middle"
+          row-key="id"
+          :columns="columns"
+          :data-source="dataSource"
+          :pagination="ipagination"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onSelectAll: onSelectAll, onSelect: onSelect, type: getType }"
+          :loading="loading"
+          @change="handleTableChange"
+          :custom-row="customRow"
+        />
+      </div>
+    </a-col>
+    <!-- 已选列表 -->
+    <a-col :span="8" style="height: 100%; padding: 0 12px; display: flex; flex-direction: column">
+      <div style="margin-bottom: 12px; margin-top: 0; display: flex; align-items: center; gap: 8px; flex-wrap: wrap">
+        <span style="font-weight: 500">已选 ({{ selectedRows.length }})</span>
+        <a-button type="danger" @click="clearSelected">清空</a-button>
+      </div>
+      <div style="flex: 1; overflow: auto; min-height: 0">
+        <SzDeptUserSelectedList
+          :selectedUsers="selectedRows"
+          @update:selectedUsers="(users) => emit('update:checkedUser', users)"
+        />
+      </div>
+    </a-col>
+  </a-row>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch, onMounted } from 'vue';
+import { queryTreeList } from '/@/api/common/api';
+import { defHttp } from '/@/utils/http/axios';
+import { filterObj } from '/@/utils/common/compUtils';
+import { deleteIfExist, pushIfNotExist, filterDepartTree, recurTree } from './types';
+import type { UserItem, DepartTreeNode } from './types';
+import SzDeptUserSelectedList from './SzDeptUserSelectedList.vue';
+
+const props = withDefaults(
+  defineProps<{
+    secLevel: any;
+    checkedUser?: UserItem[];
+    departId: string;
+    role: string | number;
+    isSpecial?: number;
+    multi?: boolean;
+  }>(),
+  {
+    checkedUser: () => [],
+    isSpecial: 0,
+    multi: true,
+  }
+);
+
+const emit = defineEmits(['update:checkedUser']);
+
+const searchDepartValue = ref('');
+const queryParam = reactive<Record<string, any>>({ realname: '' });
+const dataSource = ref<UserItem[]>([]);
+const allUserList = ref<UserItem[]>([]);
+const selectedDepIds = ref<string[]>([]);
+const selectedRows = ref<UserItem[]>([]);
+const departTree = ref<DepartTreeNode[]>([]);
+const fullDepartTree = ref<DepartTreeNode[]>([]);
+const loading = ref(false);
+const expandedKeys = ref<string[]>([]);
+
+function findDepartIdByOrgCode(tree: DepartTreeNode[], orgCode: string): string | null {
+  for (const node of tree) {
+    if (node.orgCode === orgCode) {
+      return node.id;
+    }
+    if (node.children && node.children.length > 0) {
+      const found = findDepartIdByOrgCode(node.children, orgCode);
+      if (found) return found;
+    }
+  }
+  return null;
+}
+
+function resolveDepartId(departIdOrOrgCode: string): string {
+  if (!departIdOrOrgCode) return departIdOrOrgCode;
+  const uuidPattern = /^[0-9a-f]{32}$/i;
+  if (uuidPattern.test(departIdOrOrgCode.replace(/-/g, ''))) return departIdOrOrgCode;
+  const realId = findDepartIdByOrgCode(fullDepartTree.value, departIdOrOrgCode);
+  if (realId) return realId;
+  return departIdOrOrgCode;
+}
+
+const columns = [
+  { title: '用户姓名', align: 'center' as const, dataIndex: 'realname' },
+  { title: '人员密级', align: 'center' as const, dataIndex: 'userSecurityLevel_dictText' },
+];
+
+const ipagination = reactive({
+  current: 1,
+  pageSize: 7,
+  showQuickJumper: true,
+  total: 0,
+});
+
+const isorter = reactive({
+  column: 'createTime',
+  order: 'desc',
+});
+
+const url = {
+  pageUserDepart: '/sys/user/queryUserComponentData',
+  listUserDepart: '/sys/user/queryUserComponentData',
+};
+
+const getType = computed(() => (props.multi ? 'checkbox' : 'radio'));
+const selectedRowKeys = computed(() => selectedRows.value.map((item) => item.id));
+
+const filterDepartTreeData = computed(() => {
+  if (!searchDepartValue.value) return departTree.value;
+  return filterDepartTree(departTree.value, searchDepartValue.value);
+});
+
+watch(
+  () => props.checkedUser,
+  () => {
+    selectedRows.value = [...(props.checkedUser || [])];
+  }
+);
+
+watch(
+  () => props.departId,
+  () => {
+    queryDepartTree();
+  },
+  { immediate: true }
+);
+
+watch(
+  () => props.role,
+  () => {
+    queryDepartTree();
+  }
+);
+
+watch(
+  () => props.secLevel,
+  () => {
+    if (selectedDepIds.value.length > 0) {
+      getAllUsersInDepart();
+      loadData();
+    }
+  }
+);
+
+function initData() {
+  const depId = props.departId;
+  if (depId) {
+    const resolvedId = resolveDepartId(depId);
+    selectedDepIds.value = [resolvedId];
+    getAllUsersInDepart();
+    loadData();
+  }
+  if (props.checkedUser) {
+    selectedRows.value = [...props.checkedUser];
+  }
+}
+
+async function loadData(arg?: number) {
+  if (selectedDepIds.value.length > 0) {
+    if (arg === 1) {
+      ipagination.current = 1;
+    }
+    const params = getQueryParams();
+    loading.value = true;
+    try {
+      const res: any = await defHttp.get({ url: url.pageUserDepart, params });
+      dataSource.value = (res.records || []).filter((user: UserItem) => {
+        const userLevel = user.userSecurityLevel;
+        const docLevel = props.secLevel;
+        return userLevel !== null && userLevel > docLevel;
+      });
+      ipagination.total = res.total;
+    } finally {
+      loading.value = false;
+    }
+  }
+}
+
+function getQueryParams() {
+  const param = Object.assign({}, queryParam, isorter);
+  param.searchSecurityLevel = props.secLevel;
+  param.field = getQueryField();
+  param.pageNo = ipagination.current;
+  param.pageSize = ipagination.pageSize;
+  param.departId = selectedDepIds.value.join(',');
+  param.isSpecial = props.isSpecial;
+  return filterObj(param);
+}
+
+function getQueryField() {
+  let str = 'id,';
+  for (let a = 0; a < columns.length; a++) {
+    str += ',' + columns[a].dataIndex;
+  }
+  return str;
+}
+
+function searchReset(num?: number) {
+  if (num !== 0) {
+    queryParam.realname = '';
+    loadData(1);
+  }
+}
+
+function handleTableChange(pagination: any, _filters: any, sorter: any) {
+  if (Object.keys(sorter).length > 0) {
+    isorter.column = sorter.field;
+    isorter.order = sorter.order === 'ascend' ? 'asc' : 'desc';
+  }
+  Object.assign(ipagination, pagination);
+  loadData();
+}
+
+async function getAllUsersInDepart() {
+  if (selectedDepIds.value.length === 0 || (selectedDepIds.value.length === 1 && !selectedDepIds.value[0])) {
+    allUserList.value = [];
+    return;
+  }
+  const param = Object.assign({}, queryParam);
+  param.searchSecurityLevel = props.secLevel;
+  param.field = getQueryField();
+  param.departId = selectedDepIds.value.join(',');
+  param.isSpecial = props.isSpecial;
+  param.pageNo = 1;
+  param.pageSize = 9999;
+  const filteredParam = filterObj(param);
+  try {
+    const res: any = await defHttp.get({ url: url.listUserDepart, params: filteredParam });
+    allUserList.value = (res.records || res).filter((user: UserItem) => {
+      const userLevel = user.userSecurityLevel;
+      const docLevel = props.secLevel;
+      return userLevel !== null && userLevel > docLevel;
+    });
+  } catch (e) {
+    allUserList.value = [];
+  }
+}
+
+function onDepSelect(keys: string[]) {
+  if (keys.length > 0 && keys[0] != null) {
+    selectedDepIds.value = [keys[0]];
+    loadData(1);
+    getAllUsersInDepart();
+  }
+}
+
+function onSelect(record: UserItem, selected: boolean) {
+  if (selected) {
+    pushIfNotExist(selectedRows.value, record, 'id');
+  } else {
+    deleteIfExist(selectedRows.value, record, 'id');
+  }
+  selectedRows.value.sort((a, b) => (a.sortno || 0) - (b.sortno || 0));
+  emit('update:checkedUser', selectedRows.value);
+}
+
+function onSelectAll(selected: boolean, selectedRecords: UserItem[], changeRecords: UserItem[]) {
+  if (selected) {
+    selectedRecords.forEach((item) => {
+      pushIfNotExist(selectedRows.value, item, 'id');
+    });
+  } else {
+    const rowsToRemove = changeRecords && changeRecords.length > 0 ? changeRecords : dataSource.value;
+    rowsToRemove.forEach((item) => {
+      deleteIfExist(selectedRows.value, item, 'id');
+    });
+  }
+  selectedRows.value.sort((a, b) => (a.sortno || 0) - (b.sortno || 0));
+  emit('update:checkedUser', selectedRows.value);
+}
+
+function onSearch() {
+  loadData(1);
+}
+
+async function queryDepartTree() {
+  expandedKeys.value = [];
+  departTree.value = [];
+  try {
+    const res: any = await queryTreeList();
+    const arr = [...res];
+    fullDepartTree.value = [...arr];
+
+    if (props.role === 1 || props.role === '1') {
+      departTree.value = [...arr];
+    } else {
+      const resolvedDepartId = resolveDepartId(props.departId);
+      const tree = recurTree(arr, (node) => {
+        if (node.id === resolvedDepartId) return [node];
+        return [];
+      });
+      departTree.value = [...tree];
+    }
+    departTree.value.forEach((item) => {
+      expandedKeys.value.push(item.key);
+    });
+    await initData();
+  } catch (e) {
+    console.error('queryDepartTree error:', e);
+  }
+}
+
+function selectAll() {
+  allUserList.value.forEach((item) => {
+    pushIfNotExist(selectedRows.value, item, 'id');
+  });
+  selectedRows.value.sort((a, b) => (a.sortno || 0) - (b.sortno || 0));
+  emit('update:checkedUser', selectedRows.value);
+}
+
+function unselectAll() {
+  allUserList.value.forEach((item) => {
+    deleteIfExist(selectedRows.value, item, 'id');
+  });
+  emit('update:checkedUser', selectedRows.value);
+}
+
+function clearSelected() {
+  selectedRows.value = [];
+  emit('update:checkedUser', selectedRows.value);
+}
+
+function customRow(record: UserItem) {
+  return {
+    onClick: (_event: Event) => {
+      const clickRowKey = record.id;
+      if (selectedRowKeys.value.includes(clickRowKey)) {
+        deleteIfExist(selectedRows.value, record, 'id');
+      } else {
+        pushIfNotExist(selectedRows.value, record, 'id');
+      }
+      selectedRows.value.sort((a, b) => (a.sortno || 0) - (b.sortno || 0));
+      emit('update:checkedUser', selectedRows.value);
+    },
+  };
+}
+
+onMounted(async () => {
+  await queryDepartTree();
+});
+</script>
+
+<style scoped>
+.ant-table-tbody .ant-table-row td {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+</style>
diff --git a/src/components/semri/deptUserComponent/SzDeptUserSelectedList.vue b/src/components/semri/deptUserComponent/SzDeptUserSelectedList.vue
new file mode 100644
index 0000000..a7a0e09
--- /dev/null
+++ b/src/components/semri/deptUserComponent/SzDeptUserSelectedList.vue
@@ -0,0 +1,55 @@
+<template>
+  <div style="margin-left: 1px">
+    <a-empty v-if="selectedUsers.length === 0" />
+    <div v-else>
+      <a-button-group
+        v-for="(user, index) in selectedUsers"
+        :key="'user-' + user.id + '-' + index"
+        class="small-space"
+      >
+        <a-button class="btn-green" size="small">
+          <UserOutlined />
+          {{ user.realname }}
+        </a-button>
+        <a-button v-if="!disabled" class="btn-green" size="small" @click="deleteUser(index)">
+          <CloseOutlined />
+        </a-button>
+      </a-button-group>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UserOutlined, CloseOutlined } from '@ant-design/icons-vue';
+import type { UserItem } from './types';
+
+const props = withDefaults(
+  defineProps<{
+    disabled?: boolean;
+    selectedUsers: UserItem[];
+  }>(),
+  {
+    disabled: false,
+    selectedUsers: () => [],
+  }
+);
+
+const emit = defineEmits(['update:selectedUsers']);
+
+function deleteUser(index: number) {
+  const arr = [...props.selectedUsers];
+  arr.splice(index, 1);
+  emit('update:selectedUsers', arr);
+}
+</script>
+
+<style lang="less" scoped>
+.small-space {
+  margin: 2px;
+}
+.btn-green {
+  background-color: #52c41a;
+  color: #fff;
+  border-color: #52c41a;
+}
+</style>
diff --git a/src/components/semri/deptUserComponent/types.ts b/src/components/semri/deptUserComponent/types.ts
new file mode 100644
index 0000000..b8d6c32
--- /dev/null
+++ b/src/components/semri/deptUserComponent/types.ts
@@ -0,0 +1,68 @@
+export interface UserItem {
+  id: string;
+  username: string;
+  realname: string;
+  orgCodeTxt?: string;
+  userSecurityLevel?: number;
+  userSecurityLevel_dictText?: string;
+  sex_dictText?: string;
+  sortno?: number;
+  departId?: string;
+  departName?: string;
+}
+
+export interface DepartTreeNode {
+  id: string;
+  key: string;
+  value: string;
+  title: string;
+  isLeaf?: boolean;
+  departType?: string | number;
+  distributable?: number;
+  disableCheckbox?: boolean;
+  children?: DepartTreeNode[];
+  description?: string;
+  parentId?: string;
+  orgCode?: string;
+}
+
+export function deleteIfExist<T extends Record<string, any>>(array: T[], value: T, key: string): void {
+  const idx = array.findIndex((item) => item[key] === value[key]);
+  if (idx >= 0) {
+    array.splice(idx, 1);
+  }
+}
+
+export function pushIfNotExist<T extends Record<string, any>>(array: T[], value: T, key: string): void {
+  const idx = array.findIndex((item) => item[key] === value[key]);
+  if (idx < 0) {
+    array.push(value);
+  }
+}
+
+export function filterDepartTree<T extends Record<string, any>>(departTree: T[], searchValue: string): T[] {
+  let filtered: T[] = [];
+  departTree.forEach((item) => {
+    if (item.title && item.title.includes(searchValue)) {
+      filtered.push(Object.assign({}, item, { children: null, isLeaf: true }));
+    }
+    if (item.children) {
+      const result = filterDepartTree(item.children, searchValue);
+      if (result.length > 0) {
+        filtered = filtered.concat(result);
+      }
+    }
+  });
+  return filtered;
+}
+
+export function recurTree<T extends Record<string, any>, R>(tree: T[], callback: (node: T) => R[]): R[] {
+  let res: R[] = [];
+  tree.forEach((item) => {
+    res = res.concat(callback(item));
+    if (item.children) {
+      res = res.concat(recurTree(item.children, callback));
+    }
+  });
+  return res;
+}
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index ed99695..9629856 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -184,13 +184,10 @@
             </a-col>
             <a-col v-if="showSubApproveUserSelector" :span="12">
               <a-form-item label="部门经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-
-                  <j-select-user
-                    v-model:value="subApproveUser"
-                    :disabled="savingSubApproveUser"
-                    allow-clear
-                  />
-
+                <sz-dept-user-modal
+                  v-model:value="subApproveUser"
+                  :disabled="savingSubApproveUser"
+                />
               </a-form-item>
             </a-col>
 <!--            <a-col :span="24">-->
@@ -226,7 +223,7 @@
   import JDictSelectTag from "../../../../components/Form/src/jeecg/components/JDictSelectTag.vue";
   import BgPartymatterBPMFeedbackModal from './BgPartymatterBPMFeedbackModal.vue';
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
-  import JSelectUser from "../../../../components/Form/src/jeecg/components/JSelectUser.vue";
+  import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
   const { isDisabledAuth, hasPermission, initBpmFormData} = usePermission();
 
   const props = defineProps({

From 4dfcec4f394dcd245e883b02c32b6cf0e872c385 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Fri, 12 Jun 2026 16:34:31 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat(inspect):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E5=92=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8A=84=E9=80=81=E4=BA=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- bpm-select-user 新增 value prop 支持初始值回显
- MyHandleContent/TaskHandleInnerContent 新增 defaultCc prop 透传默认抄送人
- DqInspectTaskBPMForm 按任务节点自动生成审批意见
- DqInspectTaskBPMForm 党群负责人收集后审批节点自动查询抄送人
- 所有新增 prop 均可选，不影响现有调用方

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../components/DqInspectTaskBPMForm.vue       | 108 ++++++++++++++----
 .../components/bpmSelectUser/index.vue        |  21 +++-
 .../myHandleTask/content/MyHandleContent.vue  |  22 +++-
 .../content/TaskHandleInnerContent.vue        |   5 +
 4 files changed, 131 insertions(+), 25 deletions(-)

diff --git a/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue b/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
index 4e838b1..38ab75b 100644
--- a/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
+++ b/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
@@ -29,7 +29,12 @@
         </div>
         <a-row class="base-info-row" :gutter="[12, 4]">
           <a-col :span="24">
-            <a-form-item label="具体问题" name="problemId" :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }">
+            <a-form-item
+              label="具体问题"
+              name="problemId"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }"
+            >
               <a-tree-select
                 v-model:value="mainForm.problemId"
                 :tree-data="problemTreeData"
@@ -43,14 +48,25 @@
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="整改措施" name="improveMeasure" :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }">
+            <a-form-item
+              label="整改措施"
+              name="improveMeasure"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }"
+            >
               <a-textarea v-model:value="mainForm.improveMeasure" :auto-size="{ minRows: 1, maxRows: 4 }" :disabled="mainDisabled" allow-clear />
             </a-form-item>
           </a-col>
           <template v-if="showBaseInfoDetail">
             <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 />
+                <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">
@@ -214,6 +230,8 @@
           :claim="claim"
           :showSelnextUser="showSelnextUser"
           :beforeHandle="saveMainFormBeforeProcessHandle"
+          :defaultReason="defaultHandleReason"
+          :defaultCc="defaultCcUsers"
           @success="handleProcessSuccess"
           @claimSuccess="handleClaimSuccess"
         />
@@ -273,6 +291,33 @@
   const isNeedLeaderApprove = ref(0);
   const leaderApproveUser = ref('');
   const savingIsNeedLeaderApprove = ref(false);
+  const defaultCcUsers = ref<Array<{ username: string; realname: string }>>([]);
+
+  const handleReasonTemplateMap: Record<string, () => string> = {
+    Task_0g8sc6n: () => '同意。',
+    Task_0ixi1rs: () => '已收集完成，同意。',
+    Task_0l5ik22: () => '同意。',
+    Task_0mbr735: () => '已完成反馈，请领导审批。',
+    Task_0mxtg05: () => '已审批。',
+    Task_14226iy: () => '已审查。',
+    Task_1c64uvl: () => '请相关部门办理。',
+    Task_1i99s6v: () => '同意。',
+    Task_1nj4k7b: () => '已发起督办流程。',
+
+    Task_09qxoto: () => '纪委书记已审批。',
+    Task_0cfjknn: () => '党委书记已审批。',
+    Task_0r2vutj: () => '责任经办部门已审批。',
+    Task_1azpeqj: () => '纪检经办人已监察。',
+    Task_1cvft2f: () => '党群经办人已确认。',
+    Task_1k1zt37: () => '分管所领导已审批。',
+    Task_1k36lmv: () => '责任部门负责人已审批。',
+    Task_1k6n75g: () => '分配人办理流程。',
+  };
+
+  const defaultHandleReason = computed(() => {
+    const builder = handleReasonTemplateMap[String(processInfo.value.taskDefKey || '')];
+    return builder ? builder() : '';
+  });
 
   const mainForm = reactive<Record<string, any>>({
     id: '',
@@ -333,33 +378,21 @@
     if (explicit === '1') return true;
     return props.formBpm && !!props.formData?.taskId;
   });
-  const showAddFeedback = computed(
-    () => String(props.formData?.extendUrlParams?.showAddFeedback ?? '') === '1'
-  );
+  const showAddFeedback = computed(() => String(props.formData?.extendUrlParams?.showAddFeedback ?? '') === '1');
   const showFeedbackInfo = computed(() => {
     const p = props.formData?.extendUrlParams;
     const explicit = p?.showFeedbackInfo;
     if (explicit === '0') return false;
     if (explicit === '1') return true;
-    return (
-      String(p?.showAddFeedback ?? '') === '1' ||
-      String(p?.showEditFeedback ?? '') === '1' ||
-      String(p?.showDeptFeedback ?? '') === '1'
-    );
+    return String(p?.showAddFeedback ?? '') === '1' || String(p?.showEditFeedback ?? '') === '1' || String(p?.showDeptFeedback ?? '') === '1';
   });
-  const showEditFeedback = computed(
-    () => String(props.formData?.extendUrlParams?.showEditFeedback ?? '') === '1'
-  );
-  const showDeptFeedback = computed(
-    () => String(props.formData?.extendUrlParams?.showDeptFeedback ?? '') === '1'
-  );
+  const showEditFeedback = computed(() => String(props.formData?.extendUrlParams?.showEditFeedback ?? '') === '1');
+  const showDeptFeedback = computed(() => String(props.formData?.extendUrlParams?.showDeptFeedback ?? '') === '1');
   const showJiJianFields = computed(() => String(props.formData?.extendUrlParams?.showJiJianFields ?? '') === '1');
   const jiJianFieldsReadonly = computed(() => String(props.formData?.extendUrlParams?.jiJianFieldsReadonly ?? '') === '1');
   const nonJiJianFieldsReadonly = computed(() => String(props.formData?.extendUrlParams?.nonJiJianFieldsReadonly ?? '') === '1');
   const showSelnextUser = computed(() => String(props.formData?.extendUrlParams?.showSelnextUser ?? '') === '1');
-  const showSubApproveUser = computed(
-    () => String(props.formData?.extendUrlParams?.showSubApproveUser ?? '') === '1'
-  );
+  const showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.showSubApproveUser ?? '') === '1');
   const showIsNeedLeaderApprove = computed(
     () => String(props.formData?.extendUrlParams?.showIsNeedLeaderApprove ?? '') === '1'
   );
@@ -407,6 +440,37 @@
     { immediate: true }
   );
 
+  async function fetchDefaultCcUsers() {
+    try {
+      const res = await defHttp.get({
+        url: '/sys/user/queryUserRoleComponentData',
+        params: {
+          departId: '2044677562460508161',
+          roleId: '2044676455280570370',
+          searchSecurityLevel: 5,
+          pageNo: 1,
+          pageSize: 999,
+        },
+      });
+      const records = res?.records || res?.result?.records || [];
+      defaultCcUsers.value = records;
+    } catch {
+      defaultCcUsers.value = [];
+    }
+  }
+
+  watch(
+    () => processInfo.value.taskDefKey,
+    (key) => {
+      if (key === 'Task_0ixi1rs') {
+        fetchDefaultCcUsers();
+      } else {
+        defaultCcUsers.value = [];
+      }
+    },
+    { immediate: true }
+  );
+
   async function loadProblemTree() {
     loadingProblemOptions.value = true;
     try {
@@ -462,7 +526,9 @@
       const deptId = getCurrentUserDeptId();
       if (deptId) {
         list = list.filter((item: any) => {
-          const deptIds = String(item.feedbackDeptId || '').split(',').map((s: string) => s.trim());
+          const deptIds = String(item.feedbackDeptId || '')
+            .split(',')
+            .map((s: string) => s.trim());
           return deptIds.includes(String(deptId));
         });
       }
diff --git a/src/views/super/bpm/process/components/bpmSelectUser/index.vue b/src/views/super/bpm/process/components/bpmSelectUser/index.vue
index ab4ca6f..e5c58c9 100644
--- a/src/views/super/bpm/process/components/bpmSelectUser/index.vue
+++ b/src/views/super/bpm/process/components/bpmSelectUser/index.vue
@@ -13,7 +13,7 @@
   /**
    * 流程审批中选择用户用 - 只管选择，不管回显
    */
-  import { ref, toRaw, computed } from 'vue';
+  import { ref, toRaw, computed, watch } from 'vue';
   import BpmSelectUserModal from './BpmSelectUserModal.vue';
   import { useModal } from '/@/components/Modal';
 
@@ -27,15 +27,32 @@
         type: String,
         default: '',
       },
+      value: {
+        type: Array,
+        default: () => [],
+      },
     },
     emits: ['change'],
-    setup(_p, { emit }) {
+    setup(props, { emit }) {
       let selectedUserList = [];
       const options = ref([]);
       const selectValue = ref([]);
       const [registerModal, { openModal }] = useModal();
       const lastSelectedRows = ref([]);
 
+      watch(
+        () => props.value,
+        (val) => {
+          const list = (Array.isArray(val) ? val : []).filter((u) => u?.username);
+          if (!list.length) return;
+          selectValue.value = list.map((u) => u.username);
+          options.value = list.map((u) => ({ value: u.username }));
+          selectedUserList = list;
+          lastSelectedRows.value = list;
+        },
+        { immediate: true }
+      );
+
       function openSelect() {
         let arr = getModalData();
         openModal(true, {
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
index 102dd8d..3280ca6 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
@@ -83,7 +83,7 @@
         <!-- 抄送 -->
         <a-list-item style="line-height: 32px" v-show="checkedCc">
           <span>抄送给：</span>
-          <bpm-select-user style="display: inline-block" placeholder="请选择抄送人" @change="handleSelectCcUser"></bpm-select-user>
+          <bpm-select-user style="display: inline-block" placeholder="请选择抄送人" :value="defaultCc" @change="handleSelectCcUser"></bpm-select-user>
         </a-list-item>
       </a-list>
 
@@ -187,7 +187,11 @@
       defaultReason: {
         type: String,
         default: '',
-      }
+      },
+      defaultCc: {
+        type: Array,
+        default: () => [],
+      },
     },
     emits: ['success'],
     setup(props, { emit }) {
@@ -288,6 +292,20 @@
         ccPersonList.value = [];
       }
 
+      watch(
+        () => props.defaultCc,
+        (val) => {
+          const list = (Array.isArray(val) ? val : []).filter((u) => u?.username);
+          if (!list.length) return;
+          checkedCc.value = true;
+          const usernames = list.map((u) => u.username);
+          const realnames = list.map((u) => u.realname);
+          model.ccUserIds = usernames.join(',');
+          model.ccUserRealNames = realnames.join(',');
+        },
+        { immediate: true }
+      );
+
       function changeReasonSelection(value) {
         model.reason = value;
       }
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue
index 607a36a..26dfd4c 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue
@@ -21,6 +21,7 @@
       :allowReject="allowReject"
       :beforeHandle="beforeHandle"
       :defaultReason="defaultReason"
+      :defaultCc="defaultCc"
       :currentTaskName="currentNode.taskName">
     </my-handle-content>
 
@@ -66,6 +67,10 @@
         type: String,
         default: '',
       },
+      defaultCc: {
+        type: Array,
+        default: () => [],
+      },
       showSelnextUser: {
         type: Boolean,
         default: true,

From b5d4b09fdea8d0a1b05dfa68065b87e04ac64cb7 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Fri, 12 Jun 2026 16:50:31 +0800
Subject: [PATCH 08/10] =?UTF-8?q?feat(xispeak):=20=E6=96=B0=E5=A2=9EBPM?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=BB=98=E8=AE=A4=E5=AE=A1=E6=89=B9=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 handleReasonTemplateMap 按任务节点映射审批意见生成函数
- 包含审批/反馈/分配/核查/监察等常用节点模板
- 各节点 taskDefKey 待后续填写

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

diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index e23e455..c7ce7f1 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -262,6 +262,7 @@
           :claim="claim"
           :showSelnextUser="showSelnextUser"
           :beforeHandle="saveMainFormBeforeProcessHandle"
+          :defaultReason="defaultHandleReason"
           @success="handleProcessSuccess"
           @claimSuccess="handleClaimSuccess"
         />
@@ -441,6 +442,59 @@
     processTableName: props.formData?.processTableName,
   }));
 
+  // ==================== 默认审批意见 ====================
+  const handleReasonTemplateMap: Record<string, () => string> = {
+    // TODO: 填写各节点的 taskDefKey
+    // 部门负责人审批 / 所党委审批 / 督办部门负责人审批 / 纪检负责人审批
+    // 'Task_': buildApproveReason,
+    // 部门经办人反馈完成情况 / 收集流程部门经办人填写 / 反馈流程部门经办人填写反馈
+    // 'Task_': buildDeptHandlerFeedbackReason,
+    // 部门负责人接受任务并分配
+    // 'Task_': buildDeptLeaderAssignReason,
+    // 部门负责人直接反馈
+    // 'Task_': buildDeptLeaderDirectFeedbackReason,
+    // 督办部门经办人确认全部反馈事项
+    // 'Task_': buildSuperviseConfirmAllReason,
+    // 督办经办人核查 / 反馈流程督办经办人核查
+    // 'Task_': buildSuperviseCheckReason,
+    // 纪检经办人监察
+    // 'Task_': buildJiJianCheckReason,
+  };
+
+  const defaultHandleReason = computed(() => {
+    const builder = handleReasonTemplateMap[String(processInfo.value.taskDefKey || '')];
+    return builder ? builder() : '';
+  });
+
+  function buildApproveReason() {
+    return '同意。';
+  }
+
+  function buildDeptHandlerFeedbackReason() {
+    return '已完成反馈，请领导审批。';
+  }
+
+  function buildDeptLeaderAssignReason() {
+    const userNameText = subApproveUser.value || '';
+    return userNameText ? `请${userNameText}办理。` : '';
+  }
+
+  function buildDeptLeaderDirectFeedbackReason() {
+    return '已完成反馈。';
+  }
+
+  function buildSuperviseConfirmAllReason() {
+    return '已确认全部反馈事项。';
+  }
+
+  function buildSuperviseCheckReason() {
+    return '已核查。';
+  }
+
+  function buildJiJianCheckReason() {
+    return '已监察。';
+  }
+
   onMounted(() => {
     initFormData();
   });

From bf5608a7a35b0e1381e5633bd63182714310fa21 Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Fri, 12 Jun 2026 17:10:15 +0800
Subject: [PATCH 09/10] =?UTF-8?q?czh-20260612-=E4=BC=98=E5=8C=96=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=E7=9A=84url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/pageEnum.ts      | 2 +-
 src/router/routes/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index ba3cf52..d7719d9 100644
--- a/src/enums/pageEnum.ts
+++ b/src/enums/pageEnum.ts
@@ -16,5 +16,5 @@ export enum PageEnum {
   // 自动登录路径
   AUTOLOGIN_PATH = '/user/autoLogin',
   // 登出结果页路径
-  LOGOUT_RESULT_PATH = '/logoutResult',
+  LOGOUT_RESULT_PATH = '/user/logoutResult',
 }
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index ea1b22f..90df33a 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -76,7 +76,7 @@ export const AutoLoginRoute: AppRouteRecordRaw = {
 };
 
 export const LogoutResultRoute: AppRouteRecordRaw = {
-  path: '/logoutResult',
+  path: '/user/logoutResult',
   name: 'LogoutResult',
   component: () => import('/@/views/sys/login/LogoutResult.vue'),
   meta: {

From 09eb9d66646acaa1ab135d40633d8b9cb178007f Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Fri, 12 Jun 2026 17:17:27 +0800
Subject: [PATCH 10/10] =?UTF-8?q?czh-20260612-=E4=BF=AE=E6=94=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/pageEnum.ts      | 2 +-
 src/router/routes/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index d7719d9..4443abc 100644
--- a/src/enums/pageEnum.ts
+++ b/src/enums/pageEnum.ts
@@ -1,6 +1,6 @@
 export enum PageEnum {
   // basic login path
-  BASE_LOGIN = '/login',
+  BASE_LOGIN = '/user/login',
   // basic home path
   BASE_HOME = '/dashboard/analysis',
   // error page path
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 90df33a..152c18c 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -29,7 +29,7 @@ export const RootRoute: AppRouteRecordRaw = {
 };
 
 export const LoginRoute: AppRouteRecordRaw = {
-  path: '/login',
+  path: '/user/login',
   name: 'Login',
   //新版后台登录，如果想要使用旧版登录放开即可
   // component: () => import('/@/views/sys/login/Login.vue'),