Browse Source

Control role_name and tole_key cannot be duplicate
Add key only control
Add count where condition 'deleted' at 'is null

zhangwenjian 5 years ago
parent
commit
f31a37672f
4 changed files with 20 additions and 8 deletions
  1. 5 2
      src/views/config/index.vue
  2. 5 2
      src/views/dict/data.vue
  3. 5 2
      src/views/dict/index.vue
  4. 5 2
      src/views/role/index.vue

+ 5 - 2
src/views/config/index.vue

@@ -123,10 +123,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
-          <el-input v-model="form.configName" placeholder="请输入参数名称" />
+          <el-input v-model="form.configName" placeholder="请输入参数名称" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="参数键名" prop="configKey">
-          <el-input v-model="form.configKey" placeholder="请输入参数键名" />
+          <el-input v-model="form.configKey" placeholder="请输入参数键名" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="参数键值" prop="configValue">
           <el-input v-model="form.configValue" placeholder="请输入参数键值" />
@@ -174,6 +174,7 @@ export default {
       configList: [],
       // 弹出层标题
       title: '',
+      isEdit: false,
       // 是否显示弹出层
       open: false,
       // 类型数据字典
@@ -258,6 +259,7 @@ export default {
       this.reset()
       this.open = true
       this.title = '添加参数'
+      this.isEdit = false
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -273,6 +275,7 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改参数'
+        this.isEdit = true
       })
     },
     /** 提交按钮 */

+ 5 - 2
src/views/dict/data.vue

@@ -116,10 +116,10 @@
           <el-input v-model="form.dictType" :disabled="true" />
         </el-form-item>
         <el-form-item label="数据标签" prop="dictLabel">
-          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="数据键值" prop="dictValue">
-          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+          <el-input v-model="form.dictValue" placeholder="请输入数据键值" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="显示排序" prop="dictSort">
           <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
@@ -169,6 +169,7 @@ export default {
       defaultDictType: '',
       // 弹出层标题
       title: '',
+      isEdit: false,
       // 是否显示弹出层
       open: false,
       // 状态数据字典
@@ -268,6 +269,7 @@ export default {
       this.reset()
       this.open = true
       this.title = '添加字典数据'
+      this.isEdit = false
       this.form.dictType = this.queryParams.dictType
     },
     // 多选框选中数据
@@ -284,6 +286,7 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改字典数据'
+        this.isEdit = true
       })
     },
     /** 提交按钮 */

+ 5 - 2
src/views/dict/index.vue

@@ -135,10 +135,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
+          <el-input v-model="form.dictName" placeholder="请输入字典名称" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="字典类型" prop="dictType">
-          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
+          <el-input v-model="form.dictType" placeholder="请输入字典类型" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -183,6 +183,7 @@ export default {
       typeList: [],
       // 弹出层标题
       title: '',
+      isEdit: false,
       // 是否显示弹出层
       open: false,
       // 状态数据字典
@@ -263,6 +264,7 @@ export default {
       this.reset()
       this.open = true
       this.title = '添加字典类型'
+      this.isEdit = false
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -278,6 +280,7 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改字典类型'
+        this.isEdit = true
       })
     },
     /** 提交按钮 */

+ 5 - 2
src/views/role/index.vue

@@ -156,10 +156,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="权限字符" prop="roleKey">
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
@@ -260,6 +260,7 @@ export default {
       open: false,
       // 是否显示弹出层(数据权限)
       openDataScope: false,
+      isEdit: false,
       // 日期范围
       dateRange: [],
       // 状态数据字典
@@ -448,6 +449,7 @@ export default {
       this.getMenuTreeselect()
       this.open = true
       this.title = '添加角色'
+      this.isEdit = false
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -460,6 +462,7 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改角色'
+        this.isEdit = true
       })
     },
     /** 分配数据权限操作 */