修改报警搜索栏格式以及生产计划月份参数

src/views/DeviceManage/callPolice/index.vue

@@ -5,9 +5,21 @@
 			<!--工具栏-->
 			<div class="head-container">
 
-				<el-input v-model="query.number" clearable size="small" placeholder="车辆名称" style="width:180px;"/>
-				<el-input v-model="query.driver" clearable size="small" placeholder="司机" style="width:180px;"/>
-				<el-input v-model="query.carclass" clearable size="small" placeholder="车辆类型" style="width:180px;"/>
+				<label class="el-form-item-label" style="font-weight: 500;">车辆牌号</label>
+				<el-select v-model="query.number" placeholder="车辆牌号" style="width:180px;">
+					<el-option v-for="(obj,index) in carInforSelectList" :label="obj.number" :value="obj.number" :key="index"></el-option>
+				</el-select>
+
+				<label class="el-form-item-label" style="font-weight: 500;">司机姓名</label>
+				<el-select v-model="query.driver" placeholder="司机姓名" style="width:180px;">
+					<el-option v-for="(obj,index) in driverInforSelectList" :label="obj.name" :value="obj.name" :key="index"></el-option>
+				</el-select>
+
+				<label class="el-form-item-label" style="font-weight: 500;">车辆类型</label>
+				<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-date-picker
 					v-model="query.createTime"
 					type="datetimerange"
@@ -34,7 +46,8 @@
 							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName" height="64vh">
 								<el-table-column prop="name" label="设备编号" align="center"></el-table-column>
 								<el-table-column prop="alarmTime" label="报警时间" align="center"></el-table-column>
-								<el-table-column prop="number" label="车辆" align="center"></el-table-column>
+								<el-table-column prop="number" label="车辆牌号" align="center"></el-table-column>
+								<el-table-column prop="carclass" label="车辆类型" align="center"></el-table-column>
 								<el-table-column prop="driver" label="司机" align="center"></el-table-column>
 								<el-table-column prop="type" label="报警类型" align="center" :formatter="baojingleixingChange"></el-table-column>
 								<el-table-column prop="areaName" label="报警区域" align="center"></el-table-column>
@@ -115,6 +128,12 @@ export default {
 			query:{},
 			tableData: [],
 			selectList:[],
+			//车辆类型数据
+			carTypeData:[],
+			//车辆信息数据
+			carInforSelectList:[],
+			//司机信息数据
+			driverInforSelectList:[],
 			form: {
 				title:'新增报警',
 				visible:false,
@@ -155,6 +174,24 @@ export default {
 					this.tableData = res.content;
 					this.total = res.totalElements;
 				})
+				//获取车辆类型
+				HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
+					if(res.code == 200){
+						this.carTypeData = res.data.content;
+					}
+				})
+				//获取车辆信息
+				HttpReq.truckDispatching.carInformationQuery({size:9999}).then((res) => {
+					if(res.code == 200){
+						this.carInforSelectList = res.data.content;
+					}
+				})
+				//获取司机人员信息
+				HttpReq.truckDispatching.driverManagementPCQuery({size:9999}).then((res) => {
+					if(res.code == 200){
+						this.driverInforSelectList = res.data.content;
+					}
+				})
 			})
 
 		},

src/views/productionPlanManagement/productionPlan/index.vue

@@ -317,7 +317,8 @@ export default {
 		//新增生产计划
 		reqAddItem(form, item){
 			let lastData = {...item};
-			HttpReq.truckDispatching.addOnePlan(item).then((res) => {
+			lastData.month = this.currentTime(item.month) + '-01 00:00:00';
+			HttpReq.truckDispatching.addOnePlan(lastData).then((res) => {
 				form.visible = false;
 				if(res.code == 200){
 					this.$notify({
@@ -340,7 +341,8 @@ export default {
 		//修改生产计划
 		reqUpdateItem(form, item){
 			let lastData = {...item};
-			HttpReq.truckDispatching.addOnePlan(item).then((res) => {
+			lastData.month = this.currentTime(item.month) + '-01 00:00:00';
+			HttpReq.truckDispatching.addOnePlan(lastData).then((res) => {
 				form.visible = false;
 				if(res.code == 200){
 					this.$notify({