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

src/views/vehicle/vehicleCount/index.vue

@@ -117,6 +117,12 @@
 	  </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="220" align="center" label="日期">
 	  <template scope="scope">
 	    <span>{{scope.row.countDate}}</span>
@@ -150,7 +156,7 @@
 					{'id':3, "name":"内部用车"}
 					],
 				list : [],
-				header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','过期未出车','日期'],
+				header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','过期未出车','已取消','日期'],
 				name: 'export'
               }
         },