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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1874,8 +1874,13 @@
             obj.tab = "台湾提成详情"
             path = 'domesticCommissiondetailsTW'
           }else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情 新版本
-            obj.tab = "台湾销售提成详情"
-            path = 'domesticCommissiondetailsTW'
+            if(GetDetail.ReFinanceId2==1){
+              obj.tab = "台湾销售提成详情"
+              path = 'domesticCommissiondetailsTW'
+            }else{
+              obj.tab = "台湾销售地接提成详情"
+              path = 'domesticCommissionUserTW'
+            }
             // if (GetDetail.ReFinanceId2 == 1) {
             //   urlName = 'domesticCommissiondetailsTW'
             // }

src/components/FinancialModule/domesticCommissionUserTW2.vue

@@ -169,15 +169,10 @@
                 // this.msg.OutBranchId = userInfo.RB_Branch_id
             }
             this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
-            if (this.$route.query && this.$route.query.OutBranchId) {
-                // this.msg.OutBranchId = this.$route.query.OutBranchId
-            }
-            if (this.$route.query && this.$route.query.RB_Branch_Id) {
-                // this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id
-            }
-            if (this.$route.query && this.$route.query.RB_Department_Id) {
-                // this.msg.RB_Department_Id = this.$route.query.RB_Department_Id
-            }
+            this.msg.PeriodId = this.$route.query.periods?Number(this.$route.query.periods):0
+            // this.msg.OutBranchId = this.$route.query.OutBranchId?this.$route.query.OutBranchId:-1
+            // this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?this.$route.query.RB_Branch_Id:-1
+            // this.msg.RB_Department_Id = this.$route.query.RB_Department_Id?this.$route.query.RB_Department_Id:-1
             this.getList();
             // this.getqishilist()
             this.getCompanyList()//获取公司