后台优化

src/api/base_info/constant/index.js

@@ -80,7 +80,6 @@ function loadFromServer(type) {
     });
   }
 
-  console.log(rs);
   return rs;
 }
 

src/api/base_info/region/index.js

@@ -80,7 +80,6 @@ export function getSonRegionByCodes(code) {
   if (!actualCode) {
     actualCode = rsCode.REGION_CODE_CHAINA;
   }
-
   let sonRegions = store.getters.sonRegions(actualCode);
   if (!sonRegions) {
     let datas = loadSonsFromServer(actualCode);

src/api/vehicle/vehicleInfo/index.js

@@ -98,3 +98,19 @@ export function checkCode(code, id) {
     method: 'get'
   });
 }
+
+//检查车架号是否存在
+export function checkVin(vin, id) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/exist_vin/' + vin + '?id=' + id,
+    method: 'get'
+  });
+}
+
+//检查车辆发动机号是否存在
+export function checkEngineNum(engineNum, id) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/exist_engineNum/' + engineNum + '?id=' + id,
+    method: 'get'
+  });
+}
\ No newline at end of file

src/views/vehicle/bookRecord/index.vue

@@ -104,9 +104,14 @@
 					<span v-if="scope.row.bookType==10">其他</span>
 				</template>
 			</el-table-column>
-			<el-table-column align="center" label="预定时间" width="220">
+			<el-table-column align="center" label="预定取/还时间" width="200">
 				<template scope="scope">
-					<span>{{scope.row.bookStartDate}} 至 {{scope.row.bookEndDate}}</span>
+					<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
+				</template>
+			</el-table-column>
+			 <el-table-column align="center" label="实际取/还时间" width="200">
+			  <template scope="scope">
+			    <span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
 			  </template>
 			</el-table-column>
 			<!-- <el-table-column align="center" label="预定时间" width="220">
@@ -177,11 +182,7 @@
           <span>{{scope.row.reviewerNameReturn}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="还车时间" width="120">
-        <template scope="scope">
-          <span>{{scope.row.actualEndDate}}</span>
-        </template>
-      </el-table-column>
+     
 
       <el-table-column align="center" label="随车物品" width="120">
         <template scope="scope">
@@ -301,7 +302,7 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="车辆编号">
-							<span>{{detailItem.vehicleId}}</span>
+							<span>{{detailItem.code}}</span>
 						</el-form-item>
 					</el-col>
 					<!-- <el-col :span="7">

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -4,27 +4,39 @@
       <el-form>
         <el-row>
           <el-col :span="5">
-            <el-form-item>
+              <el-form-item label="车辆编码" prop="code">
+                <el-input type="number" style="width: 200px;" v-model.number="listQuery.code"
+                          placeholder="请输入车辆编码"></el-input>
+              </el-form-item>
+            </el-col>
+              <el-col :span="5">
+                <el-form-item label="车牌号" prop="code">
+              <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
+                        v-model="listQuery.numberPlate"></el-input>
+            </el-form-item>
+          </el-col>
+					<el-col :span="5">
+					  <el-form-item label="出车日期" prop="startTime">
 					    <el-date-picker
-                v-model="listQuery.time"
+					      v-model="listQuery.startTime"
 					      type="date"
 					      :editable="false"
 					      format="yyyy-MM-dd"
-                prop="time"
-                placeholder="请选择日期">
+					      prop="startTime"
+					      placeholder="请选择出车日期">
 					    </el-date-picker>
 					  </el-form-item>
 					</el-col>
 					<el-col :span="5">
-              <el-form-item>
-                <el-input type="number" style="width: 200px;" v-model.number="listQuery.code"
-                          placeholder="请输入车辆编码"></el-input>
-              </el-form-item>
-            </el-col>
-              <el-col :span="5">
-                <el-form-item>
-              <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
-                        v-model="listQuery.numberPlate"></el-input>
+					  <el-form-item label="还车日期" prop="endTime">
+					    <el-date-picker
+					      v-model="listQuery.endTime"
+					      type="date"
+					      :editable="false"
+					      format="yyyy-MM-dd"
+					      prop="endTime"
+					      placeholder="请选择还车日期">
+					    </el-date-picker>
 					  </el-form-item>
 					</el-col>
         </el-row>
@@ -79,8 +91,8 @@
         label="编号"
         width="65">
       </el-table-column>
-      <!--<el-table-column align="center" label="编号" width="65">-->
-      <!--<template scope="scope">-->
+<!--      <el-table-column align="center" label="编号" width="65">
+ -->      <!--<template scope="scope">-->
       <!--<span>{{scope.row.id}}</span>-->
       <!--</template>-->
       <!--</el-table-column>-->
@@ -214,9 +226,9 @@
     import {
         toEast8Date,
         deepCopyDate,
-        newEast8Date
+        newEast8Date,
+				getYMD_date
     } from 'utils/dateUtils';
-
 				export default {
         name: 'vehicleDepartureLog',
         data() {
@@ -262,7 +274,8 @@
                 listQuery: {
                     page: 1,
                     limit: 20,
-                    time: "",
+                    startTime: undefined,
+                    endTime:undefined,
                     numberPlate: undefined,
                     departureId:undefined,
                 },
@@ -329,8 +342,11 @@
                 if (!this.listQuery.numberPlate) {
                     this.statisticVisiable = false;
                 }
-                if (this.listQuery.time) {
-                    this.listQuery.time = this.dateToString(this.listQuery.time);
+               if (this.listQuery.startTime) {
+               	this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
+               }
+               if(this.listQuery.endTime) {
+               	this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
                }
                 if (!this.state1) {
                     this.listQuery.departureId = undefined;