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

src/components/FinancialModule/RecPayQuery.vue

@@ -919,6 +919,10 @@ export default {
             this.msg.BankID=this.$route.query.BankID;
             this.transactionDate[0]=this.$route.query.StartDate;
             this.transactionDate[1]=this.$route.query.StartDate;
+            if(this.$route.query.BankID==''){
+                // 费用类型：机票责让费
+                this.msg.CostTypeID=197;
+            }
         }
         if(this.$route.query.air){
             this.msg.AccountType=17;

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -698,7 +698,7 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
-  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票责让{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
@@ -728,6 +728,11 @@ Vue.component("TCNUMJump", {
       if(rowData.DataType===12){
         BankID=19;
       }
+      // 机票责让费
+      if(rowData.DataType===13){
+        BankID="";
+        StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
+      }
       if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
         StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
       }

src/plug/index.js

@@ -118,11 +118,12 @@ export default {
         let javaUrldo="";
         javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
         
-        if (locationName.indexOf('yx.oytour') !== -1) {
-          domainUrl = "http://reborn.oytour.com";
-        } else if (locationName.indexOf('testerp.oytour') !== -1) {
+        if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";
         }
+        else if (locationName.indexOf('oytour') !== -1) {
+          domainUrl = "http://reborn.oytour.com";
+        }  
         var obj = {
           //主地址
           DomainUrl: domainUrl,