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

src/components/FinancialModule/BasicDocuments.vue

@@ -847,7 +847,8 @@
             <span
               v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63
                   || GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70
-                  || GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77))
+                  || GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77
+                  || GetDetail.OtherType==78))
                   || ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)"
               @click="GoRoyaltyUrl(GetDetail)"
               style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
@@ -2532,6 +2533,7 @@
       // 提成明细详情
       GoRoyaltyUrl(GetDetail) {
         let obj = {
+          Periods: null,
           PeriodId: GetDetail.ReFinanceId,
           RB_Branch_Id: null,
           OutBranchId: String(GetDetail.RB_Branch_Id),
@@ -2570,6 +2572,11 @@
         } else if (GetDetail.OtherType == 73 || GetDetail.OtherType == 77) { //OP提成详情
           obj.tab = "出境OP提成详情"
           path = GetDetail.OtherType == 73 ? 'OpComPersonDetails' : 'OPCommissionDetail'
+        } else if(GetDetail.OtherType == 78){//票务提成详情
+          obj.tab = "票务提成详情"
+          obj.Periods = GetDetail.ReFinanceId
+          obj.PeriodId = null,
+          path = 'flightPerformance'
         } else if ((GetDetail.TemplateId == 28 || GetDetail.TemplateId == 30) &&
           GetDetail.OtherType != 63 && GetDetail.OtherType != 64) {
           this.$router.push({

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -869,7 +869,8 @@
                   ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
                 <span v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63
                 || GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70
-                || GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77))
+                || GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77
+                || GetDetail.OtherType==78))
                 || ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)"
                   @click="GoRoyaltyUrl(GetDetail)"
                   style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
@@ -1864,6 +1865,7 @@
       // 提成明细详情
       GoRoyaltyUrl(GetDetail) {
         let obj = {
+          Periods: null,
           PeriodId: GetDetail.ReFinanceId,
           RB_Branch_Id: null,
           OutBranchId: String(GetDetail.RB_Branch_Id),
@@ -1907,7 +1909,12 @@
         } else if (GetDetail.OtherType == 73||GetDetail.OtherType == 77) {//OP提成详情
           obj.tab = "出境OP提成详情"
           path = GetDetail.OtherType == 73?'OpComPersonDetails':'OPCommissionDetail'
-        }else if((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
+        } else if(GetDetail.OtherType == 78){//票务提成详情
+          obj.tab = "票务提成详情"
+          obj.Periods = GetDetail.ReFinanceId
+          obj.PeriodId = null,
+          path = 'flightPerformance'
+        } else if((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
         && GetDetail.OtherType!=63 && GetDetail.OtherType!=64){
           this.$router.push({
             name: 'CommissionDetail',

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -739,6 +739,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===18" @click="goUrl('CharterOrderListOP',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===19" @click="goUrl('SingleticketOrderListOP',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span v-if="rowData.DataType===20">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===6||rowData.DataType===7||rowData.DataType===12||rowData.DataType===13">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===9">{{rowData.TCID}}</span>
@@ -866,6 +867,7 @@ Vue.component("TCNUMJump", {
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===18" @click="goUrl('CharterOrderListOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===19" @click="goUrl('SingleticketOrderListOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span v-if="rowData.DataType===20">{{rowData.TCNUM}}</span>
+    <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -968,7 +970,7 @@ Vue.component("TCNUMJump", {
       }else if(row.DataType!=17&&row.DataType!=18&&row.DataType!=19&&row.TeamType!=2){
         this.$router.push({
           path: "/" + path,
-          query: { tcmun: id, blank: "y" }
+          query: { tcmun: id,id: id, blank: "y" }
         });
       }else{
         if(row.DataType==18){