!83 fix(xispeak): 修复发起落实措施收集流程第二个弹窗样式错乱

Merge pull request !83 from wsm/fix/flow_start_modal

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>

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({
+    nextTick(() => {
-      title: '发起落实措施收集流程',
+      flowScheduleModalRef.value?.open({
-      payload: { record },
+        title: '发起落实措施收集流程',
-      deptOptions: getLeadDeptOptions(record),
+        payload: { record },
-      showSuoleaderFields: true,
+        deptOptions: getLeadDeptOptions(record),
-      isNeedAppro: record?.needSdwApproval,
+        showSuoleaderFields: true,
-      supDeptleaderid: record?.sdwLeaderList,
+        isNeedAppro: record?.needSdwApproval,
-      supDeptleaderName: record?.sdwLeaderList_dictText,
+        supDeptleaderid: record?.sdwLeaderList,
+        supDeptleaderName: record?.sdwLeaderList_dictText,
+      });
     });
   }