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

src/components/busManagement/JourneyTripPlan.vue

@@ -10,9 +10,11 @@
 
   /* 表头 sticky */
   .journeyTripTab thead tr th {
-    border: 1px solid #dcdcdc;
+    border-top: 1px solid #dcdcdc;
+    border-left: 1px solid #dcdcdc;
+    border-right: 1px solid #dcdcdc;
     text-align: center;
-    min-width: 60px;
+    min-width: 40px;
     height: 32px;
     position: sticky;
     top: 0;
@@ -23,12 +25,13 @@
   }
 
   .journeyTripTab td {
-    font-size: 13px;
+    font-size: 12px;
     height: 25px;
     line-height: 25px;
     padding-top: 3px;
     padding-bottom: 3px;
     text-align: center;
+    white-space: nowrap;
   }
 
   /* 表头四角圆角 */
@@ -40,7 +43,6 @@
     border-top-right-radius: 5px;
   }
 
-
   /* 内部边框控制 */
   .journeyTripTab td+td,
   .journeyTripTab th+th {
@@ -52,20 +54,16 @@
   }
 
   .journeyTripTab tr.group-end td {
-    border-bottom: 2px solid black;
+    border-bottom: 1px solid #409eff;
   }
 
   /* 团队卡片容器 */
   .journeyTripTab .team-flex {
     display: flex;
     flex-wrap: wrap;
-    /* 多个卡片自动换行 */
-    gap: 12px;
-    /* 卡片间距 */
+    gap: 4px 6px;
     justify-content: center;
-    /* 水平居中 */
     align-items: flex-start;
-    /* 顶部对齐 */
     width: 100%;
     box-sizing: border-box;
   }
@@ -79,7 +77,7 @@
     padding: 5px;
     border-radius: 4px;
     background-color: #fafafa;
-    min-width: 140px;
+    min-width: 100px;
     max-width: 180px;
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
     word-break: break-word;
@@ -99,39 +97,25 @@
 
   /* 特殊单元格边框类（可选） */
   .journeyTripTab tr td.tdTopBorder {
-    border-top: 1px solid black !important;
+    border-top: 2px solid #409eff !important;
   }
 
   .journeyTripTab tr td.tdTopLeftBorder {
-    border-left: 1px solid black !important;
+    border-left: 1px solid #409eff !important;
+    border-top-left-radius: 4px;
   }
 
   .journeyTripTab tr td.tdTopRightBorder {
-    border-right: 1px solid black !important;
+    border-right: 1px solid #409eff !important;
+    border-top-right-radius: 4px;
   }
 
   .journeyTripTab tr td.tdBottomBorder {
-    border-bottom: 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 {
-    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;
+    border-bottom: 1px solid #409eff !important;
+    border-left: 1px solid #409eff !important;
+    border-right: 1px solid #409eff !important;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
   }
 
 </style>
@@ -173,7 +157,7 @@
         </li>
       </ul>
     </div>
-    <div style="overflow:auto;padding-bottom: 50px; " :style="{height: boxHeight + 'px'}" class="ownScrollbarStyle"
+    <div style="overflow:auto;margin-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>
@@ -191,10 +175,32 @@
         <tbody>
           <template v-for="(item,index) in dataList">
             <tr :key="`data1_`+index">
-              <td v-for="(subItem,subIndex) in item" :key="`d1_`+index+`s1_`+subIndex">
+              <td v-for="(subItem,subIndex) in item" :key="`d1_`+index+`s1_`+subIndex" class="tdTopBorder"
+                :class="{'tdTopLeftBorder':subItem.IsStarCol,'tdTopRightBorder':subItem.IsEnd}">
                 <div v-for="(childItem,childIndex) in subItem.CityNameList"
                   :key="`d1_`+index+`s1_`+subIndex+`c1_`+childIndex">
                   {{childItem}}
+                  <template v-if="subItem.UseBusList[childIndex]=='接'">
+                    <font style="color:#FF0080">接</font>
+                  </template>
+                  <template v-else-if="subItem.UseBusList[childIndex]=='送'">
+                    <font style="color:#FF0080">送</font>
+                  </template>
+                  <template v-else-if="subItem.UseBusList[childIndex]=='酒'">
+                    <font style="color:#FF0080">酒</font>
+                  </template>
+                  <template v-else-if="subItem.UseBusList[childIndex]=='全'">
+                    <font style="color:#67C23A">√</font>
+                  </template>
+                  <template v-else-if="subItem.UseBusList[childIndex]=='半'">
+                    <font style="color:#67C23A">半</font>
+                  </template>
+                  <template v-else-if="subItem.UseBusList[childIndex]=='小'">
+                    <font style="color:#67C23A">小</font>
+                  </template>
+                  <template v-else>
+                    <font style="color:red;">X</font>
+                  </template>
                 </div>
               </td>
             </tr>
@@ -203,7 +209,7 @@
                 <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">
+                      :colspan="subItem.ColumnNum" class="tdBottomBorder">
                       <div class="team-flex  ">
                         <div v-for="(fItem,fIndex) in subItem.TeamInfoList"
                           :key="`d2_`+index+`s2_`+subIndex+`c2_`+childIndex+`t2_`+fIndex" class="team-item">
@@ -212,19 +218,22 @@
                               <input :value="fItem.TCID" style="vertical-align: middle;" v-model="ArrList"
                                 type="checkbox" />
                             </label>
-                            <span>{{fItem.TCNUM}}</span>
+                            <span @click="gotoTeam(fItem)" style="cursor:pointer;"><template
+                                v-if="fItem.OutBranchName&&fItem.OutBranchName!=''">({{fItem.OutBranchName}})</template>{{fItem.TCNUM}}</span>
                           </div>
                           <!-- 第二行: 车辆和司机信息 -->
-                          <div class="team-row">
+                          <div class="team-row" v-if="fItem.CarName&&fItem.CarName!=''">
                             <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.DriverName">{{ 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 v-if="fItem.CarIsPush!=1" type="text" @click="setBusOrder(fItem)" size="mini">同步
+                            </el-button>
+                            <el-button v-if="fItem.IsMergeBus" type="text" style="color:red;" size="mini"
+                              @click="splitBus(fItem)">
                               拆分
                             </el-button>
                           </div>
@@ -363,8 +372,7 @@
         this.$router.push({
           name: path,
           query: {
-            id: item.TCID,
-            tcmun: item.TCNUM,
+            TCID: item.TCID,
             blank: "y",
             tab: "团控列表",
           },
@@ -435,7 +443,7 @@
       let yearStr = myDate.getFullYear();
       let monthStr = parseInt(myDate.getMonth() + 1);
       this.msg.MonthStr = yearStr + "-" + (monthStr < 10 ? '0' + monthStr : monthStr);
-      let height = window.innerHeight - 65 - 55;
+      let height = window.innerHeight - 200;
       this.boxHeight = height;
       this.getCompanyList();
       this.getList();