1

src/views/DeviceManage/deviceMan/index.vue

@@ -19,9 +19,9 @@
 			<div class="ctin-box">
 				<div class="content-within">
 					<div class="content-fix">
-						<div class="toolbar">
+						<!-- <div class="toolbar">
 							<el-button size="mini" type="primary" icon="el-icon-plus" @click="toAdd">新增</el-button>
-						</div>
+						</div> -->
 						<div class="content">
 							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
 								<el-table-column prop="name" label="设备编码" align="center"></el-table-column>
@@ -47,7 +47,7 @@
 		<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="name">
-					<el-input v-model="form.item.name" style="width:280px;" placeholder="请输入设备编码"/>
+					<el-input v-model="form.item.name" style="width:280px;" placeholder="请输入设备编码" :disabled="form.reqType == 'edit'"/>
 				</el-form-item>
 				<el-form-item label="设备状态" prop="status">
 					<el-select v-model="form.item.status" placeholder="请选择设备状态" style="width:280px;">
@@ -182,7 +182,7 @@ export default {
 		},
 		toDelete(item) {
 			var id = item.id;
-			var communicationName = item.number
+			var communicationName = item.name;
 			this.$confirm('确认删除该条数据吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -239,9 +239,6 @@ export default {
 			}).catch(function(error) {
 				form.status.cu = 0
 			});
-			//新增通信账号
-			// let communicationAccount = lastData.number;
-			// HttpReq.truckDispatching.communicationAccountAdd({name:communicationAccount}).then((res) => {})
 		},
 		//修改设备
 		reqUpdateItem(form, item){
@@ -285,8 +282,14 @@ export default {
 				}
 				this.loadData();
 			})
-			//删除通信账号
-			// HttpReq.truckDispatching.communicationAccountDel({name:communicationName}).then((res) => {})
+			//将车辆信息表中的终端设备字段改为空
+			HttpReq.truckDispatching.carInformationQuery({equipmentName:communicationName}).then((res) => {
+				if(res.code == 200 && res.data.totalElements != 0){
+					let lastData = res.data.content[0];
+					lastData.equipmentName = '';
+					HttpReq.truckDispatching.carInformationUpdate(lastData).then((resDel) => {})
+				}
+			})
 		},
 	}
 }

src/views/carManagement/carInformation/index.vue

@@ -149,9 +149,9 @@ export default {
 				number: [
 					{required: true, message: '请输入车牌号', trigger: 'blur' }
 				],
-				equipmentName: [
-					{required: true, message: '请选择终端设备', trigger: 'change' }
-				],
+				// equipmentName: [
+				// 	{required: true, message: '请选择终端设备', trigger: 'change' }
+				// ],
 				road: [
 					{required: true, message: '请选择所属车队名称', trigger: 'change' }
 				],