feature:系统管理->用户管理

1、自动开户前后端交互及界面样式

src/api/basics/basicParameter/ptParameter/index.ts

@@ -60,3 +60,10 @@ export const delPtParameter = (paramId: string | number | Array<string | number>
     method: 'delete'
   });
 };
+// 根据参数键名查询参数值
+export function getPtParamByCode(paramCode: string): AxiosPromise<string> {
+  return request({
+    url: '/backstage/basicParameter/ptParameter/paramCode/' + paramCode,
+    method: 'get'
+  });
+}

src/api/system/right/user/types.ts

@@ -14,7 +14,7 @@ export interface UserInfo {
  * 用户查询对象类型
  */
 export interface UserQuery extends PageQuery {
-  userName?: string;
+  userNumb?: string;
   realName?: string;
   phone?: string;
   status?: string;
@@ -49,6 +49,7 @@ export interface UserVO extends BaseEntity {
   postIds: any;
   roleId: any;
   admin: boolean;
+  idNumber: string;
 }
 
 /**
@@ -73,6 +74,7 @@ export interface UserForm {
   lifespan: string;
   postIds?: string[];
   roleIds: string[];
+  idNumber?: string;
 }
 
 export interface UserInfoVO {

src/router/index.ts

@@ -101,7 +101,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        component: () => import('@/views/system/user/authRole.vue'),
+        component: () => import('@/views/system/right/user/authRole.vue'),
         name: 'AuthRole',
         meta: { title: '分配角色', activeMenu: '/system/user', icon: '' }
       }

src/views/payment/account/index.vue

@@ -77,14 +77,15 @@
                 </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-dropdown class="mt-[1px]">
+                <el-dropdown v-hasPermi="['payment:ptUserAccount:edit']" class="mt-[1px]">
                   <el-button plain type="info">
                     更多
                     <el-icon class="el-icon--right"><arrow-down /></el-icon
                   ></el-button>
                   <template #dropdown>
                     <el-dropdown-menu>
-                      <el-dropdown-item icon="Refresh" @click="handleResetLifespan">重置有效期</el-dropdown-item>
+                      <el-dropdown-item  icon="Refresh" @click="handleResetLifespan"
+                        >重置有效期</el-dropdown-item>
                       <el-dropdown-item icon="RefreshLeft" @click="handleResetCardType"> 重置卡片类别</el-dropdown-item>
                       <el-dropdown-item icon="RefreshRight" @click="handleResetConsumePwd"> 重置消费密码</el-dropdown-item>
                     </el-dropdown-menu>

src/views/system/right/user/UserDetailForm.vue

@@ -69,6 +69,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="身份证号" prop="idNumber">
+              <el-input v-model="formData.idNumber" placeholder="请输入身份证号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户性别" prop="sex">
@@ -139,6 +146,7 @@ import { RoleVO } from '@/api/system/role/types';
 import { treeselect } from '@/api/system/dept';
 import { listUsePtCardType } from '@/api/basics/basicParameter/ptCardtype';
 import { PtCardTypeVO } from '@/api/basics/basicParameter/ptCardtype/types';
+import { getPtParamByCode } from '@/api/basics/basicParameter/ptParameter';
 
 /** 当前组件属性 */
 defineOptions({ name: 'RecompenseForm' });
@@ -184,6 +192,7 @@ const formData = ref<UserForm>({
   userName: '',
   nickName: undefined,
   realName: undefined,
+  idNumber: '',
   userNumb: '',
   loginPwd: '',
   category: undefined,
@@ -269,6 +278,7 @@ const resetForm = () => {
     realName: undefined,
     userNumb: '',
     loginPwd: '',
+    idNumber: '',
     category: undefined,
     phone: undefined,
     email: undefined,
@@ -314,6 +324,9 @@ onMounted(() => {
   proxy?.getConfigKey('sys.user.initPassword').then((response) => {
     initPassword.value = response.data;
   });
+  getPtParamByCode('AUTO_CREATE_BAG').then((response) => {
+    createAccount.value = response.data;
+  });
   // 初始化卡类数据
   getCardTypeOption();
 });

src/views/system/right/user/authRole.vue

@@ -25,10 +25,11 @@
           v-loading="loading"
           :row-key="getRowKey"
           :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+          highlight-current-row
           @row-click="clickRow"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column label="序号" width="55" type="index" align="center">
+          <el-table-column label="序号" width="100" type="index" align="center">
             <template #default="scope">
               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
             </template>
@@ -37,7 +38,7 @@
           <el-table-column label="角色编号" align="center" prop="roleId" />
           <el-table-column label="角色名称" align="center" prop="roleName" />
           <el-table-column label="权限字符" align="center" prop="roleKey" />
-          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <el-table-column label="创建时间" align="center" prop="createTime" width="300">
             <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>

src/views/system/right/user/index.vue

@@ -24,6 +24,9 @@
           <div v-show="showSearch" class="mb-[5px]">
             <el-card shadow="hover">
               <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto" class="-mb-25px -mt-5px">
+                <el-form-item label="学/工号" prop="userNumb">
+                  <el-input v-model="queryParams.userNumb" placeholder="请输入学/工号" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
                 <el-form-item label="用户姓名" prop="realName">
                   <el-input v-model="queryParams.realName" placeholder="请输入用户姓名" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
@@ -54,23 +57,6 @@
                   删除
                 </el-button>
               </el-col>
-<!--              <el-col :span="1.5">-->
-<!--                <el-dropdown class="mt-[1px]">-->
-<!--                  <el-button plain type="info">-->
-<!--                    更多-->
-<!--                    <el-icon class="el-icon&#45;&#45;right">-->
-<!--                      <arrow-down />-->
-<!--                    </el-icon>-->
-<!--                  </el-button>-->
-<!--                  <template #dropdown>-->
-<!--                    <el-dropdown-menu>-->
-<!--                      <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>-->
-<!--                      <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>-->
-<!--                      <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>-->
-<!--                    </el-dropdown-menu>-->
-<!--                  </template>-->
-<!--                </el-dropdown>-->
-<!--              </el-col>-->
               <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
             </el-row>
           </template>
@@ -126,7 +112,7 @@
                 <dict-tag :options="CATEGORY" :value="scope.row.category" />
               </template>
             </el-table-column>
-            <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center" width="100">
+            <el-table-column v-if="columns[6].visible" key="status" label="状态" align="center" width="100">
               <template #default="scope">
                 <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
               </template>
@@ -168,42 +154,6 @@
     </el-row>
     <!-- 添加或修改用户对话框 -->
     <user-detail-form ref="userDetailFormRef" apped-to-body @success="getList" />
-    <!-- 用户导入对话框 -->
-    <el-dialog v-model="upload.open" :title="upload.title" width="400px" append-to-body>
-      <el-upload
-        ref="uploadRef"
-        :limit="1"
-        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>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <template #tip>
-          <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>
-          </div>
-        </template>
-      </el-upload>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitFileForm">确 定</el-button>
-          <el-button @click="upload.open = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -214,7 +164,6 @@ import { DeptVO } from '@/api/system/dept/types';
 import { globalHeaders } from '@/utils/request';
 import { to } from 'await-to-js';
 import UserDetailForm from '@/views/system/right/user/UserDetailForm.vue';
-import { ArrowDown } from '@element-plus/icons-vue';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -249,17 +198,18 @@ const upload = reactive<ImportOption>({
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `学/工号`, visible: true, children: [] },
-  { key: 1, label: `用户名称`, visible: true, children: [] },
-  { key: 2, label: `用户昵称`, visible: true, children: [] },
+  { key: 1, label: `用户名`, visible: true, children: [] },
+  { key: 2, label: `用户姓名`, visible: true, children: [] },
   { key: 3, label: `部门`, visible: true, children: [] },
   { key: 4, label: `手机号码`, visible: true, children: [] },
-  { key: 5, label: `状态`, visible: true, children: [] },
-  { key: 6, label: `创建时间`, visible: true, children: [] }
+  { key: 5, label: `用户类型`, visible: true, children: [] },
+  { key: 6, label: `状态`, visible: true, children: [] }
 ]);
 const queryParams = reactive<UserQuery>({
   pageNum: 1,
   pageSize: 10,
-  userName: '',
+  realName: '',
+  userNumb: '',
   phone: '',
   status: '',
   deptId: '',
@@ -426,9 +376,6 @@ const handleOpenDetail = async (cmd: string, row?: UserVO) => {
 onMounted(() => {
   getTreeSelect(); // 初始化部门数据
   getList(); // 初始化列表数据
-  proxy?.getConfigKey('sys.user.initPassword').then((response) => {
-    initPassword.value = response.data;
-  });
 });
 </script>