Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/vehicle/vehicleCount/index.vue

@@ -59,60 +59,71 @@
      type="index"
      align="center" label="序号" width="117">
    </el-table-column>
-   <el-table-column width="150" align="center" label="类型">
+   <el-table-column width="130" align="center" label="类型">
      <template scope="scope">
        <span>{{getType(scope.row.type)}}</span>
      </template>
    </el-table-column>
-   <el-table-column width="150" align="center" label="应交车">
+   <el-table-column width="130" align="center" label="应交车">
      <template scope="scope">
        <span>{{scope.row.departureNum}}</span>
      </template>
    </el-table-column>
  
-   <el-table-column width="150" align="center" label="提前交车">
+   <el-table-column width="130" align="center" label="提前交车">
      <template scope="scope">
        <span>{{scope.row.beforeDepartureNum}}</span>
      </template>
    </el-table-column>
- 
-   <el-table-column width="150" align="center" label="正常交车">
+   <el-table-column width="120" align="center" label="正常交车">
      <template scope="scope">
        <span>{{scope.row.actualDepartureNum}}</span>
      </template>
    </el-table-column>
  
-   <el-table-column width="150" align="center" label="延后交车">
+   <el-table-column width="130" align="center" label="延后交车">
      <template scope="scope">
        <span>{{scope.row.afterDepartureNum}}</span>
      </template>
    </el-table-column>
  
-   <el-table-column width="150" align="center" label="应收车">
+   <el-table-column width="130" align="center" label="应收车">
      <template scope="scope">
        <span>{{scope.row.arrivalNum}}</span>
      </template>
    </el-table-column>
 
-	<el-table-column width="150" align="center" label="提前收车">
+	<el-table-column width="130" align="center" label="提前收车">
 	  <template scope="scope">
 	    <span>{{scope.row.beforeArrivalNum}}</span>
 	  </template>
 	</el-table-column>
 	 
-	<el-table-column width="150" align="center" label="正常收车">
+	<el-table-column width="130" align="center" label="正常收车">
 	  <template scope="scope">
 	    <span>{{scope.row.actualArrivalNum}}</span>
 	  </template>
 	</el-table-column>
 	 
-	<el-table-column width="150" align="center" label="延后收车">
+	<el-table-column width="130" align="center" label="延后收车">
 	  <template scope="scope">
 	    <span>{{scope.row.afterArrivalNum}}</span>
 	  </template>
 	</el-table-column>
 	
-	<el-table-column width="200" align="center" label="日期">
+		<el-table-column width="130" align="center" label="过期未出车">
+	  <template scope="scope">
+	    <span>{{scope.row.noUseNum}}</span>
+	  </template>
+	</el-table-column>
+	
+		<el-table-column width="130" align="center" label="已取消">
+	  <template scope="scope">
+	    <span>{{scope.row.cancelNum}}</span>
+	  </template>
+	</el-table-column>
+	
+	<el-table-column width="130" align="center" label="日期">
 	  <template scope="scope">
 	    <span>{{scope.row.countDate}}</span>
 	  </template>
@@ -145,7 +156,7 @@
 					{'id':3, "name":"内部用车"}
 					],
 				list : [],
-				header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','日期'],
+				header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','过期未出车','已取消','日期'],
 				name: 'export'
               }
         },
@@ -157,8 +168,12 @@
         },
         methods: {
 			handlerSearch() {
+				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));
+				}
 				 get(this.listQuery).then(response => {
 				     if (response.status === 200) {
 						 this.list = response.data
@@ -234,6 +249,7 @@
 					window.location.href="https://"+domain+"/vehicle/vehicleCount/app/unauth/download?path="+fileName;
 				})
         },
+		
 	}
  }
 </script>