11

src/components/busManagement/HPTripPlan.vue

 <style scoped>
   .tripPlanTab {
-    border-collapse: collapse;
+    border-collapse: separate;
+    border-spacing: 0;
     border-radius: 5px;
     table-layout: fixed;
     background: white;
@@ -19,15 +20,34 @@
     background:#E6E6E6;
   }
 
-  .tripPlanTab tr td {
+  .tripPlanTab tr td{
     border: 1px solid #d2d2d2;
     text-align: center;
     padding-left: 1px;
     padding-right: 1px;
     height: 28px;
     line-height: 28px;
+    font-size:14px;
   }
 
+.tripPlanTab tr td.tdTopBorder {
+    border-top: 1px solid black !important;
+}
+
+.tripPlanTab tr td.tdTopLeftBorder {
+    border-left: 1px solid black !important;
+}
+
+.tripPlanTab tr td.tdTopRightBorder {
+    border-right: 1px solid black !important;
+}
+   
+.tripPlanTab tr td.tdBottomBorder
+  {
+    border-bottom: 1px solid black !important;
+    border-left:  1px solid black !important;
+    border-right:  1px solid black !important;
+  }
 </style>
 
 <template>
@@ -63,7 +83,6 @@
         </li>
         <li>
           <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" />
-          <!-- <button class="hollowFixedBtn" @click="editPlan(null)">{{$t('pub.addBtn')}}</button> -->
           <button class="normalBtn" type="button" @click="downLoadPlan()">{{$t('adm.adm_download')}}</button>
         </li>
       </ul>
@@ -99,7 +118,8 @@
                 </template>
               </td>
               <template v-for="(childItem,childIndex) in subItem">
-                <td :key="`d1_`+index+`s1_`+subIndex+`d1`+childIndex">
+                <td :key="`d1_`+index+`s1_`+subIndex+`d1`+childIndex" 
+                 :class="{'tdTopBorder': childItem.OrderId>0,'tdTopLeftBorder':childItem.DayNum==1&&childItem.OrderId>0,'tdTopRightBorder':childItem.DayNum==childItem.ColumnNum&&childItem.OrderId>0}">
                   <template v-if="childItem.OrderId>0">
                     <font :style="{color: childItem.Income>0?'#29b6f6':'#000000'}">
                       <template v-if="childItem.UseType==1">
@@ -118,6 +138,13 @@
                         X
                       </template>
                     </font>
+                    <br/>
+                    <template v-if="childItem.DayNum==1">
+                        {{childItem.ArrivalCityName}}
+                    </template>
+                    <template v-else-if="childItem.DayNum==childItem.ColumnNum">
+                       {{childItem.StartCityName}}
+                    </template>
                   </template>
                 </td>
               </template>
@@ -126,7 +153,8 @@
               <template v-for="(childItem,childIndex) in subItem">
                 <template v-if="childItem.OrderId>0">
                   <td v-if="childItem.DayNum==1" :colspan="childItem.ColumnNum>1? childItem.ColumnNum:0"
-                    :key="`d2_`+index+`s2_`+subIndex+`d2`+childIndex">
+                    :key="`d2_`+index+`s2_`+subIndex+`d2`+childIndex" class="tdBottomBorder">
+                    {{childItem.CustomerName}}
                     <el-tooltip
                       :content="(childItem.OrderType==1?`常规订单:`:`包车订单:`)+childItem.OrderId+`,用车时间:`+childItem.StartDateStr+`至`+childItem.EndDateStr">
                       <template v-if="isHaveAuth">
@@ -319,10 +347,6 @@
       let yearStr = myDate.getFullYear();
       let monthStr = parseInt(myDate.getMonth() + 1);
       this.msg.MonthStr = yearStr + "-" + (monthStr < 10 ? '0' + monthStr : monthStr);
-      //this.msg.MonthStr = "2025-05";
-      // this.msg.CarId = 1030;
-      //this.msg.CarId = 1021;
-      //this.msg.QOrderId="483"
       let height = window.innerHeight - 65 - 55;
       this.boxHeight = height;
       this.getCarList();

src/components/busManagement/JourneyTripPlan.vue

@@ -110,13 +110,13 @@
                     <template v-else>
                       <font style="color:red;"> X</font>
                     </template>
-                    <!-- <br />
+                    <br />
                     <template v-if="subItem.CityName&&subItem.CityName!=''">
                       {{subItem.CityName}}
                     </template>
                     <template v-else>
                       &nbsp;
-                    </template> -->
+                    </template>
                   </font>
                 </template>
               </td>