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

src/components/SalesModule/productQuery.vue

@@ -855,6 +855,9 @@
                 <el-tooltip class="item" effect="dark" :content="$t('Operation.Op_tripDownLoad')" placement="top-start">
                   <el-button @click="toTrip(item)" type="primary" style='background:#47BF8C; border-color:#47BF8C' icon="iconfont icon-xiazai"></el-button>
                 </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="直客版预览" placement="top-start" v-if="item.LineID!=2&&item.LineID!=8">
+                    <el-button @click.native="goB2B(item)" type="primary" style='background:#F16C3C; border-color:#F16C3C' icon="iconfont icon-view"></el-button>
+                </el-tooltip> 
               </el-button-group>
               <el-button-group style="display:block;">
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.ShareTrip')" placement="top-start" style="float:left">
@@ -2358,6 +2361,15 @@
           if (res.data.resultCode == 1) {
           }
         }, err => {})
+      },
+      //直客版行程
+      goB2B(item) {
+        window.open(
+            "http://www.oytour.com/#/newTrip" +'?ID='+encodeURIComponent(item.ConfigID) +
+                "&" +
+                'tcid='+item.TCID,
+            "_blank"
+       );
       }
     },
     mounted() {