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

src/components/FinancialModule/MonthlyCostStatement/components/selectSettlementData.vue

@@ -35,7 +35,7 @@
               background-color: #E95252;
               line-height: 16px;
               border-radius: 4px;">
-              经营费收入
+              其他收入
             </span>
 
             <span v-else-if="scope.row.Type==2" style="display: inline-block;

src/components/FinancialModule/MonthlyCostStatement/settlement.vue

@@ -70,7 +70,7 @@
           <button class="normalBtn" @click="GenerateDocuments()">生成结算单据</button>
         </li>
       </ul>
-      注释：此处为对台湾结算，结算金额 = 分润收入 + 经营费收入 + 台湾成本支出 - 台湾团费收入
+      注释：此处为对台湾结算，结算金额 = 分润收入 + 其他收入(经营费+佣金等) + 台湾成本支出 - 台湾团费收入
     </div>
     <div style="display: flex;flex-wrap: nowrap; padding: 10px;">
       <div style="display: flex;flex-wrap: wrap;">
@@ -120,7 +120,7 @@
               background-color: #E95252;
               line-height: 16px;
               border-radius: 4px;">
-              经营费收入
+              其他收入
             </span>
 
             <span v-else-if="scope.row.Type==2" style="display: inline-block;

src/components/index.vue

@@ -1240,7 +1240,7 @@
       :ChangeThePriceObj="ChangeThePriceObj"
       @ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
     <!-- ppt 模版新增编辑窗口 -->
-    <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" @close="closeIframe()"></pptIframe>
+    <!-- <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" @close="closeIframe()"></pptIframe> -->
   </div>
 </template>
 
@@ -2034,14 +2034,23 @@
       },
       // 添加编辑模版
       journeyTemplate(type) {
+        this.apipost(
+          "travel_temp_token", {},
+          res => {
+            if (res.data.resultCode == 1) {
               let href = this.domainManager().PptUrl
               // type 1销售暂存模版
               if (type == 1) {
-          this.TemplateUrl = `${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=2&TempType=0`
+                this.TemplateUrl = `${href}/?uid=${res.data.data}&ConfigId=0&model=2&TempType=0`
               } else {
-          this.TemplateUrl = `${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0`
+                this.TemplateUrl = `${href}/?uid=${res.data.data}&ConfigId=0&model=1&TempType=0`
               }
               this.dialogPptistVisible = true
+              window.open(this.TemplateUrl)
+            }
+          }
+        );
+
       },
       GetExaminePriceOrderPageList(type) {
         this.apipost(

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -6,12 +6,10 @@
       </span>
       <span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
       <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
-      <template v-if="true">
       <span v-if="FeatureData.ConfigId&&dataAll.FeaturePageType&&FeatureData.FeatureType==9" class="foldList"
         style="margin-right: 5px;" @click="journeyTemplate()">编辑行程</span>
       <span style="color: red;float: right;margin-right: 5px;line-height: 28px;font-weight:bold;">
         新复制的【团期】,如需单独修改【行程特色】操作步骤： 当团修改=》保存=》团控列表=》当团修改=》编辑行程特色.</span>
-      </template>
       <div class="TrfList clearfix">
         <template v-for="item in TypeArray">
           <div class="TFslide"
@@ -410,8 +408,8 @@
         this.dialogPptistVisible = false
       },
       handleMessage(event, targetOrigin) {
-        console.log("handleMessage_event", event);
-        console.log("handleMessage_event.data", event.data);
+        // console.log("handleMessage_event", event);
+        // console.log("handleMessage_event.data", event.data);
         if (this.isPostMessage) return
         if (event.data && event.data.data && !event.data.data) return
         if (event && event.data) {
@@ -439,11 +437,19 @@
       },
       // 添加编辑模版
       journeyTemplate() {
+        this.apipost(
+          "travel_temp_token", {},
+          res => {
+            if (res.data.resultCode == 1) {
               this.isPostMessage = false;
               let href = this.domainManager().PptUrl
               this.TemplateUrl =
-          `${href}/?uid=${this.CurrentUserInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
+                `${href}/?uid=${res.data.data}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
               this.dialogPptistVisible = true
+            }
+          }
+        );
+
       },
       //重新加载行程特色
       ReLoadFeature() {
@@ -747,11 +753,20 @@
       if (obj) {
         this.clickFeature(obj)
       }
+      this.apipost(
+          "travel_temp_token", {},
+          res => {
+            if (res.data.resultCode == 1) {
               this.myIframeUrl =
-        `${this.domainManager().PptUrl}/?uid=${this.CurrentUserInfo.EmployeeId}&ConfigId=${this.$route.query.configId}&index=0&model=3&w=1108`
+                `${this.domainManager().PptUrl}/?uid=${res.data.data}&ConfigId=${this.$route.query.configId}&index=0&model=3&w=1108`
               if (document.all.myIframe) {
                 document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
               }
+
+            }
+          }
+        );
+
     },
     watch: {
       dataAll: {