Browse Source

no message

DESKTOP-SVI9JE1\muzen 1 year ago
parent
commit
d6a6d46bb2
2 changed files with 19 additions and 5 deletions
  1. 8 1
      src/views/system/menu/index.vue
  2. 11 4
      src/views/system/role/index.vue

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

@@ -238,6 +238,13 @@
                      <el-switch v-model="form.isEnterprise" :active-value="1" :inactive-value="0" />
                   </el-form-item>
                </el-col>
+               <el-col :span="12">
+                  <el-form-item label="功能类型">
+                     <el-select v-model="form.roleType" multiple placeholder="请选择功能类型">
+                        <el-option v-for="item in sys_menu_type" :key="item.value" :value="item.value" :label="item.label" />  
+                     </el-select>
+                  </el-form-item>
+               </el-col>
             </el-row>
          </el-form>
          <template #footer>
@@ -256,7 +263,7 @@ import SvgIcon from "@/components/SvgIcon";
 import IconSelect from "@/components/IconSelect";
 
 const { proxy } = getCurrentInstance();
-const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
+const { sys_show_hide, sys_normal_disable, sys_menu_type } = proxy.useDict("sys_show_hide", "sys_normal_disable", "sys_menu_type");
 
 const menuList = ref([]);
 const open = ref(false);

+ 11 - 4
src/views/system/role/index.vue

@@ -82,8 +82,8 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -91,6 +91,11 @@
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
+        <el-form-item label="功能类型" prop="roleType">
+          <el-select v-model="form.roleType" multiple placeholder="请选择功能类型">
+            <el-option v-for="item in sys_menu_type" :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="roleKey">
           <template #label>
             <span>
@@ -107,7 +112,8 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
+              }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="菜单权限">
@@ -172,7 +178,7 @@ import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/m
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const { sys_normal_disable, sys_menu_type } = proxy.useDict("sys_normal_disable", "sys_menu_type");
 
 const roleList = ref([]);
 const open = ref(false);
@@ -214,6 +220,7 @@ const data = reactive({
   },
   rules: {
     roleName: [{ required: true, message: "角色名称不能为空", trigger: "blur" }],
+    roleType: [{ required: true, message: "功能类型不能为空", trigger: "blur" }],
     roleKey: [{ required: true, message: "权限字符不能为空", trigger: "blur" }],
     roleSort: [{ required: true, message: "角色顺序不能为空", trigger: "blur" }]
   },