修改

src/views/IntelligentDispatchManagement/carManualScheduling/index.vue

@@ -35,15 +35,12 @@
 							</el-form-item>
 							<el-form-item label="车辆类型" style="display: inline-block;">
 								<el-select v-model="form.carclass" placeholder="请选择卡车类型" style="width:220px;">
-									<el-option label="挖机" value="挖机"></el-option>
-									<el-option label="铲车" value="铲车"></el-option>
-									<el-option label="卡车" value="卡车"></el-option>
-									<el-option label="清扫车" value="清扫车"></el-option>
+									<el-option v-for="(obj,index) in carTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
 								</el-select>
 							</el-form-item>
 							<el-form-item label="调度目的地" style="display: inline-block;">
-								<el-select v-model="form.destination" placeholder="请选择调度目的地" style="width:220px;">
-									<el-option v-for="(obj,index) in areaInformationData" :label="obj.name" :value="obj.name" :key="index"></el-option>
+								<el-select v-model="form.destination" placeholder="请选择电铲车" style="width:220px;">
+									<el-option v-for="(obj,index) in carInformationDataAll" :label="obj.number" :value="obj.number" :key="index"></el-option>
 								</el-select>
 							</el-form-item>
 							<br>
@@ -86,6 +83,7 @@ export default {
 			carInformationData:[],
 			areaInformationData:[],
 			carTypeData:[],
+			carInformationDataAll:[],
 			rules: {
 				// odd: [
 				// 	{required: true, message: '请输入调度单号', trigger: 'blur' }
@@ -117,6 +115,12 @@ export default {
 				HttpReq.truckDispatching.carPeopStatus1Query(param).then((res) => {
 					this.carInformationData = res;
 				})
+				//获取总的车辆信息
+				HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'电铲'}).then((res) => {
+					if(res.code == 200){
+						this.carInformationDataAll = res.data.content;
+					}
+				})
 				//获取车队
 				HttpReq.truckDispatching.carFleetQuery({size:9999}).then((res) => {
 					if(res.code == 200){

src/views/IntelligentDispatchManagement/carVoiceSupplement/index.vue

@@ -35,7 +35,6 @@
 								<el-table-column prop="carNo" label="车牌号" align="center"></el-table-column>
 								<el-table-column prop="createTime" label="调度时间" align="center"></el-table-column>
 								<el-table-column prop="name" label="调度人" align="center"></el-table-column>
-								<!-- <el-table-column prop="startad" label="调度起点" align="center"></el-table-column> -->
 								<el-table-column prop="destination" label="调度目的地" align="center"></el-table-column>
 								<el-table-column prop="flag" label="调度类型" align="center" :formatter="flagChange"></el-table-column>
 								<el-table-column prop="carshow" label="说明" align="center"></el-table-column>
@@ -94,21 +93,13 @@
 					<el-input v-model="formAdd.odd" clearable size="small" placeholder="请输入调度单号" style="width:220px;"/>
 				</el-form-item>
 				<el-form-item label="车辆类型" style="display: inline-block;">
-					<el-select v-model="formAdd.carname" placeholder="请选择卡车类型" style="width:220px;">
-						<el-option label="挖机" value="挖机"></el-option>
-						<el-option label="铲车" value="铲车"></el-option>
-						<el-option label="卡车" value="卡车"></el-option>
-						<el-option label="清扫车" value="清扫车"></el-option>
+					<el-select v-model="formAdd.carname" placeholder="请选择车辆类型" style="width:220px;">
+						<el-option v-for="(obj,index) in carTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
 				</el-select>
 				</el-form-item>
-				<!-- <el-form-item label="起点" style="display: inline-block;">
-					<el-select v-model="formAdd.destination" placeholder="请选择起点" style="width:220px;">
-						<el-option v-for="(obj,index) in areaInformationDataAdd" :label="obj.name" :value="obj.name" :key="index"></el-option>
-					</el-select>
-				</el-form-item> -->
 				<el-form-item label="目的地" style="display: inline-block;">
-					<el-select v-model="formAdd.startad" placeholder="请选择目的地" style="width:220px;">
-						<el-option v-for="(obj,index) in areaInformationDataAdd" :label="obj.name" :value="obj.name" :key="index"></el-option>
+					<el-select v-model="formAdd.startad" placeholder="请选择点铲车" style="width:220px;">
+						<el-option v-for="(obj,index) in areaInformationDataAdd" :label="obj.number" :value="obj.number" :key="index"></el-option>
 					</el-select>
 				</el-form-item>
 				<br>
@@ -116,7 +107,9 @@
 					<el-date-picker v-model="formAdd.endTime" type="datetime" placeholder="选择日期时间" style="width:220px;"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="调度人" style="display: inline-block;">
-					<el-input v-model="formAdd.name" clearable size="small" placeholder="请输入调度人" style="width:220px;"/>
+					<el-select v-model="formAdd.name" placeholder="请选择调度人" style="width:220px;">
+						<el-option v-for="(obj,index) in renyuanALLData" :label="obj.name" :value="obj.name" :key="index"></el-option>
+					</el-select>
 				</el-form-item>
 				<br>
 				<el-form-item label="说明" style="display: inline-block;">
@@ -146,6 +139,7 @@ export default {
 			tableData: [],
 			selectList:[],
 			carInformationData:[],
+			renyuanALLData:[],
 			form: {
 				title:'',
 				visible:false,
@@ -311,6 +305,19 @@ export default {
 				HttpReq.truckDispatching.carInformationQuery(param).then((res) => {
 					if(res.code == 200){
 						this.carInformationDataAdd = res.data.content;
+						let array1 = [];
+						res.data.content.forEach((item,index)=>{
+							if(item.carclass == '电铲'){
+								array1.push(item);
+							}
+						})
+						this.areaInformationDataAdd = array1;
+					}
+				})
+				//获取用于调度人的人员
+				HttpReq.truckDispatching.driverManagementPCQuery({size:9999}).then((res) => {
+					if(res.code == 200){
+						this.renyuanALLData = res.data.content;;
 					}
 				})
 				//获取车队
@@ -320,9 +327,9 @@ export default {
 					}
 				})
 				//获取区域信息
-				HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => {
-					this.areaInformationDataAdd = res;
-				})
+				// HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => {
+				// 	this.areaInformationDataAdd = res;
+				// })
 				//获取车辆类型
 				HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
 					if(res.code == 200){

src/views/carManagement/carInformation/index.vue

@@ -354,7 +354,11 @@ export default {
 		},
 		//保养时间转换
 		timeChange(row){
+			if(!row.time){
+				return ''
+			}else{
 				return row.time == '' ?  '' : this.currentTime(row.time);
+			}
 		},
 		currentTime(time){
 			var date = new Date(time);