Merge branch 'master' into feature/20260622

src/components/semri/process/FlowScheduleStartModal.vue

@@ -99,6 +99,7 @@
   import JModal from '/src/components/Modal/src/JModal/JModal.vue';
   import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
+import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision';
   import SzUserSelectByDeptRoleSecurityModal from '/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue';
   import { SearchOutlined } from '@ant-design/icons-vue';
   import { getUserList } from '/src/api/common/api';
@@ -134,8 +135,8 @@
   // 所党委领导选人弹窗
   const sdwLeaderModalOpen = ref(false);
   const supDeptleaderName = ref('');
-  const sdwLeaderDeptId = ref('2044677562460508161');
-  const sdwLeaderRoleId = ref('2044676455280570370');
+  const sdwLeaderDeptId = ref(PARTY_COMMITTEE_DEPT_ID);
+  const sdwLeaderRoleId = ref(SDW_LEADER_ROLE_ID);
   const sdwLeaderSecurityValue = ref(5);
 
   function openSdwLeaderModal() {

src/components/semri/process/FlowScheduleStartModalForBG.vue

@@ -52,8 +52,8 @@
         <a-form-item label="所办领导">
           <DeptRoleUserSelectRadioGroup
             v-model:value="formData.supDeptleaderid"
-            deptId="2044677604785229826"
-            roleId="2044680793306591234"
+            :deptId="SUOBAN_DEPT_ID"
+            :roleId="MEASURE_RES_LEADER_ROLE_ID"
             :disabled="String(formData.isNeedAppro) !== '1'"
           />
         </a-form-item>
@@ -99,6 +99,7 @@
   import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
   import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
+import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervision';
   import { useMessage } from '/src/hooks/web/useMessage';
 
   interface ModalPayload {