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

src/components/busManagement/HPTripPlan.vue

-<style scoped>
-  .tripPlanTab {
-    border-collapse: separate;
-    border-spacing: 0;
-    border-radius: 5px;
-    table-layout: fixed;
-    background: white;
-  }
+  <style scoped>
+/* ========= 表格整体 ========= */
+.tripPlanTab {
+  border-collapse: separate;
+  border-spacing: 0;
+  border-radius: 6px;
+  table-layout: fixed;
+  background: #ffffff;
+  font-size: 14px;
+}
 
-  .tripPlanTab tr th {
-    border: 1px solid#d2d2d2;
-    text-align: center;
-    min-width: 60px;
-    height: 29px;
-    position: sticky;
-    top: 0;
-    z-index: 10;
-    background:#E6E6E6;
-  }
+/* ========= 表头 ========= */
+.tripPlanTab th {
+  border: 1px solid #dcdcdc;
+  text-align: center;
+  min-width: 60px;
+  height: 32px;
+  position: sticky;
+  top: 0;
+  z-index: 10;
+  background: #f5f7fa;
+  font-weight: 600;
+  box-shadow: 0 1px 0 #dddddd;
+}
 
-  .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 td {
+  border: 1px solid #e0e0e0;
+  text-align: center;
+  padding: 2px 4px;
+  height: 32px;
+  line-height: 1.4;
+  font-size: 13px;
+  background: #ffffff;
+  vertical-align: middle;
+  word-break: break-all;
+}
 
-.tripPlanTab tr td.tdTopBorder {
-    border-top: 1px solid black !important;
+/* ========= 行 hover ========= */
+.tripPlanTab tbody tr:hover td {
+  background: #f9fbff;
 }
 
-.tripPlanTab tr td.tdTopLeftBorder {
-    border-left: 1px solid black !important;
+/* ========= 未派车行高亮 ========= */
+.no-car-row td {
+  background: #fffaf0;
 }
 
-.tripPlanTab tr td.tdTopRightBorder {
-    border-right: 1px solid black !important;
+.no-car-row:hover td {
+  background: #fff3d6;
+}
+
+/* ========= 表格底部加粗线 ========= */
+.tripPlanTab tbody tr:last-child td {
+  border-bottom: 2px solid #409eff;
+}
+
+.tripPlanTab tbody tr:first-child td:first-child {
+  border-bottom: 2px solid #409eff;
 }
-   
-.tripPlanTab tr td.tdBottomBorder
-  {
-    border-bottom: 1px solid black !important;
-    border-left:  1px solid black !important;
-    border-right:  1px solid black !important;
-  }
-</style>
 
+
+/* ========= 订单块顶部 ========= */
+.tripPlanTab td.tdTopBorder {
+  border-top: 2px solid #409eff !important;
+}
+
+/* 左上角 */
+.tripPlanTab td.tdTopLeftBorder {
+  border-left: 2px solid #409eff !important;
+  border-top: 2px solid #409eff !important;
+  border-top-left-radius: 4px;
+}
+
+/* 右上角 */
+.tripPlanTab td.tdTopRightBorder {
+  border-right: 2px solid #409eff !important;
+  border-top: 2px solid #409eff !important;
+  border-top-right-radius: 4px;
+}
+
+/* ========= 订单块底部 ========= */
+.tripPlanTab td.tdBottomBorder {
+  border-bottom: 2px solid #409eff !important;
+  border-left: 2px solid #409eff !important;
+  border-right: 2px solid #409eff !important;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+/* ========= 文字细节 ========= */
+.tripPlanTab td font {
+  line-height: 1.3;
+}
+</style>
 <template>
   <div>
     <div class="query-box" style="border-bottom: none;">
@@ -94,7 +139,7 @@
         </el-select>
        <el-button type="success" size="mini" @click="SureCar()" :loading="saveLoading">确认派车</el-button>
     </div>
-    <div style="width: 99%; overflow-x: hidden;padding-bottom: 50px;margin-top:5px;" :style="{height: boxHeight + 'px'}"
+    <div style="width: 100%; overflow-x: auto;padding-bottom: 50px;margin-top:5px;" :style="{height: boxHeight + 'px'}"
       class="ownScrollbarStyle" v-loading="loading">
       <table class="tripPlanTab" v-if="dataList&&dataList.length>0">
         <thead>

src/components/busManagement/JourneyTripPlan copy.vue

@@ -12,7 +12,8 @@
     text-align: center;
     min-width: 60px;
     height: 29px;
-    line-height: 29px;;
+    line-height: 29px;
+    ;
     position: sticky;
     top: 0;
     z-index: 10;
@@ -29,43 +30,42 @@
     font-size: 14px;
   }
 
-.journeyTripTab tr td.tdTopBorder {
+  .journeyTripTab tr td.tdTopBorder {
     border-top: 1px solid black !important;
-}
+  }
 
-.journeyTripTab tr td.tdTopLeftBorder {
+  .journeyTripTab tr td.tdTopLeftBorder {
     border-left: 1px solid black !important;
-}
+  }
 
-.journeyTripTab tr td.tdTopRightBorder {
+  .journeyTripTab tr td.tdTopRightBorder {
     border-right: 1px solid black !important;
-}
-   
-.journeyTripTab tr td.tdBottomBorder
-  {
+  }
+
+  .journeyTripTab tr td.tdBottomBorder {
     border-bottom: 1px solid black !important;
-    border-left:  1px solid black !important;
-    border-right:  1px solid black !important;
+    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 {
+  .journeyTripTab tr td.tdMergeBusTopLeftBorder {
     border-left: 1px solid blue !important;
-}
+  }
 
-.journeyTripTab tr td.tdMergeBusTopRightBorder {
+  .journeyTripTab tr td.tdMergeBusTopRightBorder {
     border-right: 1px solid blue !important;
-}
-   
-.journeyTripTab tr td.tdMergeBusBottomBorder
-  {
+  }
+
+  .journeyTripTab tr td.tdMergeBusBottomBorder {
     border-bottom: 1px solid blue !important;
-    border-left:  1px solid blue !important;
-    border-right:  1px solid blue !important;
+    border-left: 1px solid blue !important;
+    border-right: 1px solid blue !important;
   }
+
 </style>
 
 <template>
@@ -99,8 +99,9 @@
           </span>
         </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">团队套车</el-button>
+          <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">团队套车</el-button>
         </li>
       </ul>
     </div>
@@ -122,8 +123,7 @@
         <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="{
+              <td :key="`d1_`+index+`s1_`+subIndex" :class="{
                 'tdTopBorder': subItem.TCID>0&&!subItem.IsMergeBus,
                 'tdMergeBusTopBorder': subItem.TCID>0&&subItem.IsMergeBus,
                 'tdTopLeftBorder':subItem.DayNum==1&&subItem.TCID>0,
@@ -168,19 +168,19 @@
             <template v-for="(subItem,subIndex) in item">
               <template v-if="subItem.TCID>0">
                 <td v-if="subItem.DayNum==1" :colspan="subItem.ColumnNum>1? subItem.ColumnNum:0"
-                  :key="`d2_`+index+`s2_`+subIndex"  class="tdBottomBorder">
+                  :key="`d2_`+index+`s2_`+subIndex" class="tdBottomBorder">
                   <el-tooltip :content="subItem.TCNUM+`(`+subItem.TCID+`),用车时间:`+subItem.StartDate+`至`+subItem.EndDate">
                     <div>
                       <label>
                         <input :value="subItem.TCID" style="vertical-align: middle;" v-model="ArrList"
-                          type="checkbox"/> 
+                          type="checkbox" />
                       </label>
-                        <font style="cursor:pointer;text-decoration:underline;"
-                          :style="{color:subItem.CarIsPush==1?'blue':''}" @click="gotoTeam(subItem)">
-                          {{subItem.DMCNum&&subItem.DMCNum!=''?subItem.DMCNum:subItem.TCNUM}}<br />(总机位:{{subItem.TotalSeat}}
-                            订单人数:{{subItem.OrderNum}}+{{subItem.LeaderNum}})
-                        </font>
-                      </div>
+                      <font style="cursor:pointer;text-decoration:underline;"
+                        :style="{color:subItem.CarIsPush==1?'blue':''}" @click="gotoTeam(subItem)">
+                        {{subItem.DMCNum&&subItem.DMCNum!=''?subItem.DMCNum:subItem.TCNUM}}<br />(总机位:{{subItem.TotalSeat}}
+                        订单人数:{{subItem.OrderNum}}+{{subItem.LeaderNum}})
+                      </font>
+                    </div>
                   </el-tooltip>
                   <template v-if="subItem.MainId>0">
                     <br />
@@ -204,8 +204,9 @@
                   </template>
                   &nbsp;
                   <el-button v-if="subItem.CarIsPush!=1" type="text" @click="setBusOrder(subItem)">同步</el-button>
-                 <!-- <el-button v-else type="text" @click="cancelBusOrder(subItem)" style="color:red;">取消</el-button>  -->
-                 <el-button v-if="subItem.IsMergeBus" type="text" @click="splitBus(subItem)" style="color:red;">拆分</el-button> 
+                  <!-- <el-button v-else type="text" @click="cancelBusOrder(subItem)" style="color:red;">取消</el-button>  -->
+                  <el-button v-if="subItem.IsMergeBus" type="text" @click="splitBus(subItem)" style="color:red;">拆分
+                  </el-button>
                 </td>
               </template>
               <template v-else>
@@ -234,8 +235,8 @@
         dataList: [],
         boxHeight: 0,
         BranchList: [],
-        ArrList:[],//合团
-        saveLoading:false,
+        ArrList: [], //合团
+        saveLoading: false,
       }
     },
     components: {},
@@ -368,11 +369,11 @@
           sumArr.push(item)
         });
         if (sumArr != null && sumArr.length > 0) {
-          this.saveLoading=true;
+          this.saveLoading = true;
           this.apipost('travel_post_MergeUseBus', {
             Ids: sumArr
           }, res => {
-            this.saveLoading=false;
+            this.saveLoading = false;
             if (res.data.resultCode == 1) {
               this.$message.success(res.data.message)
               this.getList()
@@ -381,7 +382,7 @@
               this.Error(res.data.message)
             }
           }, err => {
-              this.saveLoading=true;
+            this.saveLoading = true;
           });
         }
       },

src/components/busManagement/JourneyTripPlan.vue

@@ -2,28 +2,24 @@
   /* 表格整体样式 */
   .journeyTripTab {
     border-collapse: separate;
-    /* 保证圆角生效 */
     border-spacing: 0;
     border-radius: 5px;
     table-layout: fixed;
     background: white;
-    border: 1px solid #d2d2d2;
-    /* 整体边框 */
-    overflow: hidden;
-    /* 避免圆角被遮挡 */
-    width: 100%;
   }
 
   /* 表头 sticky */
-  .journeyTripTab th {
+  .journeyTripTab thead tr th {
+    border: 1px solid #dcdcdc;
+    text-align: center;
+    min-width: 60px;
+    height: 32px;
     position: sticky;
     top: 0;
-    z-index: 20;
-    background: #E6E6E6;
-    text-align: center;
-    padding: 3px;
-    font-weight: normal;
-    border: none;
+    z-index: 10;
+    background: #f5f7fa;
+    font-weight: 600;
+    box-shadow: 0 1px 0 #dddddd;
   }
 
   .journeyTripTab td {
@@ -55,9 +51,7 @@
     border-top: 1px solid #d2d2d2;
   }
 
-
-  /* 表格底部加粗线 */
-  .journeyTripTab tbody tr:last-child td {
+  .journeyTripTab tr.group-end td {
     border-bottom: 2px solid black;
   }
 
@@ -100,7 +94,7 @@
   .journeyTripTab .team-item .team-buttons {
     display: flex;
     justify-content: center;
-     width: 100%; 
+    width: 100%;
   }
 
   /* 特殊单元格边框类（可选） */
@@ -179,7 +173,7 @@
         </li>
       </ul>
     </div>
-    <div style="  overflow-x: auto;padding-bottom: 50px; " :style="{height: boxHeight + 'px'}" class="ownScrollbarStyle"
+    <div style="overflow:auto;padding-bottom: 50px; " :style="{height: boxHeight + 'px'}" class="ownScrollbarStyle"
       v-loading="loading" :element-loading-text="loadingText">
       <table class="journeyTripTab" v-if="dataList&&dataList.length>0">
         <thead>
@@ -194,53 +188,56 @@
             </template>
           </tr>
         </thead>
-        <tbody v-for="(item,index) in dataList" :key="`data_`+index">
-          <tr>
-            <td v-for="(subItem,subIndex) in item" :key="`d1_`+index+`s1_`+subIndex">
-              <div v-for="(childItem,childIndex) in subItem.CityNameList"
-                :key="`d1_`+index+`s1_`+subIndex+`c1_`+childIndex">
-                {{childItem}}
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <template v-for="(subItem,subIndex) in item">
-              <template v-if="subItem.TeamInfoList&&subItem.TeamInfoList.length>0">
-                <template v-for="(childItem,childIndex) in subItem.TeamInfoList">
-                  <td :key="`d2_`+index+`s2_`+subIndex+`c2_`+childIndex" v-if="childIndex==0&&subItem.IsStarCol"
-                    :colspan="subItem.ColumnNum">
-                    <div class="team-flex  ">
-                      <div v-for="(fItem,fIndex) in subItem.TeamInfoList"
-                        :key="`d2_`+index+`s2_`+subIndex+`c2_`+childIndex+`t2_`+fIndex" class="team-item">
-                        <div class="team-row flex items-center gap-2">
-                          <label>
-                            <input :value="fItem.TCID" style="vertical-align: middle;" v-model="ArrList"
-                              type="checkbox" />
-                          </label>
-                          <span>{{fItem.TCNUM}}</span>
-                        </div>
-                        <!-- 第二行: 车辆和司机信息 -->
-                        <div class="team-row">
-                          <span v-if="fItem.CarName">{{ fItem.CarName }}</span>
-                          <span v-if="fItem.CarNo">({{ fItem.CarNo }})</span>
-                          <span v-if="fItem.DriverName">&nbsp;{{ fItem.DriverName }}</span>
-                          <span v-if="fItem.DriverTel">({{ fItem.DriverTel }})</span>
-                        </div>
-                        <!-- 第三行: 按钮 -->
-                        <div class="team-buttons">
-                          <el-button v-if="fItem.CarIsPush!=1" type="text" @click="setBusOrder(fItem)">同步</el-button>
-                          <el-button v-if="fItem.IsMergeBus" type="text" style="color:red;" @click="splitBus(fItem)">拆分
-                          </el-button>
+        <tbody>
+          <template v-for="(item,index) in dataList">
+            <tr :key="`data1_`+index">
+              <td v-for="(subItem,subIndex) in item" :key="`d1_`+index+`s1_`+subIndex">
+                <div v-for="(childItem,childIndex) in subItem.CityNameList"
+                  :key="`d1_`+index+`s1_`+subIndex+`c1_`+childIndex">
+                  {{childItem}}
+                </div>
+              </td>
+            </tr>
+            <tr :key="`data2_`+index" class="group-end">
+              <template v-for="(subItem,subIndex) in item">
+                <template v-if="subItem.TeamInfoList&&subItem.TeamInfoList.length>0">
+                  <template v-for="(childItem,childIndex) in subItem.TeamInfoList">
+                    <td :key="`d2_`+index+`s2_`+subIndex+`c2_`+childIndex" v-if="childIndex==0&&subItem.IsStarCol"
+                      :colspan="subItem.ColumnNum">
+                      <div class="team-flex  ">
+                        <div v-for="(fItem,fIndex) in subItem.TeamInfoList"
+                          :key="`d2_`+index+`s2_`+subIndex+`c2_`+childIndex+`t2_`+fIndex" class="team-item">
+                          <div class="team-row flex items-center gap-2">
+                            <label>
+                              <input :value="fItem.TCID" style="vertical-align: middle;" v-model="ArrList"
+                                type="checkbox" />
+                            </label>
+                            <span>{{fItem.TCNUM}}</span>
+                          </div>
+                          <!-- 第二行: 车辆和司机信息 -->
+                          <div class="team-row">
+                            <span v-if="fItem.CarName">{{ fItem.CarName }}</span>
+                            <span v-if="fItem.CarNo">({{ fItem.CarNo }})</span>
+                            <span v-if="fItem.DriverName">&nbsp;{{ fItem.DriverName }}</span>
+                            <span v-if="fItem.DriverTel">({{ fItem.DriverTel }})</span>
+                          </div>
+                          <!-- 第三行: 按钮 -->
+                          <div class="team-buttons">
+                            <el-button v-if="fItem.CarIsPush!=1" type="text" @click="setBusOrder(fItem)">同步</el-button>
+                            <el-button v-if="fItem.IsMergeBus" type="text" style="color:red;" @click="splitBus(fItem)">
+                              拆分
+                            </el-button>
+                          </div>
                         </div>
                       </div>
-                    </div>
-                  </td>
+                    </td>
+                  </template>
                 </template>
+                <td :key="`d3_`+index+`s3_`+subIndex" v-else>
+                </td>
               </template>
-              <td :key="`d3_`+index+`s3_`+subIndex" v-else>
-              </td>
-            </template>
-          </tr>
+            </tr>
+          </template>
         </tbody>
       </table>
     </div>