修改bug

src/views/client/index.vue

@@ -222,6 +222,7 @@ export default {
   data() {
     return {
       saveNodeTmp:[],
+      functions:[],
       trans: [],
       authority: [],
       select:'',
@@ -338,7 +339,7 @@ export default {
       readSelectedAllNode.forEach(item => {
         this.findAllNode(item)
       })
-      this.ruleForm.function = [...this.saveNodeTmp]
+      this.functions = [...this.saveNodeTmp]
     },
 
     getFunction() {
@@ -359,6 +360,7 @@ export default {
     submit() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+          this.ruleForm.function = this.functions
            this.ruleForm.functions=[]
            if(this.ruleForm.hasOwnProperty('function')){
              for(var i =0;i<this.ruleForm.function.length;i++){
@@ -366,7 +368,7 @@ export default {
           this.ruleForm.functions.push(a)
         }
            }
-       
+      
           this.btnLoading = true
           if (this.ruleForm.id) {
             this.$api.editTenant(this.ruleForm).then(response => {

src/views/department/index.vue

@@ -66,7 +66,7 @@
                 >
                 <el-input v-model="userinfo.tenantName" placeholder="请输入所属租户" :readonly="true" ></el-input>
                 </el-tooltip> -->
-                <el-select style="width:100%" v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+                <el-select style="width:100%" v-model="ruleForm.tenant" :disabled="(userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:'')||disabled" placeholder="请选择">
 										<el-option
 										v-for="item in tenantList"
 										:key="item.id"
@@ -178,6 +178,7 @@ export default {
       }
     },
     handleAdd(updepartmentId,row) {
+      this.disabled=false
       this.title = '新增部门'
       this.visible = true
       if(updepartmentId==0){
@@ -204,6 +205,7 @@ export default {
       }
     },
     handleEdit(row) {
+      this.disabled=true
       this.title = '编辑部门'
       this.visible = true
        this.ruleForm = { ...row }

src/views/group/index.vue

@@ -62,7 +62,7 @@
     <el-dialog :title="title" :visible.sync="visible" width="500px" :before-close="close">
       <el-form v-if="visible" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" label-position="left">
         <el-form-item label="所属租户" prop="tenant"> 
-                <el-select style="width:100%" v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+                <el-select style="width:100%" v-model="ruleForm.tenant" :disabled="(userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:'')||disabled" placeholder="请选择">
 										<el-option
 										v-for="item in tenantList"
 										:key="item.id"
@@ -122,6 +122,7 @@ export default {
   },
   data() {
     return {
+      disabled:false,
       visible: false,
       loading: false,
       btnLoading: false,
@@ -164,6 +165,7 @@ export default {
       }
     },
     handleAdd(parentId) {
+      this.disabled=false
       this.title = '新增用户组'
       this.visible = true
       this.ruleForm = {
@@ -173,6 +175,7 @@ export default {
       }
     },
     handleEdit(row) {
+      this.disabled = true
       this.title = '编辑用户组'
       this.visible = true
       this.ruleForm = { ...row }

src/views/layout/index.vue

@@ -55,7 +55,10 @@
               <i class="el-icon-setting"></i>
               <span slot="title">应用功能管理</span>
             </el-menu-item>
-
+            <el-menu-item index="role" v-if="$permission('/admin/role')">
+              <i class="el-icon-eleme"></i>
+              <span slot="title">角色管理</span>
+            </el-menu-item>
             <el-menu-item index="department" v-if="$permission('/admin/department')">
               <i class="el-icon-copy-document"></i>
               <span slot="title">部门管理</span>
@@ -72,10 +75,7 @@
               <i class="el-icon-menu"></i>
               <span slot="title">用户组管理</span>
             </el-menu-item>
-            <el-menu-item index="role" v-if="$permission('/admin/role')">
-              <i class="el-icon-eleme"></i>
-              <span slot="title">角色管理</span>
-            </el-menu-item>
+            
              <!-- <el-menu-item index="dataPermission" >
               <i class="el-icon-eleme"></i>
               <span slot="title">数据权限管理</span>

src/views/position/index.vue

@@ -71,7 +71,7 @@
                 >
                 <el-input v-model="userinfo.tenantName" placeholder="请输入所属租户" :readonly="true" ></el-input>
                 </el-tooltip> -->
-                <el-select style="width:100%"  v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+                <el-select style="width:100%"  v-model="ruleForm.tenant" :disabled="(userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:'')||disabled" placeholder="请选择">
 										<el-option
 										v-for="item in tenantList"
 										:key="item.id"
@@ -140,6 +140,7 @@ export default {
   },
   data() {
     return {
+      disabled:false,
       visible: false,
       loading: false,
       btnLoading: false,
@@ -192,6 +193,7 @@ export default {
       }
     },
     handleAdd(parentId) {
+      this.disabled = false
       this.title = '新增职位'
       this.visible = true
       this.ruleForm = {
@@ -200,6 +202,7 @@ export default {
       }
     },
     handleEdit(row) {
+      this.disabled=true
       this.title = '编辑职位'
       this.visible = true
       this.ruleForm = { ...row }

src/views/role/index.vue

@@ -65,7 +65,7 @@
       <div style="height: 500px">
         <el-form v-if="visible" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" label-position="left">
           <el-form-item label="所属租户" prop="tenant">
-                <el-select style="width:100%" v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+                <el-select style="width:100%" v-model="ruleForm.tenant" :disabled="(userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:'')||disabled" placeholder="请选择">
 										<el-option
 										v-for="item in tenantList"
 										:key="item.id"
@@ -82,7 +82,7 @@
               :row-key="functionList.id"
               :data="functionList"
               v-loading="loading"
-              max-height="370"
+              max-height="330"
             >
               <el-table-column type="expand">
                 <template style="width:80%;" slot-scope="scope">
@@ -191,7 +191,7 @@ export default {
       dataList: [],
       multipleSelection: [],
       expands:[],
-      
+      disabled:false,
       queryParams: {
         size: 10,
         current: 1,
@@ -208,7 +208,8 @@ export default {
   },
   mounted() {
     this.getList()
-    this.getFunctionList()
+    var a = ''
+    this.getFunctionList(a)
     this.getTenantList()
   },
   computed: {
@@ -354,9 +355,11 @@ export default {
         tenant:this.userinfo.tenantId,
         function:[]
       }
+      this.disabled=false
     },
     handleEdit(row) {
       // console.log(row)
+      this.disabled=true
       this.title = '编辑角色'
       this.visible = true
       this.ruleForm = { ...row }
@@ -364,7 +367,9 @@ export default {
         this.checkList.push(row.permissionData[i].functionId)
       }
       this.permissionData = row.permissionData
-
+      if((this.userinfo.rList.filter(item=>item.roleId==1))[0]){
+        this.getFunctionList(row.tenant)
+      }
     },
     addpremissVisibale(val) {
       this.permissTitle = '添加数据权限管理'
@@ -391,8 +396,8 @@ export default {
       this.getList();
     },
     
-    getFunctionList() {
-      this.$api.getFuncListByTypeIsShow().then(response => {
+    getFunctionList(tenant) {
+      this.$api.getFuncListByTypeIsShow({tenant:tenant}).then(response => {
         this.functionList = response.data
       })
     },

src/views/user/index.vue

@@ -213,7 +213,7 @@
 								></el-input>
 							
 							</el-tooltip> -->
-								<el-select v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+								<el-select v-model="ruleForm.tenant" :disabled="(userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:'')||disabled" placeholder="请选择">
 										<el-option
 										v-for="item in tenantList"
 										:key="item.id"
@@ -479,6 +479,7 @@ import ret from "bluebird/js/release/util";
 		},
 		data() {
 			return {
+				disabled:false,
 				pswdshow: false,
 				showvisible: false,
 				visible: false,
@@ -642,6 +643,7 @@ import ret from "bluebird/js/release/util";
 				};
 			},
 			handleAdd() {
+				this.disabled=false
 				this.title = "新增人员";
 				this.pswdshow = true;
 				this.visible = true;
@@ -654,6 +656,7 @@ import ret from "bluebird/js/release/util";
 				};
 			},
 			handleEdit(row) {
+				this.disabled=true
 				this.title = "编辑人员";
 				this.pswdshow = false;
 				this.visible = true;