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

src/components/Details.vue

@@ -80,6 +80,7 @@
 import routerConfig from '../router/config';
 import analogIFrame from './analogIFrame';
 import MsgBus from '../assets/utils/msgBus.js';
+import { ALPN_ENABLED } from 'constants';
 export default {
   data() {
     return {
@@ -107,6 +108,8 @@ export default {
       openMode:0,
       blankUrl:'',
       navWidth:0,
+      //加密id
+      EnCodeWord:''
     };
   },
   components:{
@@ -849,7 +852,24 @@ export default {
     },
     filterRouter(){
       let that=this
+      let userInfo = this.getLocalStorage();
       this.$router.beforeEach((to, from, next) => {
+        if(to.path=='/JapanHotel'){
+            let msg = {
+              id:userInfo.EmployeeId
+            }
+            this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
+                if (res.data.resultCode == 1) {
+                    this.EnCodeWord=res.data.data;
+                    window.open("http://www.oytour.com/#/hotelHome?uid="+this.EnCodeWord, "_blank");
+                } else {
+                    this.Error(res.data.message);
+                }
+                },
+                err => {}
+            );
+            return;
+        }
         document.title = to.meta.title ? to.meta.title+'-四川和平国际旅行社' : '四川和平国际旅行社'
         // console.log("to.query.blank && to.query.blank=='y'",to.query,"666")
         if(to.path=="/ModifyVisaProduct"){

src/components/LeaderManagement/leaderReimbursement.vue

@@ -284,18 +284,20 @@
             <td v-if="childIndex==0" :rowspan="6">
               <span v-if="subItem.PayStyle === 1">现付</span>
               <span v-else-if="subItem.PayStyle === 2">签单</span>
+              <span v-else-if="subItem.PayStyle === 3">实物抵扣</span>
               <span v-else-if="subItem.PayStyle === 4">预付</span>
-              <span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
+              <span v-else-if="subItem.PayStyle === 5">预付款抵扣</span>
               <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
               <span v-else></span>
               </br>
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
-                <td v-if="childIndex==0" :rowspan="6">
+           <td v-if="childIndex==0" :rowspan="6">
               <span v-if="subItem.DMCPayType === 1">现付</span>
               <span v-else-if="subItem.DMCPayType === 2">签单</span>
+              <span v-else-if="subItem.DMCPayType === 3">实物抵扣</span>
               <span v-else-if="subItem.DMCPayType === 4">预付</span>
-              <span v-else-if="subItem.DMCPayType === 5">实物抵扣</span>
+              <span v-else-if="subItem.DMCPayType === 5">预付款抵扣</span>
               <span v-else-if="subItem.DMCPayType === 6">公司合团支付</span>
               <span v-else-if="subItem.DMCPayType === 9">月结</span>
               </br>
@@ -846,7 +848,7 @@
           TCIDs: this.$route.query.id
         }, res => {
           if (res.data.resultCode == 1) {
-            let nav = res.data.data
+            let nav = res.data.data.list
             let num = 0;
             nav.forEach(x => {
               nav.LeaderGetPriceT = 0;

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -839,7 +839,9 @@
                 <div class="TCID_cont PingFangSC">
                   团期：
                   <span v-show="item.PriceList.length==0">暂无</span>
-                  <span class="Ticket_TCID" v-for="subItem in item.PriceList">({{subItem.TCID}}){{subItem.TCNUM}}
+                  <span class="Ticket_TCID" v-for="subItem in item.PriceList">
+                    <a style="color:blue;cursor:pointer" @click='goUrlT("TravelControlList",subItem.TCNUM,"团控列表")'>
+                    ({{subItem.TCID}}){{subItem.TCNUM}} </a>
                     &nbsp;</span>
                 </div>
               </el-col>
@@ -962,6 +964,18 @@
       };
     },
     methods: {
+      //页面跳转
+      goUrlT(path, obj, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            "tcmun": obj,
+            IsUnionCked:0,//只看主团
+            blank: 'y',
+            tab: title
+          }
+        })
+      },
       getList() {
         this.loading = true;
         if (this.Query.ID == "") {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -4865,6 +4865,7 @@
           query: {
             id: id,
             OutBranchId: OutBranchId,
+            IsHaveAuth:true,
             blank: "y",
             tab: "团队收支明细"
           }

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -201,7 +201,6 @@ export default {
         this.msg,
         res => {
           this.QueryMsg.loading = false;
-          console.log(res.data.data);
           if (res.data.resultCode == 1) {
             this.QueryMsg.dataList = res.data.data.pageData.result;
             this.IsHaveLeader=res.data.data.pageData.IsHaveLeader;