修改

src/assets/js/common.js

@@ -2000,16 +2000,8 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//车辆调度——只获取采区接口
-			onlyGetMiningAreaQuery: function(param){
-				return request({
-					url: '/api/AreaNew/class',
-					method: 'get',
-					params:param,
-				})
-			},
 			//车辆调度——只获取卸区接口
-			onlyGetXieQuQuery: function(param){
+			onlyGetMiningAreaQuery: function(param){
 				return request({
 					url: '/api/AreaNew/class',
 					method: 'get',

src/views/IntelligentDispatchManagement/carManualScheduling/index.vue

@@ -39,8 +39,8 @@
 								</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 carInformationDataAll" :label="obj.number" :value="obj.number" :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 ? obj.number : obj.name" :value="obj.number ? obj.number : obj.name" :key="index"></el-option>
 								</el-select>
 							</el-form-item>
 							<br>
@@ -54,6 +54,12 @@
 							<el-form-item label="调度截止日期" style="display: inline-block;">
 								<el-date-picker v-model="form.endTime" type="datetime" placeholder="选择日期时间" style="width:220px;" :disabled='form.duration != "长期" '></el-date-picker>
 							</el-form-item>
+							<el-form-item label="调度类型" style="display: inline-block;">
+								<el-select v-model="form.orderClass" placeholder="请选择调度类型" style="width:220px;">
+									<el-option label="装车" value="0"></el-option>
+									<el-option label="卸车" value="1"></el-option>
+								</el-select>
+							</el-form-item>
 							<br>
 							<el-form-item label="说明" style="display: inline-block;">
 								<el-input type="textarea" v-model="form.carshow" style="width:545px;"></el-input>
@@ -118,7 +124,15 @@ export default {
 				//获取总的车辆信息
 				HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'电铲'}).then((res) => {
 					if(res.code == 200){
-						this.carInformationDataAll = res.data.content;
+						let aa1 = [];
+						aa1 = res.data.content;
+						//获取卸点区域信息
+						HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => {
+							res.forEach((item,index)=>{
+								aa1.push(item);
+							});
+							this.carInformationDataAll = aa1;
+						})
 					}
 				})
 				//获取车队
@@ -127,17 +141,6 @@ export default {
 						this.carFleetData = res.data.content;
 					}
 				})
-				//获取区域信息
-				HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => {
-					let caiquxiequ1 = res;
-					HttpReq.truckDispatching.onlyGetXieQuQuery({size:9999}).then((res) => {
-						res.forEach((item,index)=>{
-							caiquxiequ1.push(item);
-						})
-						console.log('caiquxiequ1',caiquxiequ1);
-						//this.areaInformationData = caiquxiequ1;
-					})
-				})
 				//获取车辆类型
 				HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
 					if(res.code == 200){

src/views/IntelligentDispatchManagement/carVoiceSupplement/index.vue

@@ -98,8 +98,8 @@
 				</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.number" :value="obj.number" :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 ? obj.number : obj.name" :value="obj.number ? obj.number : obj.name" :key="index"></el-option>
 					</el-select>
 				</el-form-item>
 				<br>
@@ -311,7 +311,15 @@ export default {
 								array1.push(item);
 							}
 						})
-						this.areaInformationDataAdd = array1;
+						this.$nextTick(()=>{
+							//获取卸点区域信息
+							HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => {
+								res.forEach((item,index)=>{
+									array1.push(item);
+								});
+								this.areaInformationDataAdd = array1;
+							})
+						})
 					}
 				})
 				//获取用于调度人的人员