1

src/assets/js/common.js

@@ -2576,6 +2576,14 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
+			//所有角色信息
+			apirolesallQuery: function(param){
+				return request({
+					url: '/api/roles/all',
+					method: 'get',
+					params:param,
+				})
+			},
 
 			
 

src/views/driverManagement/index.vue

@@ -62,6 +62,11 @@
 				<el-form-item label="用户名" prop="userName">
 					<el-input v-model="form.item.userName" style="width:280px;" placeholder="请选择用户名" :disabled="form.reqType == 'edit'"/>
 				</el-form-item>
+				<el-form-item label="角色" prop="roles">
+					<el-select v-model="rolesLonely" placeholder="请选择角色" style="width:280px;" :disabled="form.reqType == 'edit'">
+						<el-option v-for="(obj,index) in getAllapirolesData" :label="obj.name" :value="obj.name" :key="index"></el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="电话" prop="phone">
 					<el-input v-model="form.item.phone" style="width:280px;" placeholder="请输入电话"/>
 				</el-form-item>
@@ -127,6 +132,10 @@ export default {
 			xiugaiUserData:{},
 			//所有用户信息
 			getAllSystemUserNameData:[],
+			//所有角色信息
+			getAllapirolesData:[],
+			//角色单独属性
+			rolesLonely:"",
 			form: {
 				title:'新增司机人员',
 				visible:false,
@@ -164,6 +173,9 @@ export default {
 				post: [
 					{required: true, message: '请输入岗位', trigger: 'blur' }
 				],
+				roles: [
+					{required: true, message: '请输入角色', trigger: 'blur' }
+				],
 				company: [
 					{required: true, message: '请输入公司名称', trigger: 'blur' }
 				],
@@ -253,6 +265,10 @@ export default {
 				HttpReq.truckDispatching.getAllSystemUserNameQuery({size:9999}).then((res) => {
 					this.getAllSystemUserNameData = res.content;
 				})
+				//获取所有的角色信息
+				HttpReq.truckDispatching.apirolesallQuery().then((res) => {
+					this.getAllapirolesData = res;
+				})
 			})
 
 		},
@@ -299,6 +315,11 @@ export default {
 					this.xiugaiUserData = item1;
 				}
 			})
+			this.getAllapirolesData.forEach((item1,index1)=>{
+				if(item1.id == this.xiugaiUserData.roles[0].id){
+					this.rolesLonely = item1.name;
+				}
+			})
 		},
 		toDelete(item) {
 			var id = item.id;
@@ -353,11 +374,11 @@ export default {
 					panduanchongfu = false;
 				}
 			})
-			// this.getAllSystemUserNameData.forEach((obj1,index1)=>{
-			// 	if(obj1.phone == item.phone){
-			// 		panduanchongfu2 = false;
-			// 	}
-			// })
+			this.getAllSystemUserNameData.forEach((obj1,index1)=>{
+				if(obj1.phone == item.phone){
+					panduanchongfu2 = false;
+				}
+			})
 			if(panduanchongfu && panduanchongfu2){
 				let lastData = {...item};
 				HttpReq.truckDispatching.driverManagementPCAdd(lastData).then((res) => {
@@ -384,7 +405,7 @@ export default {
 				addUsers.createTime = this.currentTime();
 				addUsers.dept = {id:this.lastDeptData.id};
 				addUsers.deptId = this.lastDeptData.id;
-				addUsers.email = lastData.phone + '@qq.com';
+				addUsers.email = lastData.userName + '@qq.com';
 				addUsers.enabled = "true";
 				addUsers.gender = "男";
 				addUsers.id = null;
@@ -393,6 +414,11 @@ export default {
 						addUsers.jobs = [{id:item1.id}];
 					}
 				})
+				this.getAllapirolesData.forEach((item1,index1)=>{
+					if(item1.name == rolesLonely){
+						addUsers.roles = [{id:item1.id}];
+					}
+				})
 				addUsers.nickName = lastData.userName;
 				addUsers.phone = lastData.phone;
 				addUsers.pwdResetTime = "2022-11-10 14:49:59";