no message

src/components/FinancialModule/BasicDocuments.vue

@@ -426,10 +426,18 @@
                     @click="GoOPurl('OPsalesCommissiondetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;
                     text-decoration: underline;">
                     国内提成详情</span>
+                    <span
+                    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)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
                     出境提成详情</span>
+                    <span
+                    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="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;
                     color: #000;font-size: 14px;text-decoration: underline;">
                     拜访记录</span>
@@ -1803,6 +1811,7 @@ export default {
                 path: path,
                 query: {
                     PeriodId: this.GetDetail.ReFinanceId,
+                    OutBranchId: Number(this.GetDetail.RB_Branch_Id),
                     Type:type,
                     blank: 'y',
                     tab: '单项服务提现详情'
@@ -1977,15 +1986,22 @@ export default {
 
             },
             GoOPurl(path,GetDetail){
-              this.$router.push({
-              name: path,
-              query: {
+              let obj = {
                 PeriodId: GetDetail.ReFinanceId,
-                OutBranchId: String(GetDetail.RB_Branch_Id),
+                RB_Branch_Id: null,
+                OutBranchId: null,
                 blank: "y",
-                tab: "op提成明细"
+                tab: "提成明细"
               }
-            });
+              if(GetDetail.OtherType==72){
+                obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
+              }else{
+                obj.OutBranchId = String(GetDetail.RB_Branch_Id)
+              }
+              this.$router.push({
+                name: path,
+                query: obj
+              });
             // this.$router.push({
             //     name: 'OpComPersonDetails',
             //     query: {

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -849,11 +849,19 @@
                 v-if="GetDetail.OtherType==48"
                 @click="GoOPurl('OPsalesCommissiondetails',GetDetail)"
                 style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">国内提成详情</span>
+                <span
+                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)"
                 style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span>
+                <span
+                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="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)"
@@ -1576,6 +1584,7 @@
           path: path,
           query: {
             PeriodId: this.GetDetail.ReFinanceId,
+            OutBranchId: Number(this.GetDetail.RB_Branch_Id),
             Type: type,
             blank: 'y',
             tab: '单项服务提现详情'
@@ -1766,14 +1775,21 @@
 
       },
       GoOPurl(path,GetDetail) {
+        let obj = {
+          PeriodId: GetDetail.ReFinanceId,
+          RB_Branch_Id: null,
+          OutBranchId: null,
+          blank: "y",
+          tab: "提成明细"
+        }
+        if(GetDetail.OtherType==72){
+          obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
+        }else{
+          obj.OutBranchId = String(GetDetail.RB_Branch_Id)
+        }
         this.$router.push({
           name: path,
-          query: {
-            PeriodId: GetDetail.ReFinanceId,
-            OutBranchId: String(GetDetail.RB_Branch_Id),
-            blank: "y",
-            tab: "op提成明细"
-          }
+          query: obj
         });
       },
       Gourl(GetDetail) {

src/components/FinancialModule/ServiceCommission/ServiceCommissiondetails.vue

@@ -221,6 +221,9 @@
         if (this.$route.query.UserId && this.$route.query.UserId > 0) {
           this.msg.UserId = Number(this.$route.query.UserId)
         }
+        if (this.$route.query.OutBranchId) {
+          this.msg.OutBranchId = Number(this.$route.query.OutBranchId)
+        }
         if (this.$route.query.RB_Branch_Id) {
           this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
         }

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1428,7 +1428,7 @@
           this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
           this.msg.EduCommissionEmp = this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp: null
         }
-        if(this.orderObj.OtherType==75&&this.orderObj.ReFinances==''){
+        if(this.orderObj&&this.orderObj.OtherType&&this.orderObj.OtherType==75&&this.orderObj.ReFinances==''){
           this.Error(`成本月结数据不能为空！`)
           return
         }