11

src/components/busManagement/JourneyTripPlan.vue

@@ -47,6 +47,25 @@
     border-left:  1px solid black !important;
     border-right:  1px solid black !important;
   }
+  
+  .journeyTripTab tr td.tdMergeBusTopBorder {
+    border-top: 1px solid blue !important;
+}
+
+.journeyTripTab tr td.tdMergeBusTopLeftBorder {
+    border-left: 1px solid blue !important;
+}
+
+.journeyTripTab tr td.tdMergeBusTopRightBorder {
+    border-right: 1px solid blue !important;
+}
+   
+.journeyTripTab tr td.tdMergeBusBottomBorder
+  {
+    border-bottom: 1px solid blue !important;
+    border-left:  1px solid blue !important;
+    border-right:  1px solid blue !important;
+  }
 </style>
 
 <template>
@@ -81,7 +100,7 @@
         </li>
         <li>
            <el-button type="primary" size="small" @click="getList()">{{$t('pub.searchBtn')}}</el-button>
-           <el-button type="primary" size="small"  v-show="this.ArrList.length>1"  @click="mergeBus()" :loading="saveLoading">{{$t('op.TDHT')}}</el-button>
+           <el-button type="primary" size="small"  v-show="this.ArrList.length>1"  @click="mergeBus()" :loading="saveLoading">团队套车</el-button>
         </li>
       </ul>
     </div>
@@ -103,7 +122,13 @@
         <tbody v-for="(item,index) in dataList" :key="`d_`+index">
           <tr :key="`d1_`+index">
             <template v-for="(subItem,subIndex) in item">
-              <td :key="`d1_`+index+`s1_`+subIndex" :class="{'tdTopBorder': subItem.TCID>0,'tdTopLeftBorder':subItem.DayNum==1&&subItem.TCID>0,'tdTopRightBorder':subItem.DayNum==subItem.ColumnNum&&subItem.TCID>0}">
+              <td :key="`d1_`+index+`s1_`+subIndex" 
+              :class="{
+                'tdTopBorder': subItem.TCID>0&&!subItem.IsMergeBus,
+                'tdTopBorder': subItem.TCID>0&&subItem.IsMergeBus,
+                'tdTopLeftBorder':subItem.DayNum==1&&subItem.TCID>0,
+                'tdTopRightBorder':subItem.DayNum==subItem.ColumnNum&&subItem.TCID>0
+              }">
                 <template v-if="subItem.TCID>0">
                   <font>
                     <template v-if="subItem.AirportPickUp==1">