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

src/components/LeaderManagement/leaderReimbursement.vue

 <template>
   <div class="mb30" v-loading='loading'>
+    <input type="button" @click="downloadMoneyPlan()" value="下载" style="display:none;" />
     <div style="display: flex;justify-content: end;margin-top: 10px;margin-bottom: 10px;">
       <p><span class="groupTourOrderByTuan_ico"><i
             style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
@@ -924,12 +925,11 @@
               <!-- <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
                 v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input> -->
 
-              <el-input class="w300"  type="number" v-model="leadr.LeaderGetPriceT"
-                @input="changePrice"></el-input>
+              <el-input class="w300" type="number" v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input>
             </template>
           </div>
           <span style="color:red;font-weight:bold;">
-          注意：<span>1、合团的请分别领款!</span>  <span style="margin-left: 20px;">2、如需日本PIC付款，请选择PIC相关付款流程，请注意日本转账手续费</span>
+            注意：<span>1、合团的请分别领款!</span> <span style="margin-left: 20px;">2、如需日本PIC付款，请选择PIC相关付款流程，请注意日本转账手续费</span>
           </span>
         </td>
         <td>
@@ -1135,6 +1135,15 @@
       commonHotelInfo
     },
     methods: {
+      //用款计划下载
+      downloadMoneyPlan() {
+        var fileName = "test";
+        fileName += ".xls"
+        this.loading = true;
+        this.GetLocalFile("dmcstatistics_post_DownLoadGroupLeaderUserMoneyPlan",this.msg, fileName, res => {
+          this.loading = false;
+        });
+      },
       changePrice() {
         this.$forceUpdate();
       },

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -810,7 +810,7 @@
         this.downloadBill = true;
       },
       downLoadOffer(item) {
-        console.log("item", item);
+ 
         var downMsg = {
           OfferId: item.ID,
         };

src/components/confirmationOrderDownLoadNew.vue

@@ -556,26 +556,27 @@
         }
         console.log("title", title);
         var fileName = title + ".pdf";
-        if (this.orderId && this.orderId > 0) {
-          //出团通知书下载
-          this.pdfDownLoad(fileName, msg);
-        } else if (urlObj.IsOnline == 0) {
-          //本地行程下载
-          this.pdfDownLoad(fileName, msg);
-        } else {
-          //阿里云行程下载
-          var objFileKey = "TripDownLoad"
-          objFileKey += "/" + msg.configId + "_" + msg.tcid;
-          objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
-          that.downloadChengDuFileRename(objFileKey, fileName, res => {
-            console.log("ali_doanload", res)
-            if (res.resultCode == 0) {
-              that.pdfDownLoad(fileName, msg);
-            } else {
-              that.pdfLoading = false;
-            }
-          })
-        }
+          that.pdfDownLoad(fileName, msg);
+        // if (this.orderId && this.orderId > 0) {
+        //   //出团通知书下载
+        //   this.pdfDownLoad(fileName, msg);
+        // } else if (urlObj.IsOnline == 0) {
+        //   //本地行程下载
+        //   this.pdfDownLoad(fileName, msg);
+        // } else {
+        //   //阿里云行程下载
+        //   var objFileKey = "TripDownLoad"
+        //   objFileKey += "/" + msg.configId + "_" + msg.tcid;
+        //   objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
+        //   that.downloadChengDuFileRename(objFileKey, fileName, res => {
+        //     console.log("ali_doanload", res)
+        //     if (res.resultCode == 0) {
+            
+        //     } else {
+        //       that.pdfLoading = false;
+        //     }
+        //   })
+        // }
       },
       pdfDownLoad: function (fileName, msg) {
         let urlObj = this.domainManager();
@@ -595,7 +596,7 @@
             this.pdfLoading = true;
             let urlObj = this.domainManager();
             var ocrUrl = "";
-            ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdf?configId=" + msg.configId + "&url=" +
+            ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdfERP?configId=" + msg.configId + "&url=" +
               encodeURIComponent(path);
             this.$http({
               headers: {

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -125,12 +125,12 @@
           <!-- ppt 模版行程 -->
           <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag">
             <div style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
-            <div v-if="FeatureData.TripImageList.length>0">
-              <template v-for="url in FeatureData.TripImageList">
+            <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
+              <template v-for="url in FeatureData.TripImageListNew">
                 <el-image
                 style="width: 100%; height: auto"
                 :src="url"
-                :preview-src-list="FeatureData.TripImageList"></el-image>
+                :preview-src-list="FeatureData.TripImageListNew"></el-image>
               </template>
             </div>
           </div>
@@ -302,7 +302,7 @@
       handleMessage(event,targetOrigin) {
         if(this.isPostMessage) return
         if(event.data=='行程数据保存成功'){
-          this.dialogPptistVisible = false
+          // this.dialogPptistVisible = false
           this.isPostMessage = true
           this.$emit('ConfigInfo')
         }

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -304,16 +304,6 @@
       };
     },
     methods: {
-      handleMessage(event,targetOrigin) {
-        console.log(event.data,'------',targetOrigin)
-        if(this.isPostMessage) return
-        if(event.data=='行程数据保存成功'){
-          this.isPostMessage = true
-        }
-        if(event.origin === targetOrigin){
-
-        }
-      },
       /*获取行程特色内容对象*/
       getFeature(featureObj) {
         this.PostFeature = featureObj;
@@ -754,6 +744,7 @@
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;
                   this.FeatureData.FeatureType = tempData.Feature.FeatureType;
+                  this.FeatureData.TripImageListNew = tempData.Feature.TripImageListNew;
                   this.FeatureData.FeatureImg = tempData.Feature.FeatureImg;
                   this.FeatureData.TemplateId = tempData.Feature.TemplateId;
                   this.FeatureData.FeatureContent = tempData.Feature.FeatureContent;