用户管理增加用户类型和学生密码导出

src/api/system/user/types.ts

@@ -54,6 +54,7 @@ export interface UserVO extends BaseEntity {
 export interface UserForm {
   id?: string;
   userId?: string;
+  userType?: string;
   deptId?: number;
   userName: string;
   nickName?: string;

src/views/system/user/index.vue

@@ -5,52 +5,42 @@
       <el-col :lg="4" :xs="24" style="">
         <el-card shadow="hover">
           <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
-          <el-tree
+          <el-tree class="mt-2" ref="deptTreeRef" node-key="id" :data="deptOptions"
-            class="mt-2"
+            :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
-            ref="deptTreeRef"
+            :filter-node-method="filterNode" highlight-current default-expand-all @node-click="handleNodeClick" />
-            node-key="id"
-            :data="deptOptions"
-            :props="{ label: 'label', children: 'children' }"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">
-        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+          :leave-active-class="proxy?.animate.searchAnimate.leave">
           <div class="mb-[10px]" v-show="showSearch">
             <el-card shadow="hover">
               <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
                 <el-form-item label="用户名称" prop="userName">
-                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
+                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+                    @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="用户类型" prop="userType">
+                  <el-select v-model="queryParams.userType" placeholder="请选择用户类型" style="width: 240px"
+                    @keyup.enter="handleQuery">
+                    <el-option v-for="item in userTypeOptions" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
                 </el-form-item>
                 <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input
+                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
-                    v-model="queryParams.phonenumber"
+                    @keyup.enter="handleQuery" />
-                    placeholder="请输入手机号码"
-                    clearable
-                    style="width: 240px"
-                    @keyup.enter="handleQuery"
-                  />
                 </el-form-item>
 
                 <el-form-item label="状态" prop="status">
                   <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                      :value="dict.value" />
                   </el-select>
                 </el-form-item>
                 <el-form-item label="创建时间" style="width: 308px;">
-                  <el-date-picker
+                  <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-                    v-model="dateRange"
+                    start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-                    value-format="YYYY-MM-DD"
-                    type="daterange"
-                    range-separator="-"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  ></el-date-picker>
                 </el-form-item>
                 <el-form-item>
                   <el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
@@ -65,54 +55,79 @@
           <template #header>
             <el-row :gutter="10">
               <el-col :span="1.5">
-                <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']" icon="Plus">新增</el-button>
+                <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']"
+                  icon="Plus">新增</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">
+                <el-button type="success" plain @click="handleUpdate()" :disabled="single"
+                  v-has-permi="['system:user:add']" icon="Edit">
                   修改
                 </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['system:user:delete']" icon="Delete">
+                <el-button type="danger" plain @click="handleDelete()" :disabled="multiple"
+                  v-has-permi="['system:user:delete']" icon="Delete">
                   删除
                 </el-button>
               </el-col>
               <el-col :span="1.5">
+                <el-button type="warning" plain @click="importTemplate()" icon="Download">
+                  下载模板
+                </el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button plain @click="handleImport()" icon="Top">
+                  导入数据
+                </el-button>
+              </el-col>
+              <el-col :span="1.5" v-if="showStudenExport">
+                <el-button type="warning" plain @click="handleExport()" icon="Download">
+                  学生密码导出
+                </el-button>
+              </el-col>
+
+              <!-- <el-col :span="1.5">
                 <el-dropdown class="mt-[1px]">
                   <el-button plain type="info">
                     更多
-                    <el-icon class="el-icon--right"><arrow-down /></el-icon
+                    <el-icon class="el-icon--right"><arrow-down /></el-icon></el-button>
-                  ></el-button>
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item @click="importTemplate" icon="Download">下载模板</el-dropdown-item>
                       <el-dropdown-item @click="handleImport" icon="Top"> 导入数据</el-dropdown-item>
-                      <el-dropdown-item @click="handleExport" icon="Download"> 导出数据</el-dropdown-item>
+                      <el-dropdown-item @click="handleExport" icon="Download"> 学生密码导出</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+</el-dropdown>
-              </el-col>
+</el-col> -->
-              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
+
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"
+                :search="true"></right-toolbar>
             </el-row>
           </template>
 
           <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+              :show-overflow-tooltip="true" />
-            <el-table-column
+            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-              label="部门"
+              :show-overflow-tooltip="true" />
-              align="center"
+            <el-table-column label="用户类型" align="center" key="userType" prop="userType" v-if="columns[6].visible"
-              key="deptName"
+              :show-overflow-tooltip="true">
-              prop="dept.deptName"
+              <template #default="scope">
-              v-if="columns[3].visible"
+                <el-tag v-if="scope.row.userType === 'teacher'" type="primary">老师</el-tag>
-              :show-overflow-tooltip="true"
+                <el-tag v-if="scope.row.userType === 'student'" type="success">学生</el-tag>
-            />
+              </template>
-            <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+            </el-table-column>
+            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+              :show-overflow-tooltip="true" />
+            <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+              width="120" />
             <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
               <template #default="scope">
-                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                  @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
 
@@ -125,36 +140,36 @@
             <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                    v-hasPermi="['system:user:edit']"></el-button>
                 </el-tooltip>
                 <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                    v-hasPermi="['system:user:remove']"></el-button>
                 </el-tooltip>
 
                 <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                  <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)"
+                    v-hasPermi="['system:user:resetPwd']"></el-button>
                 </el-tooltip>
 
                 <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
+                    v-hasPermi="['system:user:edit']"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
 
-          <pagination
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-            v-show="total > 0"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
-            :total="total"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
-            @pagination="getList"
-          />
         </el-card>
       </el-col>
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
+    <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body
+      @close="closeDialog">
       <el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -164,14 +179,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <el-tree-select
+              <el-tree-select v-model="form.deptId" :data="deptOptions"
-                v-model="form.deptId"
+                :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门"
-                :data="deptOptions"
+                check-strictly />
-                :props="{ value: 'id', label: 'label', children: 'children' }"
-                value-key="id"
-                placeholder="请选择归属部门"
-                check-strictly
-              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -203,7 +213,8 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -220,26 +231,25 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
-                  v-for="item in postOptions"
+                  :disabled="item.status == '1'"></el-option>
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == '1'"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                <el-option
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
-                  v-for="item in roleOptions"
+                  :disabled="item.status == '1'"></el-option>
-                  :key="item.roleId"
+              </el-select>
-                  :label="item.roleName"
+            </el-form-item>
-                  :value="item.roleId"
+          </el-col>
-                  :disabled="item.status == '1'"
+        </el-row>
-                ></el-option>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户类型">
+              <el-select v-model="form.userType" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in userTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -262,18 +272,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-      <el-upload
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        ref="uploadRef"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :limit="1"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
         <el-icon class="el-icon--upload">
           <i-ep-upload-filled />
         </el-icon>
@@ -282,7 +283,8 @@
           <div class="text-center el-upload__tip">
             <div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据</div>
             <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+              @click="importTemplate">下载模板</el-link>
           </div>
         </template>
       </el-upload>
@@ -340,15 +342,26 @@ const upload = reactive<ImportOption>({
 })
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `用户编号`, visible: false,children: [] },
+  { key: 0, label: `用户编号`, visible: false, children: [] },
-  { key: 1, label: `用户名称`, visible: true,children: [] },
+  { key: 1, label: `用户名称`, visible: true, children: [] },
-  { key: 2, label: `用户昵称`, visible: true,children: [] },
+  { key: 2, label: `用户昵称`, visible: true, children: [] },
-  { key: 3, label: `部门`, visible: true,children: [] },
+  { key: 3, label: `部门`, visible: true, children: [] },
-  { key: 4, label: `手机号码`, visible: true,children: [] },
+  { key: 4, label: `手机号码`, visible: true, children: [] },
-  { key: 5, label: `状态`, visible: true,children: [] },
+  { key: 5, label: `状态`, visible: true, children: [] },
-  { key: 6, label: `创建时间`, visible: true,children: [] }
+  { key: 6, label: `创建时间`, visible: true, children: [] },
+  { key: 7, label: `用户类型`, visible: true, children: [] }
 ])
 
+const userTypeOptions = [
+  {
+    value: 'teacher',
+    label: '老师',
+  },
+  {
+    value: 'student',
+    label: '学生',
+  }
+]
 
 const deptTreeRef = ref<ElTreeInstance>();
 const queryFormRef = ref<ElFormInstance>();
@@ -381,6 +394,7 @@ const data = reactive<PageData<UserForm, UserQuery>>({
     pageNum: 1,
     pageSize: 10,
     userName: '',
+    userType: '',
     phonenumber: '',
     status: '',
     deptId: ''
@@ -424,8 +438,14 @@ const getList = async () => {
   total.value = res.total;
 }
 
+const showStudenExport = ref(false)
 /** 节点单击事件 */
 const handleNodeClick = (data: DeptVO) => {
+  if (!data.hasOwnProperty('children')) {
+    showStudenExport.value = true
+  } else {
+    showStudenExport.value = false
+  }
   queryParams.value.deptId = data.id;
   handleQuery()
 }
@@ -503,9 +523,13 @@ const handleImport = () => {
 }
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download("system/user/export", {
+  // proxy?.download("system/user/export", {
-    ...queryParams.value,
+  //   ...queryParams.value,
-  }, `user_${new Date().getTime()}.xlsx`);
+  // }, `user_${new Date().getTime()}.xlsx`);
+
+  proxy?.download("system/user/export/password", {
+    deptId: queryParams.value.deptId,
+  }, `学生信息_${new Date().getTime()}.xlsx`);
 };
 /** 下载模板操作 */
 const importTemplate = () => {