Kaynağa Gözat

fix: 修复页面显示

Gaokun Wang 3 hafta önce
ebeveyn
işleme
b2be70e1b3

+ 1 - 1
src/views/system/role/components/RoleDrawer.vue

@@ -15,7 +15,7 @@
         <el-input v-model="drawerProps.row.name" placeholder="填写参数名称" clearable />
       </el-form-item>
       <el-form-item label="权限标识" prop="code">
-        <el-input v-model="drawerProps.row.code" placeholder="填写权限标识" clearable />
+        <el-input v-model="drawerProps.row.code" :disabled="drawerProps.row.roleId === '1'" placeholder="填写权限标识" clearable />
       </el-form-item>
       <el-form-item label="排序" prop="orderNum">
         <el-input-number v-model="drawerProps.row.orderNum" :precision="0" :min="1" :max="999999" />

+ 11 - 1
src/views/system/user/components/UserDrawer.vue

@@ -31,8 +31,15 @@
       <el-form-item label="昵称" prop="nickName">
         <el-input v-model="drawerProps.row.nickName" placeholder="请填写昵称" clearable />
       </el-form-item>
+      <el-form-item label="用户类型" prop="status">
+        <el-radio-group v-model="drawerProps.row.userType">
+          <el-radio-button :value="item.dictValue" v-for="(item, index) in userTypes" :key="index" :label="item.dictLabel" />
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="性别" prop="gender">
-        <el-input v-model="drawerProps.row.gender" placeholder="请选择性别" clearable />
+        <el-radio-group v-model="drawerProps.row.gender">
+          <el-radio-button :value="item.dictValue" v-for="(item, index) in genders" :key="index" :label="item.dictLabel" />
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="手机号" prop="phoneNumber">
         <el-input v-model="drawerProps.row.phoneNumber" placeholder="请填写手机号" clearable />
@@ -68,6 +75,8 @@ import { useDictOptions } from '@/hooks'
 import { OrgTreeVO } from '@/api/interface/system/org'
 
 const commonStatus = useDictOptions('COMMON_STATUS')
+const genders = useDictOptions('USER_GENDER')
+const userTypes = useDictOptions('USER_TYPE')
 const rules = reactive({
   account: [{ required: true, message: '请填写账号' }],
   userName: [{ required: true, message: '请填写姓名' }],
@@ -104,6 +113,7 @@ const acceptParams = (params: EcoDrawerProps) => {
   drawerVisible.value = true
   loadTree()
   drawerProps.value.row.status = drawerProps.value.row.status || '1'
+  drawerProps.value.row.userType = drawerProps.value.row.userType || 'pc_user'
 }
 
 const loadTree = () => {

+ 8 - 1
src/views/system/user/index.vue

@@ -58,7 +58,14 @@ const columns: ColumnProps<UserVO>[] = [
   { prop: 'account', label: '账号', width: 120 },
   { prop: 'userName', label: '姓名', width: 120 },
   { prop: 'nickName', label: '昵称', width: 120 },
-  { prop: 'userType', label: '用户类型', tag: true, width: 120 },
+  {
+    prop: 'userType',
+    label: '用户类型',
+    tag: true,
+    enum: useDictOptions('USER_TYPE'),
+    width: 100,
+    fieldNames: { label: 'dictLabel', value: 'dictValue', tagType: 'callbackShowStyle' }
+  },
   { prop: 'phoneNumber', label: '手机号码', tag: true, width: 120 },
   { prop: 'roles', label: '角色', width: 120 },
   {