用户绑定公司id 角色界面 添加type 判断

@@ -33,7 +33,7 @@
 			<!--</el-table-column>-->
 			<el-table-column prop="description" label="描述" min-width="160" >
 			</el-table-column>
-			<el-table-column prop="type" label="类型" min-width="80" sortable>
+			<el-table-column prop="type" label="类型" :formatter="formatType" min-width="80" sortable>
 			</el-table-column>
 			<el-table-column prop="businessLicense" label="工商代码" min-width="180" >
 			</el-table-column>
@@ -133,11 +133,11 @@
                 companyOption: [
 					{
 						label: "集团",
-						value: "集团"
+						value: "1"
 					},
 					{
                         label: "公司",
-                        value: "公司"
+                        value: "2"
 					}
 				],
                 treeDefaultProps: {
@@ -195,6 +195,26 @@
 			}
 		},
 		methods: {
+
+			//类型显示转换
+			formatType: function (row, column) {
+				let msg = '未知';
+				switch (row.type) {
+					case "1":
+						msg = '集团';
+						break;
+					case "2":
+						msg = '公司';
+						break;
+					case "3":
+						msg = '部门';
+						break;
+					case "4":
+						msg = '岗位';
+						break;
+				}
+				return msg;
+			},
 			//性别显示转换
 			formatSex: function (row, column) {
 				return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';

@@ -63,6 +63,17 @@
 		<!--编辑界面-->
 		<el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
+
+				<el-form-item label="所属公司" prop="companyId">
+					<el-select v-model="editForm.companyId" filterable placeholder="请选择">
+						<el-option
+								v-for="item in options"
+								:key="item.roleId"
+								:label="item.roleName"
+								:value="item.roleId">
+						</el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="ID">
 					<span>{{editForm.userId}}</span>
 				</el-form-item>
@@ -125,6 +136,17 @@
 		<!--新增界面-->
 		<el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
+
+				<el-form-item label="所属公司" prop="companyId">
+					<el-select v-model="addForm.companyId" filterable placeholder="请选择">
+						<el-option
+								v-for="item in options"
+								:key="item.roleId"
+								:label="item.roleName"
+								:value="item.roleId">
+						</el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="账号" prop="username">
 					<el-input v-model="addForm.username" aria-placeholder="用户名长度在5-11位,支持英文和数字"></el-input>
 				</el-form-item>
@@ -185,6 +207,7 @@
 	import NProgress from 'nprogress'
 	import { getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole } from '../../api/user';
     import { getList} from '../../api/role_api';
+	import { getList as getRoleList} from '../../api/role_api';
     import moment from 'moment'
 	export default {
 		data() {
@@ -223,7 +246,8 @@
 					realname: '',
 					email:	'',
 					mobilephone: '',
-					state: 'true'
+					state: 'true',
+					companyId:''
 				},
 
 				addFormVisible: false,//新增界面是否显示
@@ -234,6 +258,9 @@
 					],
 					password: [
 						{ required: true, message: '请输入密码,用户名长度在6-18位,支持英文和数字和非空字符', trigger: 'blur'}
+					],
+					companyId: [
+						{ required: true, message: '请选择所属您的所属公司', trigger: 'blur' },
 					]
 				},
 				//用户角色配置
@@ -247,7 +274,8 @@
                     realname: '',
                     email:	'',
                     mobilephone: '',
-					age: 1
+					age: 1,
+					companyId:''
 				},
                 roleEditForm: {
                     userId: 1,
@@ -255,7 +283,8 @@
 					roles: []
 				},
 				roles: [],
-                roleIds: []
+                roleIds: [],
+				options: []
 
 			}
 		},
@@ -292,6 +321,20 @@
 				});
 
 			},
+
+			// 获取公司列表
+			getCompanyNmae(){
+				let para = {
+					type: "2"
+				};
+				getRoleList(para).then((res) => {
+					this.options = res.data.list;
+					this.listLoading = false;
+					//NProgress.done();
+				}).catch(() => {
+
+				});
+			},
 			//删除
 			handleDel: function (index, row) {
 				this.$confirm('确认删除该记录吗?', '提示', {
@@ -375,7 +418,8 @@
                     realname: '',
                     email:	'',
                     mobilephone: '',
-                    age: 1
+                    age: 1,
+					companyId:''
 				};
 			},
 			//编辑
@@ -444,6 +488,7 @@
 					}
 				});
 			},
+
 			selsChange: function (sels) {
 				this.sels = sels;
 			},
@@ -508,6 +553,7 @@
 		},
 		mounted() {
 			this.getUsers();
+			this.getCompanyNmae();
 		},
 		computed: {
             hideShow() {//当图片多于一张的时候，就隐藏上传框