fix: 租户管理人员添加人力资源接口

src/api/system/user-operate.ts

@@ -237,8 +237,6 @@ export interface AddTenantAdminProps {
   password: string;
   userId?: number;
   passwordRe?: string;
-  deptId?: number | null;
-  staffNo: string;
 }
 
 // V4: 添加租户管理员

src/utils/findUserByWorkNo.ts

@@ -64,8 +64,8 @@ export function findOrgCodeByWorkNo(nodes: TreeNode[], workNo: string): string |
 
 interface TreeNode {
   children?: TreeNode[];
-  idtOrgId?: string;
-  idtOrgName?: string;
+  deptName?: string;
+  deptId?: string;
   users?: {
     appAccountAccountName: string;
     idtUserWorkNo: string;
@@ -85,10 +85,10 @@ export interface TransformedTreeNode {
  */
 export const transformTreeData = (nodes: TreeNode[], isNeedUser = false): TransformedTreeNode[] => {
   return nodes.map((node) => {
-    const { children, idtOrgId, idtOrgName, users } = node;
+    const { children, deptId, deptName, users } = node;
     const result: TransformedTreeNode = {
-      label: idtOrgName || '',
-      value: idtOrgId || '',
+      label: deptName || '',
+      value: deptId || '',
     };
 
     if (children && children.length > 0) {

src/views/system/user/CreateAdminDrawer.vue

@@ -1,54 +1,19 @@
 <template>
   <el-drawer v-model="isDrawer" :size="width" :title="props.title" @close="handleReset">
     <el-form :model="formParams" :rules="rules" ref="formRef" label-placement="left" :label-width="80">
-      <el-form-item label="工号" prop="staffNo">
-        <el-input placeholder="请输入工号" v-model="formParams.staffNo" v-if="staffNoHtmlType === 'INPUT'" />
-        <el-tree-select
-          v-model="formParams.staffNo"
-          check-strictly
-          placeholder="请选择工号"
-          class="protocal-select"
-          filterable
-          remote
-          reserve-keyword
-          clearable
-          :loading="loading"
-          :data="staffNoOptions"
-          :render-after-expand="false"
-          :default-expand-all="true"
-          :remote-method="debouncedRemoteMethod"
-          @clear="handleClear"
-          @change="handleChange"
-          v-else
-        />
-
-        <el-text class="mx-1 text-mode" type="primary" @click="handleChangeStaff">{{
-          `工号${staffNoHtmlType === 'INPUT' ? '选择' : '输入'}方式`
-        }}</el-text>
+      <el-form-item label="登录账号" prop="username">
+        <el-input placeholder="请输入登录账号" v-model="formParams.username" :disabled="!isAddUser" />
       </el-form-item>
       <el-form-item label="姓名" prop="realname">
         <el-input placeholder="请输入姓名" v-model="formParams.realname" />
       </el-form-item>
-      <el-form-item label="所属部门" prop="deptId">
-        <el-tree-select
-          v-model="formParams.deptId"
-          :data="departmentArr"
-          :render-after-expand="false"
-          :default-expand-all="true"
-          check-strictly
-          placeholder="请选择所属组织"
-          class="protocal-select"
-        />
-      </el-form-item>
       <el-form-item label="角色" prop="roleIdList">
         <el-select clearable v-model="formParams.roleIdList" multiple v-if="isCanAddTenant && isSysTenant">
           <el-option v-for="item in roleData" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <el-input v-else placeholder="租户管理员默认拥有全部角色权限" disabled />
       </el-form-item>
-      <el-form-item label="登录账号" prop="username">
-        <el-input placeholder="请输入登录账号" v-model="formParams.username" :disabled="!isAddUser" />
-      </el-form-item>
+    
       <el-form-item v-if="isAddUser" label="密码" prop="password">
         <el-input type="password" show-password-on="mousedown" placeholder="请输入密码" v-model="formParams.password" />
       </el-form-item>
@@ -76,29 +41,15 @@
 <script lang="ts" setup>
   import { ref, computed, watch } from 'vue';
   import { FormRules, ElMessage } from 'element-plus';
-  import { userInfo, queryOrganizationUserTree } from '@/api/system/user';
+  import { userInfo } from '@/api/system/user';
   import { cloneDeep } from 'lodash-es';
   import { addTenantAdmin, AddTenantAdminProps, updateUser, addSingleUser } from '@/api/system/user-operate';
-  import { EditType, OptionsProps, DisabledEnum, OrganizationUserTree } from './types';
+  import { EditType, OptionsProps, DisabledEnum } from './types';
   import { useTargetTenantIdSetting } from '@/utils/useTargetTenantIdSetting';
   import { ResultEnum } from '@/enums/httpEnum';
-  import { debounce } from 'lodash-es';
-
-  import {
-    findUserByWorkNo,
-    findOrgCodeByWorkNo,
-    transformTreeData,
-    TransformedTreeNode,
-    removeParentheses,
-  } from '@/utils/findUserByWorkNo';
 
   const { isSysTenant } = useTargetTenantIdSetting();
   let rules: FormRules = {
-    staffNo: {
-      required: true,
-      message: '工号不能为空',
-      trigger: 'blur',
-    },
     username: {
       required: true,
       message: '登录账号不能为空',
@@ -109,12 +60,6 @@
       message: '姓名不能为空',
       trigger: 'blur',
     },
-    deptId: {
-      required: true,
-      message: '部门不能为空',
-      trigger: 'blur',
-    },
-
     roleIdList: {
       required: true,
       message: '请选择角色',
@@ -156,65 +101,12 @@
     roleIdList: [],
     password: '',
     passwordRe: '',
-    deptId: null,
-    staffNo: '',
   });
   const message = ElMessage;
   const formRef: any = ref(null);
   const isDrawer = ref(false);
   const subLoading = ref(false);
   const formParams = ref<AddTenantAdminProps>(defaultValueRef());
-  const loading = ref(false);
-  const staffNoOptions = ref<TransformedTreeNode[]>([]);
-  const OrganizationSourceData = ref<OrganizationUserTree[]>([]);
-  const departmentArr = ref<OptionsProps[]>([]);
-
-  const remoteMethod = (query: string) => {
-    if (query) {
-      loading.value = true;
-      queryOrganizationUserTree(Number(query)).then((res) => {
-        if (res) {
-          loading.value = false;
-          staffNoOptions.value = transformTreeData(res, true);
-        }
-        /* 保存原始数据，用于选中后将数据返显到表单 */
-        OrganizationSourceData.value = res;
-        /* 选中数据后将部门设置为当前数据的部门 */
-        departmentArr.value = transformTreeData(OrganizationSourceData.value, false);
-        console.log('departmentArr.value:', departmentArr.value);
-      });
-    } else {
-      staffNoOptions.value = [];
-    }
-  };
-  /* 防抖 */
-  const debouncedRemoteMethod = debounce(remoteMethod, 500);
-
-  type STAFFNO_HTML_TYPE = 'INPUT' | 'SELECT';
-  const staffNoHtmlType = ref<STAFFNO_HTML_TYPE>('SELECT');
-  const handleChangeStaff = () => {
-    staffNoHtmlType.value = staffNoHtmlType.value === 'INPUT' ? 'SELECT' : 'INPUT';
-  };
-
-  const handleClear = () => {
-    formRef.value.resetFields();
-    formParams.value = Object.assign(formParams.value, defaultValueRef());
-  };
-
-  const handleChange = (value) => {
-    /* 将选中的数据返显到表单 */
-    const findUser = findUserByWorkNo(OrganizationSourceData.value, value);
-    if (findUser) {
-      formParams.value.realname = findUser.appAccountAccountName;
-      formParams.value.staffNo = findUser.idtUserWorkNo;
-      formParams.value.username = findUser.idtUserWorkNo;
-      formParams.value.roleIdList = JSON.parse(findUser.useTypes);
-
-      // /* 选中数据后将部门设置为当前数据的部门 */
-      // departmentArr.value = transformTreeData(OrganizationSourceData.value, false);
-      formParams.value.deptId = findOrgCodeByWorkNo(OrganizationSourceData.value, value);
-    }
-  };
 
   async function openDrawer(userId?) {
     if (userId) {
@@ -245,7 +137,6 @@
       if (params.password != params.passwordRe) {
         return message.error('两次密码不一致');
       }
-      params.staffNo = removeParentheses(params.staffNo);
       if (isAddUser.value) {
         formParams.value.isDisabled ? (params.isDisabled = DisabledEnum.NO) : (params.isDisabled = DisabledEnum.YES);
         if (!isSysTenant) {
@@ -304,8 +195,6 @@
       formParams.value.passwordRe = res.password;
       formParams.value.isDisabled = res.isDisabled === DisabledEnum.NO ? true : false;
       isDrawer.value = true;
-      /* 确保编辑时，有请求远程的下拉数据 */
-      remoteMethod(res.staffNo);
     });
   }
 
@@ -315,21 +204,9 @@
       if (props.isCanAddTenant && !props.isSysTenant) {
         rules!.roleIdList!.required = false;
       }
-      departmentArr.value = props.departmentList;
-    },
-    {
-      immediate: true,
-    },
-  );
-
-  watch(
-    () => props.departmentList,
-    (newVal) => {
-      departmentArr.value = newVal;
     },
     {
       immediate: true,
-      deep: true,
     },
   );
 

src/views/system/user/CreateDrawer.vue

@@ -1,70 +1,68 @@
 <template>
   <el-drawer v-model="isDrawer" :size="width" :title="props.title" @close="handleReset">
-    <el-form
-      :model="formParams"
-      :rules="rules"
-      ref="formRef"
-      label-placement="left"
-      :label-width="80"
-    >
-      <el-form-item label="登录账号" prop="username">
-        <el-input
-          placeholder="请输入登录账号"
-          v-model="formParams.username"
-          :disabled="!isAddUser"
+    <el-form :model="formParams" :rules="rules" ref="formRef" label-placement="left" :label-width="80">
+      <el-form-item label="工号" prop="staffNo">
+        <el-input placeholder="请输入工号" v-model="formParams.staffNo" v-if="staffNoHtmlType === 'INPUT'" />
+        <el-tree-select
+          v-model="formParams.staffNo"
+          check-strictly
+          placeholder="请选择工号"
+          class="protocal-select"
+          filterable
+          remote
+          reserve-keyword
+          clearable
+          :loading="loading"
+          :data="staffNoOptions"
+          :render-after-expand="false"
+          :default-expand-all="true"
+          :remote-method="debouncedRemoteMethod"
+          @clear="handleClear"
+          @change="handleChange"
+          v-else
         />
+        <el-text class="mx-1 text-mode" type="primary" @click="handleChangeStaff">{{
+          `工号${staffNoHtmlType === 'INPUT' ? '选择' : '输入'}方式`
+        }}</el-text>
       </el-form-item>
-      <el-form-item label="所属组织" prop="deptId">
+      <el-form-item label="所属部门" prop="deptId">
         <el-tree-select
           v-model="formParams.deptId"
-          :data="departmentList"
+          :data="departmentArr"
           :render-after-expand="false"
           :default-expand-all="true"
           check-strictly
-          placeholder="请选择所属组织"
+          placeholder="请选择所属部门"
           class="protocal-select"
         />
       </el-form-item>
-      <el-form-item v-if="isAddUser" label="密码" prop="password">
-        <el-input
-          type="password"
-          show-password-on="mousedown"
-          placeholder="请输入密码"
-          v-model="formParams.password"
-        />
-      </el-form-item>
-      <el-form-item
-        v-if="isAddUser"
-        label="确认密码"
-        :prop="!formParams.username ? 'passwordRe' : ''"
-      >
-        <el-input
-          type="password"
-          show-password-on="mousedown"
-          placeholder="请输入密码"
-          v-model="formParams.passwordRe"
-        />
-      </el-form-item>
-
       <el-form-item label="角色" prop="roleIdList">
         <el-select clearable v-model="formParams.roleIdList" multiple>
-          <el-option
-            v-for="item in roleData"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in roleData" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="登录账号" prop="username">
+        <el-input placeholder="请输入登录账号" v-model="formParams.username" :disabled="!isAddUser" />
+      </el-form-item>
       <el-form-item label="姓名" prop="realname">
         <el-input placeholder="请输入姓名" v-model="formParams.realname" />
       </el-form-item>
       <el-form-item label="手机" prop="mobile">
         <el-input placeholder="请输入手机" v-model="formParams.mobile" />
       </el-form-item>
-      <el-form-item label="工号" prop="staffNo">
-        <el-input placeholder="请输入工号" v-model="formParams.staffNo" />
+
+      <el-form-item v-if="isAddUser" label="密码" prop="password">
+        <el-input type="password" show-password-on="mousedown" placeholder="请输入密码" v-model="formParams.password" />
       </el-form-item>
+      <el-form-item v-if="isAddUser" label="确认密码" :prop="!formParams.username ? 'passwordRe' : ''">
+        <el-input
+          type="password"
+          show-password-on="mousedown"
+          placeholder="请输入密码"
+          v-model="formParams.passwordRe"
+        />
+      </el-form-item>
+
       <el-form-item label="是否启用" prop="isDisabled">
         <el-switch v-model="formParams.isDisabled" />
       </el-form-item>
@@ -80,13 +78,21 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, computed } from 'vue';
+  import { ref, computed, watch } from 'vue';
   import { FormRules, ElMessage } from 'element-plus';
-  import { userInfo } from '@/api/system/user';
+  import { userInfo, queryOrganizationUserTree } from '@/api/system/user';
   import { cloneDeep } from 'lodash-es';
   import { UserType, addSingleUser, updateUser } from '@/api/system/user-operate';
-  import { OptionsProps, DisabledEnum } from './types';
+  import { OptionsProps, DisabledEnum, OrganizationUserTree } from './types';
   import { ResultEnum } from '@/enums/httpEnum';
+  import { debounce } from 'lodash-es';
+  import {
+    findUserByWorkNo,
+    findOrgCodeByWorkNo,
+    transformTreeData,
+    TransformedTreeNode,
+    removeParentheses,
+  } from '@/utils/findUserByWorkNo';
 
   const rules: FormRules = {
     username: {
@@ -134,112 +140,174 @@
   };
   const emit = defineEmits(['change']);
 
-  const props = withDefaults(defineProps
-  <{ title: string; width: number; departmentList: OptionsProps[], roleData: OptionsProps[] }>(),
-      {
-        title: '添加用户',
-        width: 450,
-      });
-    const defaultValueRef = () => ({
-      password: '',
-      passwordRe: '',
-      deptId: null,
-      username: '',
-      staffNo: '',
-      mobile: '',
-      isDisabled: true,
-      realname: '',
-      roleIdList: [],
-    });
-    const message = ElMessage;
-    const formRef: any = ref(null);
-    const isDrawer = ref(false);
-    const subLoading = ref(false);
-    const formParams = ref<UserType>(defaultValueRef());
-    const isAddUser = computed(() => {
-      return props.title === '添加用户';
-    });
+  const props = withDefaults(
+    defineProps<{ title: string; width: number; departmentList: OptionsProps[]; roleData: OptionsProps[] }>(),
+    {
+      title: '添加用户',
+      width: 450,
+    },
+  );
+  const defaultValueRef = () => ({
+    password: '',
+    passwordRe: '',
+    deptId: null,
+    username: '',
+    staffNo: '',
+    mobile: '',
+    isDisabled: true,
+    realname: '',
+    roleIdList: [],
+  });
+  const message = ElMessage;
+  const formRef: any = ref(null);
+  const isDrawer = ref(false);
+  const subLoading = ref(false);
+  const formParams = ref<UserType>(defaultValueRef());
+  const isAddUser = computed(() => {
+    return props.title === '添加用户';
+  });
 
-    async function openDrawer(userId?) {
-      if (userId) {
-        formParams.value.userId = userId;
-        getInfo();
-        return;
-      }
-      isDrawer.value = true;
-    }
+  const loading = ref(false);
+  const staffNoOptions = ref<TransformedTreeNode[]>([]);
+  const OrganizationSourceData = ref<OrganizationUserTree[]>([]);
+  const departmentArr = ref<OptionsProps[]>([]);
 
-    function closeDrawer() {
-      isDrawer.value = false;
+  const remoteMethod = (query: string) => {
+    if (query) {
+      loading.value = true;
+      queryOrganizationUserTree(Number(query)).then((res) => {
+        if (res) {
+          loading.value = false;
+          staffNoOptions.value = transformTreeData(res, true);
+        }
+        /* 保存原始数据，用于选中后将数据返显到表单 */
+        OrganizationSourceData.value = res;
+        /* 选中数据后将部门设置为当前数据的部门 */
+        departmentArr.value = transformTreeData(OrganizationSourceData.value, false);
+        
+      });
+    } else {
+      staffNoOptions.value = [];
     }
+  };
+  /* 防抖 */
+  const debouncedRemoteMethod = debounce(remoteMethod, 500);
 
-    function formSubmit() {
-      formRef.value.validate((valid) => {
-        if (!valid) {
-          return message.error('请填写完整信息');
-        }
-        // 克隆
-        const params = cloneDeep(formParams.value);
+  type STAFFNO_HTML_TYPE = 'INPUT' | 'SELECT';
+  const staffNoHtmlType = ref<STAFFNO_HTML_TYPE>('SELECT');
+  const handleChangeStaff = () => {
+    staffNoHtmlType.value = staffNoHtmlType.value === 'INPUT' ? 'SELECT' : 'INPUT';
+  };
 
-        if (params.deptId) {
-          params.deptId = params.deptId;
-        }
-        if (params.password != params.passwordRe) {
-          return message.error('两次密码不一致');
-        }
-        formParams.value.isDisabled ? params.isDisabled = DisabledEnum.NO : params.isDisabled = DisabledEnum.YES;
-        if (isAddUser.value) {
-          addSingleUser(params)
-            .then((res) => {
-              if (res.code !== ResultEnum.SUCCESS) {
-                return Promise.reject(res.msg);
-              }
-              emit('change');
-              handleReset();
-              closeDrawer();
-              ElMessage.success('添加成功');
-            })
-            .catch((error) => {
-              ElMessage.error(error);
-            });
-        } else {
-         formParams.value.isDisabled ? params.isDisabled = DisabledEnum.NO : params.isDisabled = DisabledEnum.YES;
-          updateUser(params)
-            .then((res) => {
-              if (res.code !== ResultEnum.SUCCESS) {
-                return Promise.reject(res.msg);
-              }
-              emit('change');
-              handleReset();
-              closeDrawer();
-              ElMessage.success('修改成功');
-            })
-            .catch((error) => {
-              ElMessage.error(error);
-            });
-        }
-      });
+  const handleClear = () => {
+    formRef.value.resetFields();
+    formParams.value = Object.assign(formParams.value, defaultValueRef());
+  };
+
+  const handleChange = (value) => {
+    /* 将选中的数据返显到表单 */
+    const findUser = findUserByWorkNo(OrganizationSourceData.value, value);
+    if (findUser) {
+      formParams.value.realname = findUser.appAccountAccountName;
+      formParams.value.staffNo = findUser.idtUserWorkNo;
+      formParams.value.username = findUser.idtUserWorkNo;
+      formParams.value.roleIdList = JSON.parse(findUser.useTypes);
+      formParams.value.deptId = findOrgCodeByWorkNo(OrganizationSourceData.value, value);
     }
+  };
 
-    function handleReset() {
-      formRef.value.resetFields();
-      formParams.value = Object.assign(formParams.value, defaultValueRef());
+  async function openDrawer(userId?) {
+    if (userId) {
+      formParams.value.userId = userId;
+      getInfo();
+      return;
     }
+    isDrawer.value = true;
+  }
+
+  function closeDrawer() {
+    isDrawer.value = false;
+  }
+
+  function formSubmit() {
+    formRef.value.validate((valid) => {
+      if (!valid) {
+        return message.error('请填写完整信息');
+      }
+      // 克隆
+      const params = cloneDeep(formParams.value);
+
+      if (params.deptId) {
+        params.deptId = params.deptId;
+      }
+      if (params.password != params.passwordRe) {
+        return message.error('两次密码不一致');
+      }
+      params.staffNo = removeParentheses(params.staffNo);
+      formParams.value.isDisabled ? (params.isDisabled = DisabledEnum.NO) : (params.isDisabled = DisabledEnum.YES);
+      if (isAddUser.value) {
+        addSingleUser(params)
+          .then((res) => {
+            if (res.code !== ResultEnum.SUCCESS) {
+              return Promise.reject(res.msg);
+            }
+            emit('change');
+            handleReset();
+            closeDrawer();
+            ElMessage.success('添加成功');
+          })
+          .catch((error) => {
+            ElMessage.error(error);
+          });
+      } else {
+        formParams.value.isDisabled ? (params.isDisabled = DisabledEnum.NO) : (params.isDisabled = DisabledEnum.YES);
+        updateUser(params)
+          .then((res) => {
+            if (res.code !== ResultEnum.SUCCESS) {
+              return Promise.reject(res.msg);
+            }
+            emit('change');
+            handleReset();
+            closeDrawer();
+            ElMessage.success('修改成功');
+          })
+          .catch((error) => {
+            ElMessage.error(error);
+          });
+      }
+    });
+  }
 
-    function getInfo() {
-      userInfo({ userId: Number(formParams.value.userId)}).then((res) => {
-        Object.entries(res).forEach(([key, value]) => {
-          formParams.value[key] = value
-        })
-        formParams.value.roleIdList = res.roleIds;
-        formParams.value.passwordRe = res.password;
-        formParams.value.isDisabled = res.isDisabled === DisabledEnum.NO ? true : false;
-        isDrawer.value = true;
+  function handleReset() {
+    formRef.value.resetFields();
+    formParams.value = Object.assign(formParams.value, defaultValueRef());
+  }
+
+  function getInfo() {
+    userInfo({ userId: Number(formParams.value.userId) }).then((res) => {
+      Object.entries(res).forEach(([key, value]) => {
+        formParams.value[key] = value;
       });
-    }
-   
-    defineExpose({
-      openDrawer,
-      closeDrawer,
+      formParams.value.roleIdList = res.roleIds;
+      formParams.value.passwordRe = res.password;
+      formParams.value.isDisabled = res.isDisabled === DisabledEnum.NO ? true : false;
+      isDrawer.value = true;
     });
+  }
+
+   watch(
+    () => props.departmentList,
+    (newVal) => {
+      departmentArr.value = newVal;
+    },
+    {
+      immediate: true,
+    },
+  );
+
+
+  defineExpose({
+    openDrawer,
+    closeDrawer,
+  });
 </script>