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

src/components/busManagement/HPTripPlan.vue

@@ -10,9 +10,7 @@
   .tripPlanTab tr th {
     border: 1px solid#d2d2d2;
     text-align: center;
-    padding-left: 1px;
-    padding-right: 1px;
-    min-width: 55px;
+    min-width: 60px;
     height: 29px;
     position: sticky;
     top: 0;
@@ -82,21 +80,21 @@
           </span>
         </li>
         <li>
-          <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" />
-          <button class="normalBtn" type="button" @click="downLoadPlan()">{{$t('adm.adm_download')}}</button>
+          <el-button type="primary" size="small" @click="getList()">{{$t('pub.searchBtn')}}</el-button>
+          <el-button type="primary" size="small" @click="downLoadPlan()">{{$t('adm.adm_download')}}</el-button>
         </li>
       </ul>
     </div>
     <el-tag effect="dark" color="#29b6f6">已制单</el-tag>
     <div style="float: right;">
       <el-select v-model="CarId" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option v-for="item in carList" :label="item.CarName+`(`+item.CarNo+`)`" :value="item.Id"
+            <el-option v-for="item in carList" :label="item.CarName+`(`+item.CarNo+`)`" :value="item.Id"
                 :key="item.Id">
-              </el-option>
-            </el-select>
-            <el-button type="success" size="mini" round @click="SureCar()">确认派车</el-button>
+            </el-option>
+        </el-select>
+       <el-button type="success" size="mini" @click="SureCar()" :loading="saveLoading">确认派车</el-button>
     </div>
-    <div style="width: 98%; overflow-x: hidden;padding-bottom: 50px; " :style="{height: boxHeight + 'px'}"
+    <div style="width: 99%; overflow-x: hidden;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>
@@ -129,21 +127,21 @@
                 <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'}">
+                    <font  >
                       <template v-if="childItem.UseType==1">
-                        接
+                        <font style="color:#FF0080">接</font>
                       </template>
                       <template v-else-if="childItem.UseType==2">
-                        送
+                        <font style="color:#FF0080">送</font>
                       </template>
                       <template v-else-if="childItem.UseType==3">
                         半天
                       </template>
                       <template v-else-if="childItem.UseType==4">
-                        √
+                        <font style="color:#67C23A">√</font>
                       </template>
                       <template v-else>
-                        X
+                        <font style="color:red;"> X</font>
                       </template>
                     </font>
                     <br/>
@@ -231,7 +229,8 @@
         isHaveAuth: false,
         boxHeight: 0,
         CarOrderIds:"",
-        CarId:""
+        CarId:"",
+        saveLoading:false,
       }
     },
     components: {
@@ -356,8 +355,9 @@
         });
         if(OrderIds.length==0){this.Error('请勾选订单'); return;}
         if(this.CarId<=0){this.Error('请选择车辆');return;}
+        this.saveLoading=true;
         this.apipost('travel_post_SetTripUseCar', {OrderIds:OrderIds.join(','),CarId:this.CarId}, res => {
-          this.loading = false;
+          this.saveLoading = false;
           if (res.data.resultCode == 1) {
             this.getList();
           } else {

src/components/busManagement/JourneyTripPlan.vue

@@ -10,10 +10,9 @@
   .journeyTripTab tr th {
     border: 1px solid#d2d2d2;
     text-align: center;
-    padding-left: 1px;
-    padding-right: 1px;
     min-width: 60px;
     height: 29px;
+    line-height: 29px;;
     position: sticky;
     top: 0;
     z-index: 10;
@@ -30,7 +29,6 @@
     font-size: 14px;
   }
 
-
 .journeyTripTab tr td.tdTopBorder {
     border-top: 1px solid black !important;
 }
@@ -49,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>
@@ -82,9 +99,8 @@
           </span>
         </li>
         <li>
-          <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" />
-           <input type="button" class="hollowFixedBtn" :value="$t('op.TDHT')" @click="mergeBus"
-              v-show="this.ArrList.length>1" />
+           <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>
@@ -106,14 +122,20 @@
         <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,
+                'tdMergeBusTopBorder': 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">
-                      <font style="color:#FF0080"> 接</font>
+                      <font style="color:#FF0080">接</font>
                     </template>
                     <template v-else-if="subItem.AirportPickUp==2">
-                      <font style="color:#FF0080"> 送</font>
+                      <font style="color:#FF0080">送</font>
                     </template>
                     <template v-else-if="subItem.AirportPickUp==16">
                       <font style="color:#FF0080">酒店派车</font>
@@ -183,7 +205,7 @@
                   &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.TCID+''!=subItem.TCIDs" type="text" @click="splitBus(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>
@@ -213,6 +235,7 @@
         boxHeight: 0,
         BranchList: [],
         ArrList:[],//合团
+        saveLoading:false,
       }
     },
     components: {},
@@ -345,9 +368,11 @@
           sumArr.push(item)
         });
         if (sumArr != null && sumArr.length > 0) {
+          this.saveLoading=true;
           this.apipost('travel_post_MergeUseBus', {
             Ids: sumArr
           }, res => {
+            this.saveLoading=false;
             if (res.data.resultCode == 1) {
               this.$message.success(res.data.message)
               this.getList()
@@ -355,7 +380,9 @@
             } else {
               this.Error(res.data.message)
             }
-          }, err => {});
+          }, err => {
+              this.saveLoading=true;
+          });
         }
       },
       //拆团