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

fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/demo_index.html

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe615;</span>
+                <div class="name">权限</div>
+                <div class="code-name">&amp;#xe615;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe616;</span>
+                <div class="name">系统</div>
+                <div class="code-name">&amp;#xe616;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe67e;</span>
                 <div class="name">客户</div>
@@ -438,9 +450,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1645609997302') format('woff2'),
-       url('iconfont.woff?t=1645609997302') format('woff'),
-       url('iconfont.ttf?t=1645609997302') format('truetype');
+  src: url('iconfont.woff2?t=1648628277563') format('woff2'),
+       url('iconfont.woff?t=1648628277563') format('woff'),
+       url('iconfont.ttf?t=1648628277563') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -466,6 +478,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont firerock-iconquanxian1"></span>
+            <div class="name">
+              权限
+            </div>
+            <div class="code-name">.firerock-iconquanxian1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont firerock-iconxitong-"></span>
+            <div class="name">
+              系统
+            </div>
+            <div class="code-name">.firerock-iconxitong-
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont firerock-iconkehu"></span>
             <div class="name">
@@ -1042,6 +1072,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-iconquanxian1"></use>
+                </svg>
+                <div class="name">权限</div>
+                <div class="code-name">#firerock-iconquanxian1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-iconxitong-"></use>
+                </svg>
+                <div class="name">系统</div>
+                <div class="code-name">#firerock-iconxitong-</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#firerock-iconkehu"></use>

fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2390497 */
-  src: url('iconfont.woff2?t=1645609997302') format('woff2'),
-       url('iconfont.woff?t=1645609997302') format('woff'),
-       url('iconfont.ttf?t=1645609997302') format('truetype');
+  src: url('iconfont.woff2?t=1648628277563') format('woff2'),
+       url('iconfont.woff?t=1648628277563') format('woff'),
+       url('iconfont.ttf?t=1648628277563') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.firerock-iconquanxian1:before { 
+  content: "\e615";
+}
+
+.firerock-iconxitong-:before {
+  content: "\e616";
+}
+
 .firerock-iconkehu:before {
   content: "\e67e";
 }

fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "firerock-icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "736503",
+      "name": "权限",
+      "font_class": "quanxian1",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "7987507",
+      "name": "系统",
+      "font_class": "xitong-",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
     {
       "icon_id": "11111002",
       "name": "客户",

fhKeeper/formulahousekeeper/timesheet/src/routes.js

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

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

@@ -81,7 +81,7 @@
                                 <i :class="item.iconCls"></i>
                                 <span class="itemName">{{item.name}}</span>
                             </template>
-                            <el-menu-item v-for="child in item.children" :index="child.path" :key="child.path" v-if="!child.hidden"><i :class="item.iconCls"></i>{{child.name}}</el-menu-item>
+                            <el-menu-item v-for="child in item.children" :index="child.path" :key="child.path" v-if="!child.hidden"><i :class="child.iconCls"></i>{{child.name}}</el-menu-item>
                         </el-submenu>
                         <el-menu-item v-if="item.leaf && item.children.length > 0" :index="item.children[0].path">
                             <i :class="item.iconCls"></i> {{item.children[0].name}}

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

@@ -25,7 +25,7 @@
             <template slot-scope="scope">
                 <div>
                     <el-button type="primary" size="small" @click="handleAdd('编辑角色', '立即修改', scope.row)">编辑角色</el-button>
-                    <el-button type="primary" size="small" @click="shisha(scope.row.companyId),dialogVisible = true">分配权限</el-button>
+                    <el-button type="primary" size="small" @click="shisha(scope.row.id)">分配权限</el-button>
                     <el-button type="danger" size="small" @click="deteHand(scope.row)">删除</el-button>
                 </div>
             </template>
@@ -45,16 +45,21 @@
         </el-col> -->
         <!-- 分配权限弹窗 -->
         <el-dialog title="分配权限" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
-            <div>
+            <div class="quanxians">
                 <!-- <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input> -->
                 <!-- <el-tree :data="data" show-checkbox node-key="id" :filter-node-method="filterNode" ref="tree" :default-expanded-keys="[2, 3]" :default-checked-keys="[5]" :props="defaultProps"> </el-tree> -->
-                <el-form ref="form" :model="form" label-width="80px">
+                <el-form ref="form" :model="form" label-width="0px">
                 <!-- 分模块展示功能项 -->
                 <el-form-item>
                   <ul>
                     <li v-for="mainMenu in moduleList" :key="mainMenu.id">
+                      <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>
-                      <ul v-if="mainMenu.children">
+                      <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>
+                      <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>
                             <span v-if="subMenu.functionList && subMenu.functionList.length > 0" style="margin-right:10px;margin-left:10px;">(功能:  
@@ -65,11 +70,13 @@
                   </ul>
                 </el-form-item>
                 </el-form>
-                <el-button type="primary" size="small" @click="saveList()">保存</el-button>
             </div>
+            <span slot="footer" class="dialog-footer">
+              <el-button type="primary" size="small" @click="saveList()">保存</el-button>
+            </span>
         </el-dialog>
         <!-- 添加角色弹窗 -->
-        <el-dialog :title="titles" :visible.sync="addDialogVisible" width="600" :before-close="handleClose">
+        <el-dialog :title="titles" :visible.sync="addDialogVisible" width="600px" :before-close="handleClose">
             <div>
                 <el-form ref="form" :model="form" label-width="80px">
                     <el-form-item label="角色名称">
@@ -79,7 +86,7 @@
                         <el-input type="textarea" v-model="form.roleDescribe" clearable></el-input>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="onSubmit()">{{addTil}}</el-button>
+                        <el-button style="float: right" type="primary" @click="onSubmit()">确定</el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -161,6 +168,7 @@ export default {
             if (res.code == "ok") {
               console.log(res.data, '数据来源(990)')
               this.moduleList = res.data
+              this.dialogVisible = true
             } else {
                 this.$message({
                     message: res.msg,
@@ -284,6 +292,11 @@ export default {
                 f.checked = mainMenu.checked;
             });
         });
+        if(mainMenu.functionList) {
+          mainMenu.functionList.forEach(c=>{
+            c.checked = mainMenu.checked;
+          })
+        }
       },
       subChange(subMenu) {
         //二级选中，自动勾选对应的一级
@@ -309,6 +322,31 @@ export default {
           f.checked = subMenu.checked;
         })
       },
+      subChanges(subMenu, id) {
+        let mainMenuList = this.moduleList
+        mainMenuList.forEach(m=>{
+          if(m.id == id) {
+            //找到父菜单了
+            var hasChecked = false;
+            m.functionList.forEach(c=>{
+                if (c.checked) {
+                    hasChecked = true;
+                }
+            })
+            //当前点击的子菜单所有同级菜单是否有点中的，如果没有需要把父级取消勾选
+            m.checked = hasChecked;
+          }
+        });
+      },
+      dianji(item) {
+        console.log(item)
+        let mainMenuList = this.moduleList
+        mainMenuList.forEach(m=>{
+          if(m.id == item.id) {
+            m.useState = !m.useState
+          }
+        });
+      },
       saveList() {
         this.dialogVisible = false
         console.log(this.moduleList)
@@ -342,7 +380,16 @@ export default {
 </script>
 
 <style scoped>
+  ul {
+    padding: 0 0 0 30px;
+    margin: 0;
+  }
   li {
     list-style: none;
   }
+  .quanxians {
+    height: 400px;
+    width: 100%;
+    overflow: auto;
+  }
 </style>