2022-09-16 增加租户及级联选择器带父级

src/views/apply/index.vue

@@ -38,7 +38,7 @@
            <p v-else :disabled="true">编辑</p>
             <el-dropdown-menu slot="dropdown" class="text-align_center">
              
-              <el-dropdown-item @click.native="handleDetails(scope.row)" v-if="$permission('/admin/apply/detail')">详情</el-dropdown-item>
+              <!-- <el-dropdown-item @click.native="handleDetails(scope.row)" v-if="$permission('/admin/apply/detail')">详情</el-dropdown-item> -->
               <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)" divided v-if="$permission('/admin/apply/delete')">删除</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>

src/views/client/index.vue

@@ -40,7 +40,7 @@
 				 <span >编辑</span>
 			</el-button> -->
             <el-dropdown-menu slot="dropdown" class="text-align_center">
-              <el-dropdown-item @click.native="handleDetails(scope.row)" v-if="$permission('/admin/client/detail')">详情</el-dropdown-item>
+              <!-- <el-dropdown-item @click.native="handleDetails(scope.row)" v-if="$permission('/admin/client/detail')">详情</el-dropdown-item> -->
               <el-dropdown-item @click.native="handleReset(scope.row)" v-if="$permission('/admin/client/reset')">重置密码</el-dropdown-item>
               <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)" divided v-if="$permission('/admin/client/delete')">删除</el-dropdown-item>
             </el-dropdown-menu>
@@ -128,12 +128,14 @@
           <el-col :span="24">
             <el-form-item label="功能权限" prop="function">
            <el-cascader
+           ref="FunctionCascader"
               v-model="ruleForm.function"
               :options="authority"
               :props="{multiple:true,value:'id',label:'name' }"
               collapse-tags
               placeholder="请输入功能权限"
               clearable
+              @change="downloadChange"
               style="width:100%"></el-cascader>
           <!-- <el-input v-model="ruleForm.function" placeholder="请输入功能权限"></el-input> -->
         </el-form-item>
@@ -219,6 +221,7 @@ export default {
   },
   data() {
     return {
+      saveNodeTmp:[],
       trans: [],
       authority: [],
       select:'',
@@ -308,8 +311,36 @@ export default {
         this.loading = false
       }).catch(error => {
         this.loading = false
+      });
+    },
+    // getCheckedNodes(){
+    //  var List = this.$refs.FunctionCascader.getCheckedNodes()
+    //  List.forEach(item => {
+    //   console.log(item)
+    //  });
+
+    // },
+    findAllNode(data) {
+      if (!this.saveNodeTmp.includes(data.path)) { 
+        if(data.path.length>1){
+          this.saveNodeTmp.push(data.path)
+        }   
+        
+      }
+      if (data.parent) {
+        this.findAllNode(data.parent)
+      }
+    },
+    // change时
+    downloadChange(data) {
+      let readSelectedAllNode = this.$refs.FunctionCascader.getCheckedNodes()
+      this.saveNodeTmp = []
+      readSelectedAllNode.forEach(item => {
+        this.findAllNode(item)
       })
+      this.ruleForm.function = [...this.saveNodeTmp]
     },
+
     getFunction() {
       this.$api.getFunctionList().then(response => {
         // console.log(response.data)

src/views/department/index.vue

@@ -4,6 +4,17 @@
       <el-form-item v-if="$permission('/admin/department/check')">
         <el-input v-model="queryParams.name" size="small" placeholder="请输入"></el-input>
       </el-form-item>
+      <el-form-item class="tenant" v-if="userinfo.rList?(userinfo.rList.filter(item=>item.roleId==1))[0]:''">
+        		<el-select v-model="queryParams.tenant" clearable placeholder="根据租户查询">
+					<el-option
+						v-for="item in tenantList"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id">
+					</el-option>
+				</el-select>
+      </el-form-item>
+			
       <el-form-item>
         <el-button type="" size="small" @click="getList" v-if="$permission('/admin/department/check')">查询</el-button>
         <el-button type="primary" size="small" @click="handleAdd(0)" v-if="$permission('/admin/department/add')">新增</el-button>
@@ -46,7 +57,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="80px" label-position="left">
            <el-form-item label="所属租户" prop="tenant">
-              <el-tooltip
+              <!-- <el-tooltip
                   class="item"
                   effect="dark"
                   :disabled="!userinfo.tenantName"
@@ -54,7 +65,15 @@
                   placement="top-start"
                 >
                 <el-input v-model="userinfo.tenantName" placeholder="请输入所属租户" :readonly="true" ></el-input>
-                </el-tooltip>
+                </el-tooltip> -->
+                <el-select style="width:100%" v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+										<el-option
+										v-for="item in tenantList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id">
+										</el-option>
+									</el-select> 
             </el-form-item>
        
         <el-form-item label="所属部门" prop="updepartment" v-if="show==true">
@@ -117,6 +136,7 @@ export default {
       btnLoading: false,
       total: 0,
       tableData: [],
+      tenantList:[],
       title: '',
       show:false,
       disabled:false,
@@ -125,19 +145,21 @@ export default {
         size: 10,
         current: 1,
         name: '',
-        tenant:localStorage.tenant
+        tenant:''
       },
       ruleForm: {},
       roleList:[],
       rules: {
         name: [{ required: true, message: '请输入部门名称', trigger: 'blur' },],
         parentId: [{ required: true, message: '请选择所属部门', trigger: 'change' },],
+        tenant:[{ required: true, message: "请选择", trigger: "change" }],
       },
     }
   },
   mounted() {
     this.getList()
     this.getRoleList()
+    this.getTenantList()
   },
   computed: {
     userinfo() {
@@ -162,6 +184,7 @@ export default {
        
         this.show=false
        this.ruleForm = {
+        tenant:this.userinfo.tenantId,
        updepartment:updepartmentId
       }
       }else{
@@ -173,6 +196,7 @@ export default {
         }
         
         this.ruleForm = {
+          tenant:this.userinfo.tenantId,
        updepartment:updepartmentId,
       updepartmentName:row.name,
       path:row.path
@@ -232,6 +256,11 @@ export default {
         this.loading = false
       })
     },
+    getTenantList(){
+				this.$api.getTenantList().then(response => {
+						this.tenantList = response.data
+					})
+			},
     getRoleList(){
         this.$api.getRoleList().then(response => {
         this.roleList = response.data
@@ -259,7 +288,7 @@ export default {
               this.btnLoading = false
             })
           } else {
-            this.ruleForm.tenant=this.userinfo.tenantId
+            // this.ruleForm.tenant=this.userinfo.tenantId
             this.$api.addDepartment(this.ruleForm).then(response => {
               this.$message.success('新增成功')
               this.btnLoading = false

src/views/group/index.vue

@@ -4,6 +4,16 @@
       <el-form-item v-if="$permission('/admin/group/check')">
         <el-input v-model="queryParams.name" size="small" placeholder="请输入"></el-input>
       </el-form-item>
+      <el-form-item class="tenant" v-if="userinfo.rList?(userinfo.rList.filter(item=>item.roleId==1))[0]:''">
+        		<el-select v-model="queryParams.tenant" clearable placeholder="根据租户查询">
+					<el-option
+						v-for="item in tenantList"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id">
+					</el-option>
+				</el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="" size="small" @click="getList" v-if="$permission('/admin/group/check')">查询</el-button>
         <el-button type="primary" size="small" @click="handleAdd(0)" v-if="$permission('/admin/group/add')">新增</el-button>
@@ -31,6 +41,7 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column prop="tenantName" label="所属租户" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remark" label="备注" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope">
@@ -50,7 +61,16 @@
     </div>
     <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-option
+										v-for="item in tenantList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id">
+										</el-option>
+									</el-select> 
+            </el-form-item>
         <el-form-item label="用户组名称" prop="name">
           <el-input v-model="ruleForm.name" placeholder="请输入角色名称"></el-input>
         </el-form-item>
@@ -107,18 +127,21 @@ export default {
       btnLoading: false,
       total: 0,
       tableData: [],
+      tenantList:[],
       title: '',
       userList:[],
       roleList:[],
       queryParams: {
          size: 10,
         current: 1,
-        name: ''
+        name: '',
+        tenant:''
       },
       ruleForm: {},
       rules: {
         name: [{ required: true, message: '请输入部门名称', trigger: 'blur' },],
         parentId: [{ required: true, message: '请选择所属部门', trigger: 'change' },],
+        tenant:[{ required: true, message: "请选择", trigger: "change" }],
       },
     }
   },
@@ -126,6 +149,7 @@ export default {
     this.getList()
     this.getUserList()
     this.getRoleList()
+    this.getTenantList()
   },
   computed: {
     userinfo() {
@@ -143,6 +167,7 @@ export default {
       this.title = '新增用户组'
       this.visible = true
       this.ruleForm = {
+        tenant:this.userinfo.tenantId,
         sort: 0,
         parentId: parentId
       }
@@ -164,6 +189,11 @@ export default {
         this.userList = response.data 
       })
     },
+    getTenantList(){
+				this.$api.getTenantList().then(response => {
+						this.tenantList = response.data
+					})
+			},
     getRoleList(){
       this.$api.getRoleList().then(response => {
         this.roleList = response.data 

src/views/layout/index.vue

@@ -139,6 +139,8 @@ export default {
         // localStorage.permission =JSON.stringify(JSON.parse(response.data).data) 
         this.$store.commit('SET_ADMIN_PERMISSION', response.data)
       // console.log(response.data)
+      }).catch(error=>{
+        this.$store.commit('SET_ADMIN_PERMISSION', [])
       })
     },
     getSelect() {
@@ -163,6 +165,10 @@ export default {
 }
 </script>
 <style lang="scss">
+  .tenant .el-input__inner{
+    height: 32px;
+    line-height: 32px;
+  }
   .role .el-icon-close{
 		display: none;
 	}

src/views/position/index.vue

@@ -4,6 +4,16 @@
       <el-form-item v-if="$permission('/admin/position/check')">
         <el-input v-model="queryParams.name" size="small" placeholder="请输入"></el-input>
       </el-form-item>
+      <el-form-item class="tenant" v-if="userinfo.rList?(userinfo.rList.filter(item=>item.roleId==1))[0]:''">
+        		<el-select v-model="queryParams.tenant" clearable placeholder="根据租户查询">
+					<el-option
+						v-for="item in tenantList"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id">
+					</el-option>
+				</el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="" size="small" @click="getList" v-if="$permission('/admin/position/check')">查询</el-button>
         <el-button type="primary" size="small" @click="handleAdd(0)" v-if="$permission('/admin/position/add')">新增</el-button>
@@ -24,6 +34,12 @@
         <span style="margin-left: 10px" v-if="scope.row.ismore==1">是</span>
       </template>
        </el-table-column>
+       <el-table-column
+				prop="tenantName"
+				label="所属租户"
+				align="center"
+				show-overflow-tooltip
+			></el-table-column>
       <el-table-column prop="describe" label="描述" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope">
@@ -46,7 +62,7 @@
       <el-form v-if="visible" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" label-position="left">
         
             <el-form-item label="所属租户" prop="tenant">
-              <el-tooltip
+              <!-- <el-tooltip
                   class="item"
                   effect="dark"
                   :disabled="!userinfo.tenantName"
@@ -54,7 +70,15 @@
                   placement="top-start"
                 >
                 <el-input v-model="userinfo.tenantName" placeholder="请输入所属租户" :readonly="true" ></el-input>
-                </el-tooltip>
+                </el-tooltip> -->
+                <el-select style="width:100%"  v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+										<el-option
+										v-for="item in tenantList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id">
+										</el-option>
+									</el-select>
             </el-form-item>
         <!-- <el-form-item label="所属部门" prop="department">
           <treeselect
@@ -121,12 +145,14 @@ export default {
       btnLoading: false,
       total: 0,
       tableData: [],
+      tenantList:[],
       title: '',
       roleList:[],
       queryParams: {
         size: 10,
         current: 1,
-        name: ''
+        name: '',
+        tenant:''
       },
       ruleForm: {
         ismore:0
@@ -135,12 +161,14 @@ export default {
         department: [{ required: true, message: '请选择所属部门', trigger: 'change' },],
         position: [{ required: true, message: '请输入职位名称', trigger: 'blur' },],
         ismost: [{ required: true, message: '请选择', trigger: 'change' },],
+        tenant:[{ required: true, message: "请选择", trigger: "change" }],
       },
     }
   },
   mounted() {
     this.getList()
     this.getRoleList()
+    this.getTenantList()
     // if(this.$permission('/admin/position/modify')==false){
     //   var a = document.getElementsByClassName('el-dropdown')
     //   for(var i = 1; i<a.length; i++){
@@ -167,6 +195,7 @@ export default {
       this.title = '新增职位'
       this.visible = true
       this.ruleForm = {
+        tenant:this.userinfo.tenantId,
         ismore: 0
       }
     },
@@ -192,6 +221,11 @@ export default {
         this.loading = false
       })
     },
+    getTenantList(){
+				this.$api.getTenantList().then(response => {
+						this.tenantList = response.data
+					})
+			},
     getRoleList(){
       this.$api.getRoleList().then(response => {
         this.roleList = response.data
@@ -219,7 +253,7 @@ export default {
               this.btnLoading = false
             })
           } else {
-            this.ruleForm.tenant=this.userinfo.tenantId
+            // this.ruleForm.tenant=this.userinfo.tenantId
             this.$api.addPosition(this.ruleForm).then(response => {
               this.$message.success('新增成功')
               this.btnLoading = false

src/views/role/index.vue

@@ -4,6 +4,16 @@
       <el-form-item v-if="$permission('/admin/role/check')">
         <el-input v-model="queryParams.name" size="small" placeholder="请输入"></el-input>
       </el-form-item>
+      <el-form-item class="tenant" v-if="userinfo.rList?(userinfo.rList.filter(item=>item.roleId==1))[0]:''">
+        		<el-select v-model="queryParams.tenant" clearable placeholder="根据租户查询">
+					<el-option
+						v-for="item in tenantList"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id">
+					</el-option>
+				</el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="" size="small" @click="getList" v-if="$permission('/admin/role/check')">查询</el-button>
         <el-button type="primary" size="small" @click="handleAdd()" v-if="$permission('/admin/role/add')">新增</el-button>
@@ -31,6 +41,7 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column prop="tenantName" label="所属租户" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remark" label="备注" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope">
@@ -53,7 +64,16 @@
     <el-dialog :title="title" :visible.sync="visible" width="1100px" max-height="800" :before-close="close">
       <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-option
+										v-for="item in tenantList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id">
+										</el-option>
+									</el-select> 
+            </el-form-item>
           <el-form-item label="角色名称" prop="name">
             <el-input v-model="ruleForm.name" placeholder="请输入角色名称"></el-input>
           </el-form-item>
@@ -163,6 +183,7 @@ export default {
       permissVisible: false,
       total: 0,
       tableData: [],
+      tenantList:[],
       title: '',
       permissTitle: '',
       showDataList:false,
@@ -181,12 +202,19 @@ export default {
       },
       rules: {
         name: [{ required: true, message: '请输入部门名称', trigger: 'blur' },],
+        tenant:[{ required: true, message: "请选择", trigger: "change" }],
       },
     }
   },
   mounted() {
     this.getList()
     this.getFunctionList()
+    this.getTenantList()
+  },
+  computed: {
+    userinfo() {
+      return this.$store.state.admin.userinfo
+    }
   },
   // watch:{
   //   "ruleForm.function"(val){
@@ -323,6 +351,7 @@ export default {
       this.visible = true
       this.checkList=[]
       this.ruleForm={
+        tenant:this.userinfo.tenantId,
         function:[]
       }
     },
@@ -367,6 +396,11 @@ export default {
         this.functionList = response.data
       })
     },
+    getTenantList(){
+				this.$api.getTenantList().then(response => {
+						this.tenantList = response.data
+					})
+			},
     getList() {
       this.loading = true
       this.$api.getRoleList(this.queryParams).then(response => {

src/views/user/index.vue

@@ -8,6 +8,17 @@
 					placeholder="请输入"
 				></el-input>
 			</el-form-item>
+			<el-form-item class="tenant" v-if="userinfo.rList?(userinfo.rList.filter(item=>item.roleId==1))[0]:''">
+        		<el-select v-model="queryParams.tenant" clearable placeholder="根据租户查询">
+					<el-option
+						v-for="item in tenantList"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id">
+					</el-option>
+				</el-select>
+      </el-form-item>
+			
 			<!-- <el-form-item label="用户名">
         <el-input v-model="queryParams.name" size="small" placeholder="请输入用户名"></el-input>
       </el-form-item> -->
@@ -58,6 +69,12 @@
 				align="center"
 				show-overflow-tooltip
 			></el-table-column>
+			<el-table-column
+				prop="tenantName"
+				label="所属租户"
+				align="center"
+				show-overflow-tooltip
+			></el-table-column>
 			<el-table-column label="是否启用" align="center" show-overflow-tooltip>
 				<template slot-scope="scope">
 					<span v-if="scope.row.state == 0">否</span>
@@ -76,7 +93,7 @@
 						<p @click="handleEdit(scope.row)" v-if="$permission('/admin/user/modify')">编辑</p>
 						<p v-else :disabled="true">编辑</p>
 						<el-dropdown-menu slot="dropdown" class="text-align_center">
-							<el-dropdown-item @click.native="handleDetails(scope.row)" divided  v-if="$permission('/admin/user/detail')">人员详情</el-dropdown-item>
+							<!-- <el-dropdown-item @click.native="handleDetails(scope.row)" divided  v-if="$permission('/admin/user/detail')">人员详情</el-dropdown-item> -->
 							<el-dropdown-item @click.native="handleReset(scope.row)" v-if="$permission('/admin/user/reset')">重置密码</el-dropdown-item>
 							<el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)" divided  v-if="$permission('/admin/user/delete')">删除</el-dropdown-item>
 						</el-dropdown-menu>
@@ -182,135 +199,32 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="所属租户" prop="tenant">
-							<el-tooltip
+							<!-- <el-tooltip
 								class="item"
 								effect="dark"
-								:disabled="!userinfo.tenantName"
-								:content="userinfo.tenantName"
+								:disabled="!ruleForm.tenantName"
+								:content="ruleForm.tenantName"
 								placement="top-start"
 							>
 								<el-input
-									v-model="userinfo.tenantName"
+									v-model="ruleForm.tenantName"
 									placeholder="请输入所属租户"
 									:readonly="true"
 								></el-input>
-							</el-tooltip>
+							
+							</el-tooltip> -->
+								<el-select v-model="ruleForm.tenant" :disabled="userinfo.rList?!(userinfo.rList.filter(item=>item.roleId==1))[0]:''" placeholder="请选择">
+										<el-option
+										v-for="item in tenantList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id">
+										</el-option>
+									</el-select>
 						</el-form-item>
 					</el-col>
 				</el-row>
 
-				<!-- <el-row :gutter="24">
-          <el-col :span="24">
-             <el-form-item label="职位[部门]" prop="nail">
-             <template>
-             <el-col :span="8" style="padding-left:0">
-                 <el-form-item label-width="0" prop="position">
-              <treeselect
-                  v-model="positionAndDepartment.department"
-                  :options="departmentList"
-                  :disable-branch-nodes="true"
-                  :show-count="true"
-                  placeholder="请选择部门"
-                  :normalizer="normalizer"
-               :multiple="false"
-              />
-                <el-tooltip
-                  class="item"
-                  effect="dark"
-                  :disabled="!labelVal"
-                  :content="labelVal"
-                  placement="top-start"
-                >
-            <el-cascader
-            ref="deptIdCascader"
-              v-model="positionAndDepartment.department"
-              :options="departmentList"
-              :show-all-levels="false"
-              :props="{ checkStrictly: true,value:'id',label:'name' }"
-              clearable
-              @change="handleChange"
-              placeholder="请选择部门">
-              </el-cascader>
-              </el-tooltip>
-              </el-form-item>
-                <el-form-item label-width="0" label-height="82" label-line-height="82px" prop="position">
-                  <el-select v-model="positionAndDepartment.position" filterable placeholder="请选择职位">
-                  <el-option v-for="item in positionList" :key="item.name" :label="item.position" :value="item.id"></el-option>
-                </el-select>
-              </el-form-item>
-             </el-col>
-               <el-col :span="2" style="height:82px;line-height:82px">
-                    <el-button  type="primary" size="mini" @click="showInputLabel" circle icon="el-icon-plus"></el-button>
-                </el-col> 
-                <el-col :span="14" style="padding-right:0">
-                  <el-input type="textarea" :rows="3" v-model="ruleForm.position" readonly="true" placeholder="请输入职位[部门]"></el-input>
-                <template>
-                  <div style="width:100%;height:75px;border:1px solid #C0C0C0;border-radius:4px;overflow:auto">
-                    <el-tag
-                      
-                      v-for="(tag,index) in ruleForm.positions" :key="index"
-                      closable
-                      :disable-transitions="false"
-                      @close="handleClose(index)">
-                      <span>{{tag.positionName}}[{{tag.departmentName}}]</span>
-                    </el-tag>
-                  </div>
-                </template>
-                </el-col>
-             </template>
-            </el-form-item>
-          </el-col>
-
-
-        <el-col :span="4">
-           <el-tag  effect="dark" type="primary" size="small" closable :disable-transitions="false" @close="handleCloseLabel()">11</el-tag>
-        </el-col>
-        <el-col :span="18">
-  <template>
-                 <el-col :span="10">
-            <el-form-item label-width="0" prop="department">
-              <treeselect
-                  v-model="ruleForm.department"
-                  :options="departmentList"
-                  :disable-branch-nodes="true"
-                  :show-count="true"
-                  placeholder="请选择"
-                  :normalizer="normalizer"
-              />
-            
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-             <el-form-item label-width="0"  prop="position">
-              <el-select v-model="ruleForm.apply" 
-            filterable
-            remote
-            placeholder="请选择所属应用"
-            :remote-method="remoteMethod"
-            :disabled="disabled"
-            style="display:block">
-            <el-option
-           
-              >
-              121
-            </el-option>
-           
-          </el-select>
-          
-            </el-form-item>
-          </el-col>
-                
-                 
-                </template>
-        </el-col>
-         
-                <el-col :span="2">
-                    <el-button  type="primary" size="mini" @click="showInputLabel" circle icon="el-icon-plus"></el-button>
-                </el-col>        
-
-
-        </el-row> -->
-
 				<el-row :gutter="24">
 					<el-col :span="24">
 						<el-form-item label="职位[部门]" prop="nail">
@@ -533,7 +447,7 @@
 					<span>{{ ruleForm.apply.nail }}</span>
 				</el-form-item>
         <el-form-item label="所属租户 :" class="marginB">
-					<span>{{ userinfo.tenantName }}</span>
+					<span>{{ ruleForm.apply.tenantName }}</span>
 				</el-form-item>
         <el-form-item label="用户组 :" class="marginB">
 					<span v-for="item in ruleForm.apply.groupList">{{ item.name }}</span>
@@ -572,6 +486,7 @@ import ret from "bluebird/js/release/util";
 				btnLoading: false,
 				total: 0,
 				tableData: [],
+				tenantList:[],
 				title: "",
 				roleList: [
 					{
@@ -600,6 +515,7 @@ import ret from "bluebird/js/release/util";
 					current: 1,
 					// username: '',
 					name: "",
+					tenant:''
 				},
 				labelVal: "",
 				departmentList: [],
@@ -639,6 +555,7 @@ import ret from "bluebird/js/release/util";
 					// position: [{ required: true, message: '请选择职位', trigger: 'change' },],
 					// department: [{ required: true, message: '请选择部门', trigger: 'change' },],
 					state: [{ required: true, message: "请选择", trigger: "change" }],
+					tenant:[{ required: true, message: "请选择", trigger: "change" }],
 				},
 			};
 		},
@@ -660,6 +577,7 @@ import ret from "bluebird/js/release/util";
 		},
 		computed: {
 			userinfo() {
+				
 				return this.$store.state.admin.userinfo;
 			},
 		},
@@ -669,6 +587,7 @@ import ret from "bluebird/js/release/util";
 			this.getPositionList();
 			this.getGroupList();
 			this.getRoleList();
+			this.getTenantList()
 		},
 		methods: {
 			change(e) {
@@ -727,6 +646,7 @@ import ret from "bluebird/js/release/util";
 				this.pswdshow = true;
 				this.visible = true;
 				this.ruleForm = {
+					tenant:this.userinfo.tenantId,
 					gender: 0,
 					state: 1,
 					positions: [],
@@ -764,6 +684,11 @@ import ret from "bluebird/js/release/util";
 					this.groupList = response.data;
 				});
 			},
+			getTenantList(){
+				this.$api.getTenantList().then(response => {
+						this.tenantList = response.data
+					})
+			},
 			getRoleList() {
 				this.$api.getRoleList().then((response) => {
 					this.roleList = response.data;
@@ -848,7 +773,7 @@ import ret from "bluebird/js/release/util";
 									this.btnLoading = false;
 								});
 						} else {
-							this.ruleForm.tenant = this.userinfo.tenantId;
+							// this.ruleForm.tenant = this.userinfo.tenantId;
 							this.$api
 								.addPersonnel(this.ruleForm)
 								.then((response) => {