调整权限

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -2,7 +2,7 @@
   <div>
       <!-- 表头 -->
       <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-          <el-form :inline="true">
+          <el-form :inline="true" style="width: 81%">
               <el-form-item label="角色权限">
               </el-form-item>
               <el-form-item >
@@ -12,7 +12,7 @@
                   </el-input>
                   </div>
               </el-form-item>
-              <el-form-item>
+              <el-form-item style="float: right">
                   <el-link type="primary" :underline="false" @click="handleAdd('添加角色', '立即添加')">添加角色</el-link>
                   <el-link type="primary" :underline="false" @click="modify()" style="margin-left: 20px;">修改默认角色</el-link>
               </el-form-item>
@@ -29,7 +29,7 @@
         <el-table-column prop="date" label="操作">
             <template slot-scope="scope">
                 <div>
-                    <el-button type="primary" size="small" @click="handleAdd('编辑角色', '立即修改', scope.row)">编辑角色</el-button>
+                    <el-button size="small" @click="handleAdd('编辑角色', '立即修改', scope.row)">编辑角色</el-button>
                     <el-button type="primary" size="small" @click="shisha(scope.row.id), roleName = scope.row.rolename">分配权限</el-button>
                     <el-button type="danger" size="small" @click="deteHand(scope.row)">删除</el-button>
                 </div>
@@ -67,7 +67,7 @@
                         <el-checkbox :label="mainMenu.name" name="type" v-model="mainMenu.checked" style="font-weight:bold;width: 160px" @change="mainChange(mainMenu)"></el-checkbox>
                         <span v-if="mainMenu.functionList && mainMenu.functionList.length > 0" style="margin-right:10px;margin-left:10px;">
                           <!-- <div></div>(功能:  <el-checkbox v-for="fun in mainMenu.functionList" :key="fun.id" :label="fun.name" name="type" v-model="fun.checked" @change="subChanges(fun, mainMenu.id)"></el-checkbox>) -->
-                          <span class="gongn"><el-checkbox v-for="fun in mainMenu.functionList" :key="fun.id" :label="fun.name" name="type" v-model="fun.checked" style="width: 130px"></el-checkbox></span>
+                          <span class="gongn"><el-checkbox v-for="fun in mainMenu.functionList" :key="fun.id" :label="fun.name" name="type" v-model="fun.checked" style="width: 130px" @change="subChanges(fun, mainMenu.id)"></el-checkbox></span>
                         </span>
                       </span>
                       <ul v-if="mainMenu.children && mainMenu.useState">
@@ -372,11 +372,11 @@ export default {
                 f.checked = mainMenu.checked;
             });
         });
-        // if(mainMenu.functionList) {
-        //   mainMenu.functionList.forEach(c=>{
-        //     c.checked = mainMenu.checked;
-        //   })
-        // }
+        if(mainMenu.functionList) {
+          mainMenu.functionList.forEach(c=>{
+            c.checked = mainMenu.checked;
+          })
+        }
       },
       subChange(subMenu) {
         //二级选中，自动勾选对应的一级
@@ -396,11 +396,6 @@ export default {
             m.checked = hasChecked;
           }
         });
-
-        //子功能全部勾上，取消
-        subMenu.functionList.forEach(f=>{
-          f.checked = subMenu.checked;
-        })
       },
       subChanges(subMenu, id) {
         let mainMenuList = this.moduleList
@@ -413,8 +408,12 @@ export default {
                     hasChecked = true;
                 }
             })
-            //当前点击的子菜单所有同级菜单是否有点中的，如果没有需要把父级取消勾选
-            m.checked = hasChecked;
+            console.log(hasChecked, '事件')
+            // m.checked = hasChecked;
+            if(hasChecked) {
+              console.log('执行')
+              m.checked = hasChecked;
+            }
           }
         });
       },