Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/busManagement/JourneyTripPlan.vue

 <style scoped>
   .tripPlanTab {
     border-collapse: collapse;
+    border-spacing: 0;
     border-radius: 5px;
     table-layout: fixed;
     background: white;
@@ -17,6 +18,7 @@
     top: 0;
     z-index: 10;
     background: #E6E6E6;
+    font-size: 13px;
   }
 
   .tripPlanTab tr td {
@@ -26,6 +28,7 @@
     padding-right: 1px;
     height: 28px;
     line-height: 28px;
+    font-size: 12px;
   }
 
 </style>
@@ -107,6 +110,13 @@
                     <template v-else>
                       <font style="color:red;"> X</font>
                     </template>
+                    <!-- <br />
+                    <template v-if="subItem.CityName&&subItem.CityName!=''">
+                      {{subItem.CityName}}
+                    </template>
+                    <template v-else>
+                      &nbsp;
+                    </template> -->
                   </font>
                 </template>
               </td>
@@ -220,7 +230,7 @@
         that.Confirm(tipMsg, function () {
           var orderMsg = {
             //MainId: item.MainId,
-            OrderId:item.OrderId,
+            OrderId: item.OrderId,
             CancelRemark: 'ERP取消车订单'
           };
           that.loading = true;