|  | @@ -213,7 +213,7 @@
 | 
											
												
													
														|  |            <el-input v-model="form.roleKey" :disabled="true" />
 |  |            <el-input v-model="form.roleKey" :disabled="true" />
 | 
											
												
													
														|  |          </el-form-item>
 |  |          </el-form-item>
 | 
											
												
													
														|  |          <el-form-item label="权限范围">
 |  |          <el-form-item label="权限范围">
 | 
											
												
													
														|  | -          <el-select v-model="form.dataScope">
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
 | 
											
												
													
														|  |              <el-option
 |  |              <el-option
 | 
											
												
													
														|  |                v-for="item in dataScopeOptions"
 |  |                v-for="item in dataScopeOptions"
 | 
											
												
													
														|  |                :key="item.value"
 |  |                :key="item.value"
 | 
											
										
											
												
													
														|  | @@ -276,7 +276,7 @@ export default {
 | 
											
												
													
														|  |        open: false,
 |  |        open: false,
 | 
											
												
													
														|  |        // 是否显示弹出层(数据权限)
 |  |        // 是否显示弹出层(数据权限)
 | 
											
												
													
														|  |        openDataScope: false,
 |  |        openDataScope: false,
 | 
											
												
													
														|  | -	  menuExpand: false,
 |  | 
 | 
											
												
													
														|  | 
 |  | +      menuExpand: false,
 | 
											
												
													
														|  |        menuNodeAll: false,
 |  |        menuNodeAll: false,
 | 
											
												
													
														|  |        deptExpand: true,
 |  |        deptExpand: true,
 | 
											
												
													
														|  |        deptNodeAll: false,
 |  |        deptNodeAll: false,
 | 
											
										
											
												
													
														|  | @@ -431,7 +431,7 @@ export default {
 | 
											
												
													
														|  |        if (this.$refs.menu != undefined) {
 |  |        if (this.$refs.menu != undefined) {
 | 
											
												
													
														|  |          this.$refs.menu.setCheckedKeys([]);
 |  |          this.$refs.menu.setCheckedKeys([]);
 | 
											
												
													
														|  |        }
 |  |        }
 | 
											
												
													
														|  | -	  this.menuExpand = false,
 |  | 
 | 
											
												
													
														|  | 
 |  | +      this.menuExpand = false,
 | 
											
												
													
														|  |        this.menuNodeAll = false,
 |  |        this.menuNodeAll = false,
 | 
											
												
													
														|  |        this.deptExpand = true,
 |  |        this.deptExpand = true,
 | 
											
												
													
														|  |        this.deptNodeAll = false,
 |  |        this.deptNodeAll = false,
 | 
											
										
											
												
													
														|  | @@ -443,8 +443,8 @@ export default {
 | 
											
												
													
														|  |          status: "0",
 |  |          status: "0",
 | 
											
												
													
														|  |          menuIds: [],
 |  |          menuIds: [],
 | 
											
												
													
														|  |          deptIds: [],
 |  |          deptIds: [],
 | 
											
												
													
														|  | -		menuCheckStrictly: true,
 |  | 
 | 
											
												
													
														|  | -		deptCheckStrictly: true,
 |  | 
 | 
											
												
													
														|  | 
 |  | +        menuCheckStrictly: true,
 | 
											
												
													
														|  | 
 |  | +        deptCheckStrictly: true,
 | 
											
												
													
														|  |          remark: undefined
 |  |          remark: undefined
 | 
											
												
													
														|  |        };
 |  |        };
 | 
											
												
													
														|  |        this.resetForm("form");
 |  |        this.resetForm("form");
 | 
											
										
											
												
													
														|  | @@ -466,7 +466,7 @@ export default {
 | 
											
												
													
														|  |        this.single = selection.length!=1
 |  |        this.single = selection.length!=1
 | 
											
												
													
														|  |        this.multiple = !selection.length
 |  |        this.multiple = !selection.length
 | 
											
												
													
														|  |      },
 |  |      },
 | 
											
												
													
														|  | -	// 树权限(展开/折叠)
 |  | 
 | 
											
												
													
														|  | 
 |  | +    // 树权限(展开/折叠)
 | 
											
												
													
														|  |      handleCheckedTreeExpand(value, type) {
 |  |      handleCheckedTreeExpand(value, type) {
 | 
											
												
													
														|  |        if (type == 'menu') {
 |  |        if (type == 'menu') {
 | 
											
												
													
														|  |          let treeList = this.menuOptions;
 |  |          let treeList = this.menuOptions;
 | 
											
										
											
												
													
														|  | @@ -524,6 +524,12 @@ export default {
 | 
											
												
													
														|  |          this.title = "修改角色";
 |  |          this.title = "修改角色";
 | 
											
												
													
														|  |        });
 |  |        });
 | 
											
												
													
														|  |      },
 |  |      },
 | 
											
												
													
														|  | 
 |  | +    /** 选择角色权限范围触发 */
 | 
											
												
													
														|  | 
 |  | +    dataScopeSelectChange(value) {
 | 
											
												
													
														|  | 
 |  | +      if(value !== '2') {
 | 
											
												
													
														|  | 
 |  | +        this.$refs.dept.setCheckedKeys([]);
 | 
											
												
													
														|  | 
 |  | +      }
 | 
											
												
													
														|  | 
 |  | +    },
 | 
											
												
													
														|  |      /** 分配数据权限操作 */
 |  |      /** 分配数据权限操作 */
 | 
											
												
													
														|  |      handleDataScope(row) {
 |  |      handleDataScope(row) {
 | 
											
												
													
														|  |        this.reset();
 |  |        this.reset();
 |