Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -348,7 +348,7 @@ export const allRouters = [//组织架构
         leaf: false,//只有一个节点
         children: [
             { path: '/timetype', component: timetype, name: '系统基础设置', iconCls: 'iconfont firerock-iconxitong-'},
-            { path: '/quanx', component: quanx, name: '角色权限管理', iconCls: 'iconfont firerock-iconquanxian1' }
+            { path: '/role', component: quanx, name: '角色权限管理', iconCls: 'iconfont firerock-iconquanxian1' }
         ]
     },
     {

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

@@ -52,13 +52,15 @@
                 <!-- 分模块展示功能项 -->
                 <el-form-item>
                   <ul>
-                    <li v-for="mainMenu in moduleList" :key="mainMenu.id">
+                    <li v-for="mainMenu in moduleList" :key="mainMenu.id" style="display: flex;">
                       <div style="width: 20px; display: inline-block;height: 10px">
                         <span v-if="mainMenu.children.length > 0" @click="dianji(mainMenu)" style="cursor:pointer;"><i :class="mainMenu.useState ? 'el-icon-caret-bottom' : 'el-icon-caret-right'"></i></span>
                       </div>
                       <el-checkbox :label="mainMenu.name" name="type" v-model="mainMenu.checked" style="font-weight:bold;" @change="mainChange(mainMenu)"></el-checkbox>
-                      <span v-if="mainMenu.functionList && mainMenu.functionList.length > 0" style="margin-right:10px;margin-left:10px;">(功能:  
-                              <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>
+                      <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"></el-checkbox>)</span>
+                      </span>
                       <ul v-if="mainMenu.children && mainMenu.useState">
                         <li v-for="subMenu in mainMenu.children" :key="subMenu.id">
                         <el-checkbox :label="subMenu.name" name="type" v-model="subMenu.checked" style="font-weight:bold;" @change="subChange(subMenu)"></el-checkbox>
@@ -292,11 +294,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) {
         //二级选中，自动勾选对应的一级
@@ -392,4 +394,8 @@ export default {
     width: 100%;
     overflow: auto;
   }
+  .gongn {
+    display: inline-block;
+    width: 550px;
+  }
 </style>