Ver Fonte

1、邀请码管理搜索自定义查询用户角色租户包装分页

liyanbo há 2 meses atrás
pai
commit
3dfa2f9085

+ 1 - 1
src/utils/dict.ts

@@ -185,5 +185,5 @@ export enum DICT_TYPE {
 
   // ========== 平台 ==========
   WEB_ROLE_ROUTE = 'web_role_route', // 角色Web路由权限
-  SYSTEM_INVITE_CODE_STATUS = 'system_invite_code', // 邀请码状态
+  SYSTEM_INVITE_CODE_STATUS = 'system_invite_code_status', // 邀请码状态
 }

+ 4 - 7
src/views/system/invitecode/InviteCodeForm.vue

@@ -54,8 +54,8 @@
         </el-input-number>
       </el-form-item>
       
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态" disabled>
+      <el-form-item label="状态" prop="status" v-if="formType === 'update'">
+        <el-select v-model="formData.status" placeholder="请选择状态">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_INVITE_CODE_STATUS)"
             :key="dict.value"
@@ -97,7 +97,7 @@ const formData = ref({
   expireTime: undefined,
   useUserId: undefined,
   useUserTenantId: undefined,
-  status: '1'
+  status: '0'
 })
 const formRules = reactive({
   type: [
@@ -121,9 +121,6 @@ const formRules = reactive({
     { type: 'number', min: 1, max: 50, message: '批量数量必须在1-50之间', trigger: 'blur' },
     { type: 'number', integer: true, message: '批量数量必须是整数', trigger: 'blur' }
   ],
-  status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
-  ]
 })
 const formRef = ref() // 表单 Ref
 const roleList = ref<RoleVO[]>([])
@@ -220,7 +217,7 @@ const resetForm = () => {
     expireTime: undefined,
     useUserId: undefined,
     useUserTenantId: undefined,
-    status: '1'
+    status: '0'
   }
   formRef.value?.resetFields()
 }

+ 16 - 19
src/views/system/invitecode/index.vue

@@ -17,30 +17,28 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="绑定角色" prop="roleIds">
+      <el-form-item label="绑定角色" prop="roleName">
         <el-input
-          v-model="queryParams.roleIds"
+          v-model="queryParams.roleName"
           placeholder="请输入绑定角色"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="过期时间" prop="expireTime">
-        <el-date-picker
-          v-model="queryParams.expireTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
+      <el-form-item label="使用用户" prop="useUserName">
+        <el-input
+          v-model="queryParams.useUserName"
+          placeholder="请输入使用用户"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="使用用户" prop="useUserId">
+      <el-form-item label="用户租户" prop="useUserTenantName">
         <el-input
-          v-model="queryParams.useUserId"
-          placeholder="请输入使用用户"
+          v-model="queryParams.useUserTenantName"
+          placeholder="请输入使用用户租户"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -53,7 +51,6 @@
           clearable
           class="!w-240px"
         >
-
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_INVITE_CODE_STATUS)"
             :key="dict.value"
@@ -90,7 +87,7 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="主键" align="center" prop="id" fixed="left"/>
-      <el-table-column label="邀请码" align="center" prop="code" fixed="left" width="140px" />
+      <el-table-column label="邀请码" align="center" prop="code" fixed="left" width="160px" />
       <el-table-column label="绑定角色" align="center" prop="roleNames" fixed="left" >
         <template #default="scope">
           <div style="display: flex; flex-direction: column; gap: 5px;">
@@ -185,11 +182,11 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   code: undefined,
-  roleIds: undefined,
+  roleName: undefined,
   validTime: undefined,
   expireTime: [],
-  useUserId: undefined,
-  useUserTenantId: undefined,
+  useUserName: undefined,
+  useUserTenantName: undefined,
   status: undefined,
   createTime: [],
   tenantId: undefined