1

src/views/IntelligentDispatchManagement/carManualSchedulingManagement/index.vue

@@ -9,12 +9,10 @@
 				<el-input v-model="query.odd" clearable size="small" placeholder="请输入调度单号" style="width:180px;"/>
 
 				<label class="el-form-item-label" style="font-weight: 500;">车辆类型</label>
-				<el-select v-model="query.carclass" placeholder="请选择车辆类型" style="width:180px;">
-					<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="query.carclass" placeholder="请选择卡车类型" style="width:180px;">
+					<el-option v-for="(obj,index) in carTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
 				</el-select>
+				
 				<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
 				<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
 			</div>
@@ -29,7 +27,7 @@
 							<el-button type="primary" @click="jumpTo()">人工调度</el-button>
 						</div>
 						<div class="content">
-							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
+							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName" height="60vh">
 								<el-table-column prop="odd" label="调度单号" align="center"></el-table-column>
 								<el-table-column prop="carclass" label="车辆类型" align="center"></el-table-column>
 								<el-table-column prop="carNo" label="车牌号" align="center"></el-table-column>
@@ -82,6 +80,7 @@ export default {
 			size: 10,
 			total: 0,
 			query:{},
+			carTypeData:[],
 			tableData: [],
 			selectList:[],
 			carInformationData:[],
@@ -122,6 +121,12 @@ export default {
 						this.total = res.data.totalElements;
 					}
 				})
+				//获取车辆类型
+				HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
+					if(res.code == 200){
+						this.carTypeData = res.data.content;
+					}
+				})
 			})
 
 		},

src/views/IntelligentDispatchManagement/carVoiceSupplement/index.vue

@@ -9,12 +9,10 @@
 				<el-input v-model="query.odd" clearable size="small" placeholder="请输入调度单号" style="width:180px;"/>
 
 				<label class="el-form-item-label" style="font-weight: 500;">车辆类型</label>
-				<el-select v-model="query.carname" placeholder="请选择车辆类型" style="width:180px;">
-					<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="query.carclass" placeholder="请选择卡车类型" style="width:180px;">
+					<el-option v-for="(obj,index) in carTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
 				</el-select>
+				
 				<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
 				<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
 			</div>
@@ -29,7 +27,7 @@
 							<el-button type="primary" @click="toAdd()">人工补录</el-button>
 						</div>
 						<div class="content">
-							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
+							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName" height="60vh">
 								<el-table-column prop="odd" label="调度单号" align="center"></el-table-column>
 								<el-table-column prop="carclass" label="车辆类型" align="center"></el-table-column>
 								<el-table-column prop="carNo" label="车牌号" align="center"></el-table-column>
@@ -185,6 +183,12 @@ export default {
 						this.total = res.data.totalElements;
 					}
 				})
+				//获取车辆类型
+				HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
+					if(res.code == 200){
+						this.carTypeData = res.data.content;
+					}
+				})
 			})
 
 		},