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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -826,9 +826,14 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)" @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">{{$t('Operation.Op_shouruDan')}}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)">
+                      <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID , 1)">
                         {{$t('Operation.Op_b2bView')}}
                       </el-dropdown-item>
+
+                      <el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 2)" v-if="item.LineID!=2&&item.LineID!=8">
+                        直客版预览
+                      </el-dropdown-item>
+
                       <el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
                         {{$t('Operation.Op_salelianyun')}}
                       </el-dropdown-item>
@@ -1673,16 +1678,26 @@ export default {
                 }
             });
         },
-        goB2B(ConfigId, tcid) {
-            var B2BDomain = this.CurrentUserInfo.B2BDomain;
-            window.open(
-                "http://www.oytour.com/#/detailTwo/" +
-                    encodeURIComponent(ConfigId) +
-                    "/" +
-                    tcid +
-                    "/preview",
-                "_blank"
-            );
+        goB2B(ConfigId, tcid, type) {
+            if(type==1){
+                var B2BDomain = this.CurrentUserInfo.B2BDomain;
+                window.open(
+                    "http://www.oytour.com/#/detailTwo/" +
+                        encodeURIComponent(ConfigId) +
+                        "/" +
+                        tcid +
+                        "/preview",
+                    "_blank"
+                );
+            }else{
+                var B2BDomain = this.CurrentUserInfo.B2BDomain;
+                window.open(
+                    "http://www.oytour.com/#/newTrip" +'?ID='+encodeURIComponent(ConfigId) +
+                        "&" +
+                        'tcid='+tcid,
+                    "_blank"
+                );
+            }
         },
         goTeamBalance(id, OutBranchId) {
             this.$router.push({

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -99,7 +99,7 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" v-if="!allDIs" value="分房表确认" @click="querenHotel(2)">
+          <!-- <input type="button" class="normalBtn" v-if="!allDIs" value="分房表确认" @click="querenHotel(2)"> -->
            <input type="button" class="normalBtn" v-if="allDIs" value="取消分房表确认" @click="querenHotel(0)">
           <input type="button" class="normalBtn" value="分房表下载" @click="exportExcel_singleRoom()">
           <input type="button" class="normalBtn" value="旅客名单下载" @click="exportExcel()">

src/components/confirmationOrderDownLoad.vue

@@ -17,8 +17,7 @@
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <el-row>
       <el-col :span="14">
-        <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版PDF_V3"
-          @click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
+ 
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
           @click="toPDF_V2(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -165,7 +165,7 @@
                 :trafficObj="dayObj.TrafficObj" :ishasScenic="ishasScenic" :CurrentDayNum="dayObj.DayNum"
                 :totalDayNum="subConfig.DayNum">
               </scenicTraffic>
-              <span slot="reference" class="TC-tripTitle" style="padding-left:5px;cursor:pointer;display:none;">路线信息</span>
+              <span slot="reference" class="TC-tripTitle" style="padding-left:5px;cursor:pointer;">路线信息</span>
             </el-popover>
 
             <ul class="scenicCheck_check" v-if="ishasScenic&& NoticeParameters.IsDirect==0">