Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
This commit is contained in:
		
						commit
						00a64c4d2a
					
				@ -76,10 +76,10 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <!-- 保存权限弹出选择权限 -->
 | 
					    <!-- 保存权限弹出选择权限 -->
 | 
				
			||||||
    <Modal width="800" v-model="selectIsSuperModel" title="选择菜单权限" :loading="superModelLoading" @on-ok="saveRole">
 | 
					    <Modal width="800" v-model="selectIsSuperModel" title="选择菜单权限" :loading="superModelLoading" @on-ok="saveRole">
 | 
				
			||||||
      <!-- <div class="btns">
 | 
					      <div class="btns">
 | 
				
			||||||
        <Button type="primary"  class="btn-item">一键选中·数据权限</Button>
 | 
					        <Button type="primary" @click="setRole()" class="btn-item">一键选中·数据权限</Button>
 | 
				
			||||||
        <Button  class="btn-item">一键选中·查看权限</Button>
 | 
					        <Button class="btn-item" @click="setRole('onlyView')">一键选中·查看权限</Button>
 | 
				
			||||||
      </div> -->
 | 
					      </div>
 | 
				
			||||||
      <div class="role-list">
 | 
					      <div class="role-list">
 | 
				
			||||||
        <div class="role-item" v-for="(item, index) in saveRoleWay" :key="index">
 | 
					        <div class="role-item" v-for="(item, index) in saveRoleWay" :key="index">
 | 
				
			||||||
          <div class="title">{{ item.title }}</div>
 | 
					          <div class="title">{{ item.title }}</div>
 | 
				
			||||||
@ -337,6 +337,17 @@ export default {
 | 
				
			|||||||
      this.getRoleList();
 | 
					      this.getRoleList();
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * 设置权限
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    setRole(val) {
 | 
				
			||||||
 | 
					      let enable;
 | 
				
			||||||
 | 
					      val == "onlyView" ? (enable = false) : (enable = true);
 | 
				
			||||||
 | 
					      this.saveRoleWay.map((item) => {
 | 
				
			||||||
 | 
					        item.isSuper = enable;
 | 
				
			||||||
 | 
					      });
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 查询所有角色
 | 
					     * 查询所有角色
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
@ -515,7 +526,7 @@ export default {
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
      // 递归判断子节点
 | 
					      // 递归判断子节点
 | 
				
			||||||
      this.checkPermTree(this.permData, rolePerms);
 | 
					      this.checkPermTree(this.permData, rolePerms);
 | 
				
			||||||
      console.warn(this.permData);
 | 
					
 | 
				
			||||||
      this.permModalVisible = true;
 | 
					      this.permModalVisible = true;
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    // 递归判断子节点
 | 
					    // 递归判断子节点
 | 
				
			||||||
@ -535,7 +546,6 @@ export default {
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    // 判断角色拥有的权限节点勾选
 | 
					    // 判断角色拥有的权限节点勾选
 | 
				
			||||||
    hasPerm(p, rolePerms) {
 | 
					    hasPerm(p, rolePerms) {
 | 
				
			||||||
      console.log(p, rolePerms);
 | 
					 | 
				
			||||||
      if (!rolePerms) return false;
 | 
					      if (!rolePerms) return false;
 | 
				
			||||||
      let flag = false;
 | 
					      let flag = false;
 | 
				
			||||||
      for (let i = 0; i < rolePerms.length; i++) {
 | 
					      for (let i = 0; i < rolePerms.length; i++) {
 | 
				
			||||||
@ -568,7 +578,6 @@ export default {
 | 
				
			|||||||
      let way = [];
 | 
					      let way = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      selectedNodes.forEach((e) => {
 | 
					      selectedNodes.forEach((e) => {
 | 
				
			||||||
        console.log(e);
 | 
					 | 
				
			||||||
        let perm = {
 | 
					        let perm = {
 | 
				
			||||||
          title: e.title,
 | 
					          title: e.title,
 | 
				
			||||||
          isSuper: e.isSuper,
 | 
					          isSuper: e.isSuper,
 | 
				
			||||||
@ -718,7 +727,7 @@ export default {
 | 
				
			|||||||
.btns {
 | 
					.btns {
 | 
				
			||||||
  display: flex;
 | 
					  display: flex;
 | 
				
			||||||
  align-items: center;
 | 
					  align-items: center;
 | 
				
			||||||
  justify-content: space-between;
 | 
					  justify-content: center;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.btn-item {
 | 
					.btn-item {
 | 
				
			||||||
  margin-right: 20px;
 | 
					  margin-right: 20px;
 | 
				
			||||||
@ -742,9 +751,7 @@ export default {
 | 
				
			|||||||
  margin-left: 8px;
 | 
					  margin-left: 8px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.title {
 | 
					.title {
 | 
				
			||||||
 | 
					 | 
				
			||||||
  font-weight: bold;
 | 
					  font-weight: bold;
 | 
				
			||||||
  margin-right: 20px;
 | 
					  margin-right: 20px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					 | 
				
			||||||
</style>
 | 
					</style>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user