修改

src/assets/js/common.js

@@ -2419,10 +2419,14 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
-			
-			
-
-
+			//采点管理中没有绑定的铲车
+			apiCarPeopZhanyongQuery: function(param){
+				return request({
+					url: '/api/CarPeop/zhanyong',
+					method: 'get',
+					params:param,
+				})
+			},
 			
 
 

src/views/DeviceManage/deviceMan/index.vue

@@ -240,8 +240,8 @@ export default {
 				form.status.cu = 0
 			});
 			//新增通信账号
-			let communicationAccount = lastData.number;
-			HttpReq.truckDispatching.communicationAccountAdd({name:communicationAccount}).then((res) => {})
+			// let communicationAccount = lastData.number;
+			// HttpReq.truckDispatching.communicationAccountAdd({name:communicationAccount}).then((res) => {})
 		},
 		//修改设备
 		reqUpdateItem(form, item){
@@ -286,7 +286,7 @@ export default {
 				this.loadData();
 			})
 			//删除通信账号
-			HttpReq.truckDispatching.communicationAccountDel({name:communicationName}).then((res) => {})
+			// HttpReq.truckDispatching.communicationAccountDel({name:communicationName}).then((res) => {})
 		},
 	}
 }

src/views/carManagement/carInformation/index.vue

@@ -15,10 +15,7 @@
 
 				<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-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>
@@ -66,10 +63,10 @@
 		<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
 			<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
 				<el-form-item label="车牌号" prop="number">
-					<el-input v-model="form.item.number" style="width:160px;" placeholder="请输入车牌号"/>
+					<el-input v-model="form.item.number" style="width:160px;" placeholder="请输入车牌号" :disabled="form.reqType == 'edit'"/>
 				</el-form-item>
 				<el-form-item label="卡车类型" prop="carclass">
-					<el-select v-model="form.item.carclass" placeholder="请选择卡车类型" style="width:160px;">
+					<el-select v-model="form.item.carclass" placeholder="请选择卡车类型" style="width:160px;" :disabled="form.reqType == 'edit'">
 						<el-option v-for="(obj,index) in carTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
 					</el-select>
 				</el-form-item>
@@ -152,6 +149,9 @@ export default {
 				number: [
 					{required: true, message: '请输入车牌号', trigger: 'blur' }
 				],
+				equipmentName: [
+					{required: true, message: '请选择终端设备', trigger: 'change' }
+				],
 			},
 		}
 	},
@@ -247,12 +247,12 @@ export default {
 		},
 		toDelete(item) {
 			var id = item.id;
-			this.$confirm('确认删除该条数据吗?', '提示', {
+			this.$confirm( item.carclass == '铲车' ? '该车为铲车，如要删除，请在删除以后为采点管理中对应的采点分配新的铲车！' : '确认删除该条数据吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
-				type: 'warning'
+				type: item.carclass == '铲车' ? 'error' : 'warning'
 			}).then((e) => {
-				this.reqRemoveProject([id])
+				this.reqRemoveProject([id],item)
 			}).catch((e) => {})
 		},
 		pageChange(e) {
@@ -327,7 +327,7 @@ export default {
 			});
 		},
 		//删除车辆
-		reqRemoveProject(item){
+		reqRemoveProject(item,items){
 			HttpReq.truckDispatching.carInformationDel(item).then((res) => {
 				if(res.status == 400){
 					this.$notify({
@@ -344,6 +344,23 @@ export default {
 				}
 				this.loadData();
 			})
+			if(items.carclass == '铲车'){
+				HttpReq.truckDispatching.RegionalCaiDianQuery({areashovel:items.number}).then((res) => {
+					if(res.code == 200 && res.data.totalElements != 0){
+						this.$nextTick(()=>{
+							this.$notify({
+								title: '请在采点管理中为 ' + res.data.content[0].areaName + '/' + res.data.content[0].name + ' 添加新的铲车！',
+								type: 'warning',
+								duration: 2500
+							});
+						})
+						let lastData = {...res.data.content[0]};
+						lastData.areashovel = '';
+						HttpReq.truckDispatching.RegionalCaiDianUpdate(lastData).then((res) => {})
+					}
+				})
+			}
+			
 		},
 		//车辆状态转换
 		statusChange(row){

src/views/regionalManagement/regionalCaiDian/index.vue

@@ -194,9 +194,9 @@ export default {
 					this.caidianAreaInformationData = res;
 				})
 				//获取铲车车辆信息
-				HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'铲车'}).then((res) => {
+				HttpReq.truckDispatching.apiCarPeopZhanyongQuery({size:9999}).then((res) => {
 					if(res.code == 200){
-						this.dianchanCarInformationData = res.data.content;
+						this.dianchanCarInformationData = res.data;
 					}
 				})
 			})