Merge remote-tracking branch 'origin/master'

2026-06-12 18:15:30 +08:00
parent 4e5a6102f2 09eb9d6664
commit 80e90a6164
19 changed files with 1467 additions and 41 deletions
@@ -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({