Merge branch 'system-assemble' into page-config

src/views/system/role/columns.ts

@@ -1,3 +1,4 @@
+import { h } from 'vue';
 import { BasicColumn } from '@/components/Table';
 
 export const columns: BasicColumn[] = [
@@ -5,6 +6,25 @@ export const columns: BasicColumn[] = [
     label: '角色id',
     prop: 'roleId',
   },
+  {
+    label: '角色类型',
+    prop: 'role_type',
+    render(record) {
+      let type = '管理员';
+      if (record.row.role_type === 1) {
+        type = '超级管理员';
+      } else if (record.row.role_type === 3) {
+        type = '用户';
+      }
+      return h(
+        'span',
+        {},
+        {
+          default: () => type,
+        },
+      );
+    },
+  },
   {
     label: '角色编码',
     prop: 'roleCode',

src/views/system/role/role.vue

@@ -154,8 +154,13 @@
     console.log('点击了编辑', record);
     console.log('record.roleType', record.role_type);
     drawerTitle.value = '编辑角色';
-    const { openDrawer } = createUserDrawerRef.value;
-    openDrawer(record.roleId, record.role_type);
+    if (record.role_type === 3) {
+      const { openDrawer } = createUserDrawerRef.value;
+      openDrawer(record.roleId, record.role_type);
+    } else {
+      const { openDrawer } = createDrawerRef.value;
+      openDrawer(record.roleId);
+    }
   }
 
   function handleDelete(record: Recordable) {

src/views/system/user/CreateDrawer.vue

@@ -20,7 +20,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="密码" prop="password">
+      <el-form-item v-if="props.title === '添加用户'" label="密码" prop="password">
         <el-input
           type="password"
           show-password-on="mousedown"
@@ -28,7 +28,11 @@
           v-model="formParams.password"
         />
       </el-form-item>
-      <el-form-item label="确认密码" :prop="!formParams.username ? 'passwordRe' : ''">
+      <el-form-item
+        v-if="props.title === '添加用户'"
+        label="确认密码"
+        :prop="!formParams.username ? 'passwordRe' : ''"
+      >
         <el-input
           type="password"
           show-password-on="mousedown"
@@ -221,7 +225,7 @@
       } else {
         const updateData = {
           userId: params.userId,
-          password: formParams.value.password,
+          // password: formParams.value.password,
           deptId: formParams.value.deptId,
           username: formParams.value.username,
           staffNo: formParams.value.staffNo,

src/views/system/user/columns.ts

@@ -112,7 +112,7 @@ export const columns: BasicColumn[] = [
   // },
   {
     label: '组织',
-    prop: 'postName',
+    prop: 'deptName',
   },
   // {
   //   label: '岗位',

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

@@ -11,13 +11,18 @@
         <el-upload
           ref="upload"
           class="upload-demo"
+          :multiple="false"
+          :limit="1"
           drag
           action="http://localhost:8092/api/user/import"
           :headers="headers"
           :with-credentials="true"
           :auto-upload="false"
+          :on-exceed="handleExceed"
           :before-upload="beforeUpload"
           :on-success="handleUploadSuccess"
+          :on-exceed="handleExceed"
+          :limit="1"
           style="width: 384px; height: 192px; border-radius: 8px"
         >
           <el-icon class="el-icon--upload" style="width: 33px; height: 42px"><Document /></el-icon>
@@ -101,7 +106,8 @@
 <script setup lang="ts">
   import { Close, Document, CircleCheck, Warning } from '@element-plus/icons-vue';
   import { ref } from 'vue';
-  import type { UploadInstance } from 'element-plus';
+  import { genFileId, ElMessage } from 'element-plus';
+  import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
   import { downloadByUrl } from '@/utils/file/download';
   import { useUserStore } from '@/store/modules/user';
   import { onMounted } from 'vue';
@@ -148,6 +154,14 @@
       target: '_self',
     });
   };
+
+  const handleExceed: UploadProps['onExceed'] = (files) => {
+    upload.value!.clearFiles();
+    const file = files[0] as UploadRawFile;
+    file.uid = genFileId();
+    upload.value!.handleStart(file);
+  };
+
   const handleImport = async () => {
     upload.value!.submit();
   };
@@ -156,6 +170,10 @@
     const isExcel = /\.(xlsx|xls)$/.test(file.name.toLowerCase());
     if (!isExcel) {
       // 提示用户选择正确的文件类型
+      ElMessage({
+        message: '仅支持上传.xlsx .xls格式文件',
+        type: 'error',
+      });
       return false; // 阻止上传
     }
     return true; // 允许上传
@@ -190,6 +208,13 @@
     emits('change');
   };
 
+  const handleExceed: UploadProps['onExceed'] = (files) => {
+    upload.value!.clearFiles();
+    const file = files[0] as UploadRawFile;
+    file.uid = genFileId();
+    upload.value!.handleStart(file);
+  };
+
   //对话框
 </script>