Merge branch 'zwg' into dev

src/page/main/develop/menu/index.vue

@@ -262,14 +262,15 @@ const fileAction = (val,data,parent,disabled=false) => {
   if (val == 1) { // 新建本级菜单
     state.addType = 1
     let newChild = {
-      menu_name: "新菜单",
-      menu_id: 'new' + state.newMenuId,
-      menu_type: 0,
-      dict_group_id: "",
-      state: 1,
-      menu_url: "",
-      menu_logo: "",
-      level: data.level
+      menu_name: "新菜单", // 菜单名称
+      menu_id: 'new' + state.newMenuId, // 菜单id，用于新增后选中
+      menu_type: !parent ? 0 : parent.menu_type == 0 ? 0 : parent.menu_type == 1 ? 1 : 2, // 新增本级的类型
+      dict_group_id: parent ? parent.dict_group_id : "", // 父级的分组 有则继承，无则自选
+      state: 1, // 启用状态
+      menu_url: "", // 路径
+      menu_logo: "", // 图标
+      level: data.level, // 当前的level
+      p_menu_type: parent ? parent.menu_type : 0 // 父级的类型，用于判断菜单下不能建目录
     }
     state.menuTree.insertAfter(newChild,parent? parent.Child[parent.Child.length-1] : state.data[state.data.length -1])
     state.menuTree && state.menuTree.setCurrentKey(newChild.menu_id);
@@ -284,11 +285,12 @@ const fileAction = (val,data,parent,disabled=false) => {
       menu_name: "新菜单",
       menu_id: 'new' + state.newMenuId,
       menu_type: data.menu_type == 0 ? 0 : data.menu_type == 1 ? 1 : 2,
-      dict_group_id: "",
+      dict_group_id: data.dict_group_id,
       state: 1,
       menu_url: "",
       menu_logo: "",
-      p_menu_type: data.menu_type
+      p_menu_type: data.menu_type,
+      level: data.level + 1
     }
     state.menuTree.append(newChild,data)
     state.menuTree && state.menuTree.setCurrentKey(newChild.menu_id);
@@ -419,9 +421,6 @@ const saveMenu = (el,type) => {
         }else { // 新增下级
           params.p_menu_id = state.selectParentData.menu_id
         }
-        if (params.menu_type != 0) {
-          params.dict_group_id = ""
-        }
         axios
           .post(`/apaas/system/v5/menu/add`,params)
           .then((res) => {

src/page/main/develop/menu/menu-form.vue

@@ -18,8 +18,8 @@
         <el-radio :label="2">子页面</el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="分组" prop="dict_group_id" v-if="menuForm.menu_type == 0 && !topLevel">
-      <el-select v-model="menuForm.dict_group_id" placeholder="请选择分组">
+    <el-form-item label="分组" prop="dict_group_id" v-if="!topLevel">
+      <el-select v-model="menuForm.dict_group_id" :disabled="groupFlag" placeholder="请选择分组">
         <el-option
           v-for="item in groupList"
           :key="item.dict_id"
@@ -141,6 +141,7 @@ const state = reactive({
   radioDisabled: false,
   topLevel: false,
   typeDisFlag: null,
+  groupFlag: true,
 })
 
 const getGroupList = () => {
@@ -186,9 +187,14 @@ const setForm = (data) => {
     state.topLevel = true
   }else {
     state.topLevel = false
+    if (data.level == 2) {
+      state.groupFlag = false
+    }else {
+      state.groupFlag = true
+    }
   }
   state.typeDisFlag = data.p_menu_type
-  console.log(state.topLevel)
+  console.log(state.groupFlag)
   if (data.id) { // 编辑状态
     state.radioDisabled = true
   }else {
@@ -228,6 +234,7 @@ const {
   radioDisabled,
   topLevel,
   typeDisFlag,
+  groupFlag,
 } = toRefs(state)
 
 defineExpose({ setForm , menuForm, menuRef })

src/page/main/system/role/index.vue

@@ -59,7 +59,7 @@
               <bg-table-btn class="can_click_text" :click="()=>{edit_row(row)}" :disabled="row.state == 1 || row.role_type == 1">
                 编辑
               </bg-table-btn>
-              <bg-table-btn class="can_click_text" :click="()=>{distribute_user(row)}" :disabled="row.role_type == 1">
+              <bg-table-btn class="can_click_text" :click="()=>{distribute_user(row)}" :disabled="row.cant_allot == 1">
                 分配用户
               </bg-table-btn>
               <bg-table-btn class="can_click_text" :click="()=>{delete_row(row)}" :disabled="row.state == 1 || row.role_type == 1">
@@ -263,10 +263,6 @@ const userState = reactive({
       name: "全部类型",
       value: ""
     },
-    {
-      name: "业务系统账号",
-      value: 1
-    },
     {
       name: "组织管理员账号",
       value: 2
@@ -638,4 +634,7 @@ const {
 .distribute_dialog .el-dialog__body {
   padding: 0px!important;    
 }
+.distribute_dialog {
+  margin-top: 130px!important;    
+}
 </style>
\ No newline at end of file