Merge branch 'all-v4-qindao' into 'all-v4'

feat: 用户管理添加批量导入接口，修改页码

See merge request skyeye/skyeye_frontend/skyeye-admin!215

src/views/system/user/CreateAdminDrawer.vue

@@ -104,7 +104,8 @@
     isDisabled: true,
     realname: '',
     roleIdList: [],
-    password: ''
+    password: '',
+    passwordRe: ''
   });
 
   const message = ElMessage;
@@ -143,7 +144,7 @@
         return message.error('两次密码不一致');
       }
       if (isAddUser.value) {
-        formParams.value.isDisabled ? params.isDisabled = DisabledEnum.ENABLE : params.isDisabled = DisabledEnum.DISABLED;
+        formParams.value.isDisabled ? params.isDisabled = DisabledEnum.NO : params.isDisabled = DisabledEnum.YES;
         addTenantAdmin(params).then((res) => {
           
           message.success('添加管理员账户成功');
@@ -152,7 +153,7 @@
           closeDrawer();
         });
       } else {
-         formParams.value.isDisabled ? params.isDisabled = DisabledEnum.ENABLE : params.isDisabled = DisabledEnum.DISABLED;
+         formParams.value.isDisabled ? params.isDisabled = DisabledEnum.NO : params.isDisabled = DisabledEnum.YES;
         updateUser(params)
         .then((res) => {
           if (res.code !== ResultEnum.SUCCESS) {
@@ -182,7 +183,7 @@
       })
       formParams.value.roleIdList = res.roleIds;
       formParams.value.passwordRe = res.password;
-      formParams.value.isDisabled = res.isDisabled === DisabledEnum.ENABLE ? true : false;
+      formParams.value.isDisabled = res.isDisabled === DisabledEnum.NO ? true : false;
       isDrawer.value = true;
     });
   }

src/views/system/user/CreateDrawer.vue

@@ -17,7 +17,7 @@
       <el-form-item label="所属部门" prop="deptId">
         <el-tree-select
           v-model="formParams.deptId"
-          :data="props.departmentList"
+          :data="departmentList"
           :render-after-expand="false"
           :default-expand-all="true"
           check-strictly
@@ -151,7 +151,7 @@
       realname: '',
       roleIdList: [],
     });
-
+console.log(props.departmentList,'<<<<departmentList');
     const message = ElMessage;
     const formRef: any = ref(null);
     const isDrawer = ref(false);
@@ -188,7 +188,7 @@
         if (params.password != params.passwordRe) {
           return message.error('两次密码不一致');
         }
-        formParams.value.isDisabled ? params.isDisabled = DisabledEnum.ENABLE : params.isDisabled = DisabledEnum.DISABLED;
+        formParams.value.isDisabled ? params.isDisabled = DisabledEnum.NO : params.isDisabled = DisabledEnum.YES;
         if (isAddUser.value) {
           addSingleUser(params)
             .then((res) => {
@@ -204,7 +204,7 @@
               ElMessage.error(error);
             });
         } else {
-         formParams.value.isDisabled ? params.isDisabled = DisabledEnum.ENABLE : params.isDisabled = DisabledEnum.DISABLED;
+         formParams.value.isDisabled ? params.isDisabled = DisabledEnum.NO : params.isDisabled = DisabledEnum.YES;
           updateUser(params)
             .then((res) => {
               if (res.code !== ResultEnum.SUCCESS) {
@@ -234,7 +234,7 @@
         })
         formParams.value.roleIdList = res.roleIds;
         formParams.value.passwordRe = res.password;
-        formParams.value.isDisabled = res.isDisabled === DisabledEnum.ENABLE ? true : false;
+        formParams.value.isDisabled = res.isDisabled === DisabledEnum.NO ? true : false;
         isDrawer.value = true;
       });
     }

src/views/system/user/component/AddUser.vue

@@ -210,7 +210,7 @@
   const { urlPrefix } = useGlobSetting();
 
   const importUrl = computed(() => {
-    return urlJoin(urlPrefix, `/user/import`);
+    return urlJoin(urlPrefix, `/admin/user/importUser`);
   });
 
   const handleDownload = async () => {

src/views/system/user/types/index.ts

@@ -39,6 +39,6 @@ export type SearchParamsProps = PaginationRequest & {queryParam: QueryParamas}
 
 /* 状态: 0-启用, 1-禁用 */
 export enum DisabledEnum {
-  ENABLE = 0,
-  DISABLED = 1
+  NO = 0,
+  YES = 1
 }

src/views/system/user/user.vue

@@ -5,7 +5,7 @@
       :roleData="roleData" 
       @get-table-data="onSearchCommit" 
       @reset-form="onResetForm"/>
-    <div class="user-list">
+    <div class="user-list" >
       <BasicTable
         :columns="columns"
         :data-source="userList"
@@ -185,6 +185,7 @@
   const openAddSingleDrawer = () => {
     drawerTitle.value = '添加用户';
     if (!isSysTenant.value) {
+      createAdminType.value = EditType.create;
       createAdminDrawerRef.value?.openDrawer();
     } else {
       createDrawerRef.value?.openDrawer();
@@ -252,7 +253,7 @@
     getAllDepartments().then((res) => {
       departmentList.value = calculateTreeData(
         res,
-        { level: 3, valueKey: 'deptId', labelKey: 'deptName' },
+        { level: 3, valueKey: 'id', labelKey: 'deptName' },
         1,
       );
     });
@@ -291,7 +292,7 @@
       getUserList(params).then(res => {
         userList.value = res.records;
         userList.value.forEach(item =>{item.certify = "本地认证";})
-        total.value = res.totalPage;
+        total.value = res.totalRow;
       })
     }
   }