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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -844,8 +844,8 @@
                 @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商出库单:{{GetDetail.ReFinanceId}}</span>
               <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==17"
                 @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
-                <!-- (GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
-                <span
+
+                <!--<span
                 v-if="GetDetail.OtherType==48"
                 @click="GoOPurl('OPsalesCommissiondetails',GetDetail)"
                 style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">国内提成详情</span>
@@ -853,7 +853,6 @@
                 v-if="GetDetail.OtherType==43"
                 @click="GoOPurl('domesticCommissiondetails',GetDetail)"
                 style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">国内提成详情</span>
-                <!-- (GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
                 <span
                 v-if="GetDetail.OtherType==73"
                 @click="GoOPurl('OpComPersonDetails',GetDetail)"
@@ -862,6 +861,15 @@
                 v-if="GetDetail.OtherType==72"
                 @click="GoOPurl('TradeTicketDetails',GetDetail)"
                 style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span>
+                -->
+                <!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 -->
+                <span v-if="GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57
+                  && GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
+                  && GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=75"
+                  @click="GoRoyaltyUrl(GetDetail)"
+                  style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
+                  提成详情
+                </span>
                 <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)"
                 style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
               <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)"
@@ -896,10 +904,11 @@
             <div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleDetails('CharterOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
 
-            <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
+
+            <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
             <div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"
-              @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div>
+              @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div> -->
           </div>
 
           <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%"
@@ -1792,83 +1801,48 @@
           query: obj
         });
       },
-      Gourl(GetDetail) {
-        if (GetDetail.OtherType == 43) { //9月9号新增 如果是43 就跳转到国内的详情  反之按之前的来用
-          this.$router.push({
-            name: 'domesticCommissiondetails',
-            query: {
-              PeriodId: GetDetail.ReFinanceId,
-              blank: "y",
-              tab: "国内销售提成详情"
-            }
-          });
-        } else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情
-          this.$router.push({
-            name: 'domesticCommissiondetailsTW',
-            query: {
+      // 提成明细详情
+      GoRoyaltyUrl(GetDetail) {
+        let obj = {
           PeriodId: GetDetail.ReFinanceId,
-              OutBranchId: GetDetail.RB_Branch_Id,
+          RB_Branch_Id: null,
+          OutBranchId: String(GetDetail.RB_Branch_Id),
           blank: "y",
-              tab: "台湾销售提成详情"
+          tab: "",
+          Type: null,
         }
-          });
+          let path = ''
+          if (GetDetail.OtherType == 43) { //9月9号新增 如果是43 就跳转到国内的详情  反之按之前的来用
+            obj.tab = "国内提成详情"
+            path = 'domesticCommissiondetails'
           }else if(GetDetail.OtherType==48){
-                this.$router.push({
-                    name: 'OPsalesCommissiondetails',
-                    query: {
-                      PeriodId: GetDetail.ReFinanceId,
-                      OutBranchId: GetDetail.RB_Branch_Id,
-                       blank: "y"
-                    }
-                });
-            }else if(GetDetail.OtherType==73){
-                this.$router.push({
-                    name: 'OpComPersonDetails',
-                    query: {
-                    PeriodId: GetDetail.ReFinanceId,
-                    OutBranchId: GetDetail.RB_Branch_Id,
-                      blank: "y"
-                    }
-                });
-          } else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情
-          let urlName
-          if (GetDetail.ReFinanceId2 == 1) {
-            urlName = 'domesticCommissiondetailsTW'
-          }
-          if (GetDetail.ReFinanceId2 == 2) {
-            urlName = 'domesticCommissionUserTW'
-          }
-          this.$router.push({
-            name: urlName,
-            query: {
-              PeriodId: GetDetail.ReFinanceId,
-              OutBranchId: GetDetail.RB_Branch_Id,
-              blank: "y",
-              tab: "台湾销售提成详情"
-            }
-          });
-        } else if (GetDetail.OtherType == 72) {//同业提成详情
-          this.$router.push({
-            name: 'TradeTicketDetails',
-            query: {
-              PeriodId: GetDetail.ReFinanceId,
-              // OutBranchId: GetDetail.RB_Branch_Id,
-              RB_Branch_Id: GetDetail.RB_Branch_Id,
-              blank: "y",
-              tab: "同业提成详情"
-            }
-          });
+            obj.tab = "国内OP提成详情"
+            path = 'OPsalesCommissiondetails'
+          } else if (GetDetail.OtherType == 63 || GetDetail.OtherType == 64) {//单项提成详情
+            obj.tab = GetDetail.OtherType == 63?"单项提成详情":"单项OP提成详情"
+            path = 'ServiceCommissiondetails'
+            obj.Type = GetDetail.OtherType == 63?1:2
+          }else if (GetDetail.OtherType == 69) { //跳转台湾提成的三级详情 老版本
+            obj.tab = "台湾提成详情"
+            path = 'domesticCommissiondetailsTW'
+          }else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情 新版本
+            obj.tab = "台湾销售提成详情"
+            path = 'domesticCommissiondetailsTW'
+            // if (GetDetail.ReFinanceId2 == 1) {
+            //   urlName = 'domesticCommissiondetailsTW'
+            // }
+            // if (GetDetail.ReFinanceId2 == 2) {
+            //   urlName = 'domesticCommissionUserTW'
+            // }
+        } else if (GetDetail.OtherType == 72) {//出境提成详情
+          obj.tab = "出境提成详情"
+          path = 'TradeTicketDetails'
+          obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
+          obj.OutBranchId = null
         } else if (GetDetail.OtherType == 73) {//OP提成详情
-          this.$router.push({
-            name: 'OpComPersonDetails',
-            query: {
-              PeriodId: GetDetail.ReFinanceId,
-              OutBranchId: GetDetail.RB_Branch_Id,
-              blank: "y",
-              tab: "同业提成明细"
-            }
-          });
-        } else {
+          obj.tab = "出境OP提成详情"
+          path = 'OpComPersonDetails'
+        }else {
           this.$router.push({
             name: 'CommissionDetail',
             query: {
@@ -1879,6 +1853,12 @@
             }
           });
         }
+        if(path){
+          this.$router.push({
+            name: path,
+            query: obj
+          });
+        }
 
 
       },

src/components/FinancialModule/domestic/OPsalesCommissionUser.vue

@@ -209,7 +209,6 @@
                 );
             },
             getqishilist() {
-              // sellcommission_GetGNCommissionPeriodsList
                 this.apipost(
                     "opcommission_GetGNOPCommissionPeriodsList",
                     {},

src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue

@@ -282,7 +282,7 @@
           );
         },
         getqishilist() {
-          // opcommission_GetGNOPCommissionPeriodsList sellcommission_GetGNCommissionPeriodsList
+          // sellcommission_GetGNCommissionPeriodsList
           this.apipost(
             "opcommission_GetGNOPCommissionPeriodsList", {},
             res => {