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

src/components/confirmationOrderDownLoad.vue

@@ -10,20 +10,48 @@
    .travelControlTrip .WeiXinShare{
     width:118px;position:relative;top:55px;
   }
+  .travelControlTrip .el-dropdown {
+    height: 30px;
+    line-height: 30px;
+    background-color: #E95252;
+    color: #fff;
+    font-size: 12px;
+    width: 80px;
+    text-align: center;
+    border-radius: 4px;
+    cursor: pointer;
+    margin-left:20px;
+}
 </style>
 
 <template>
   <div class="travelControlTrip detail-box">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
-    <el-row>
+    <el-row style="margin-bottom:20px;">
       <el-col :span="14">
- 
-        <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
+        <el-dropdown trigger="click">
+            <span class="el-dropdown-link">行程下载
+              <i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+              <el-dropdown-item @click.native="toPDF_V2(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')">
+                下载电脑版PDF
+              </el-dropdown-item>
+              <el-dropdown-item @click.native="gernalFeature(0)">
+                下载手机版WORD
+              </el-dropdown-item>
+              <el-dropdown-item @click.native="gernalFeature(1)">
+                下载电脑版WORD
+              </el-dropdown-item>
+            </el-dropdown-menu>
+        </el-dropdown>
+        <!-- <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"
           @click="gernalFeature(0)" />
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
-          @click="gernalFeature(1)" />
+          @click="gernalFeature(1)" /> -->
+        <input type="button" value="新版行程" class="travelControlTripBtn" style="display:none;" @click="goUrlView()"/>
         <a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
           width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
           :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
@@ -1626,6 +1654,23 @@
           }
         }
       },
+      //跳转至预览
+      goUrlView(){
+        let routeData = this.$router.resolve({
+          name: 'newConfimationOrder',
+          query: {
+            // configId: item.ID,
+            // cityId: cityId,
+            // tcid: item.TCID,
+            // orderId: 0,
+            // vshowL: false,
+            // vshowM: false,
+            // vshowTCNUM: true,
+            // isClick: 1 //不计算点击
+          }
+        });
+        window.open(routeData.href, "_blank");
+      }
     },
     components: {
       oneday,

src/components/dmc/manager/dmcTotalTable.vue

@@ -1201,7 +1201,7 @@
         this.msg.StartDate = nowDate;
       }
       var userInfo = this.getLocalStorage();
-      if (userInfo.RB_Group_id == QjGroupId()) {
+      if (userInfo.RB_Group_id == this.QjGroupId()) {
         this.msg.LineId = 14;
       }
 

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -47,7 +47,7 @@
 
         <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
           :priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
-          :TeamType="TeamType"></TravelPrice>
+          :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
         <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice2>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -452,8 +452,14 @@
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
                     </el-checkbox>
-                    <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
+                    <template v-if="CurrentUserInfo.RB_Group_id==2">
+                        <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
                       v-if="(PostConfig.LineId==14 || PostConfig.LineId==131) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
+                    </template>
+                    <template v-else>
+                     <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
+                      v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> 
+                    </template>
                   </div>
                   <el-form-item prop="B2BMemberPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@@ -999,7 +1005,7 @@
   import commonPHlInfo from "../../commonPage/commonPriceHotelInfo.vue";
   import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
   export default {
-    props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
+    props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType","CurrentUserInfo","IsDirect"],
     data() {
       return {
         outerVisible: false,

src/router/config.js

@@ -4611,9 +4611,14 @@ export default {
                 title: '资产管理'
             },
         },
-        
-        
-        
+        {
+            path: '/newConfimationOrder', //新版行程预览
+            name: 'newConfimationOrder',
+            component: resolve => require(['@/components/newConfimationOrder'], resolve),
+            meta: {
+                title: '新版行程预览'
+            },
+        },
         {
             path: '/supplierIndex', //供应商首页
             name: 'supplierIndex',