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] =?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,
+      });
     });
   }