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

src/components/newConfimationOrder.vue

@@ -333,7 +333,8 @@
     <div>
       <input type="button" value="行程下载" class="newTripDownbtn"
         @click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
-      <input type="button" value="WORD手机版" style="display:none;" @click="ToDownWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" class="newTripDownbtn"/>
+      <input type="button" value="WORD手机版"  @click="ToDownWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游',0)" class="newTripDownbtn"/>
+      <input type="button" value="WORD电脑版"  @click="ToDownWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游',1)" class="newTripDownbtn"/>
     </div>
     <div class="newTripCom_Img">
       <img :src="lineTripFeatureTopBg" alt="" />
@@ -754,7 +755,7 @@
         lineTripFeatureBottomBg: '',
         //航空公司下拉
         airLineList: [],
-
+        lineId:0,//线路编号
         vshowA: this.$route.query.vshowA === undefined ? true : this.$route.query.vshowA === 'true',
         vshowB: this.$route.query.vshowB === undefined ? true : this.$route.query.vshowB === 'true',
         vshowC: this.$route.query.vshowC === undefined ? true : this.$route.query.vshowC === 'true',
@@ -958,7 +959,8 @@
           //模板参数
           templateId: this.showType,
           //用户Id
-          UId: this.getLocalStorage().EmployeeId
+          UId: this.getLocalStorage().EmployeeId,
+          lineId:this.lineId,//线路编号
         };
         this.$http({
           headers: {
@@ -987,7 +989,7 @@
       },
 
       //生成word
-      ToDownWord:function(title){
+      ToDownWord:function(title,type){
         this.pdfLoading = true
         let msg = {
           configId: this.$route.query.configId,
@@ -1025,12 +1027,13 @@
           isShowVisa: this.vshowH ? 1 : 0,
           //是否显示视频图片
           isShowVideoImg: this.vshowO ? 1 : 0,
-          //isPc是否PC下载
-          isPc: 0,
+          //isPc是否PC下载(0-手机版，1-PC版)
+          isPc: type,
           //模板参数
           templateId: this.showType,
           //用户Id
-          UId:this.getLocalStorage().EmployeeId
+          UId:this.getLocalStorage().EmployeeId,
+          lineId:this.lineId,//线路编号
         };
         let urlObj = this.domainManager();
         this.$http({
@@ -1169,6 +1172,8 @@
         this.feature = res.data.data.feature
         this.showType = this.feature.featureType;
         this.isDirect = res.data.data.isDirect;
+        this.lineId=res.data.data.lineId;
+
         if (data.priceList.length > 0) {
           data.priceList[0].priceFlight.forEach((x, i) => {
             if (i == 0) {