优化同业制单

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1786,7 +1786,7 @@
             name: 'TradeTicketDetails',
             query: {
               PeriodId: GetDetail.ReFinanceId,
-              RB_Branch_Id: GetDetail.RB_Branch_Id,
+              OutBranchId: GetDetail.RB_Branch_Id,
               blank: "y",
               tab: "同业提成详情"
             }

src/components/FinancialModule/TradeCommission/TicketCommission.vue

@@ -95,7 +95,7 @@
                             icon="iconfont icon-chakan" circle></el-button>
                     </el-tooltip>
                     <el-tooltip v-if="cMaker==true" class="item" effect="dark" content="提成制单" placement="top">
-                        <el-button @click="YijianZD(item,1)" type="danger" class="CM_look" v-if="cMaker==true"
+                        <el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
                             icon="iconfont icon-mui-icon-add" circle></el-button>
                     </el-tooltip>
                     <!-- <el-tooltip class="item" effect="dark" content="当期利润" placement="top">
@@ -231,24 +231,15 @@
                 );
             },
             // 点击制单
-            YijianZD(item,type) {
+            YijianZD(item) {
                 let Money 
                 if(this.msg.OutBranchId>-1){
-                    if(type==1){
-                        if(item.BranchCommission>0){
+                    if(item.BranchCommission>0){
                             Money=item.BranchCommission
                         }else{
                             this.Error("公司提成为0,不能制单!")
                             return;
                         }
-                    }if(type==2){
-                        if(item.BranchCommission>0){
-                            Money=item.BranchCommission
-                        }else{
-                            this.Error("公司提成为0,不能制单!")
-                            return;
-                        }
-                    }
                     
                 }else{
                     Money=item.SumPrice
@@ -260,6 +251,7 @@
                         XSTC: 1,
                         OtherType:72,
                         ReFinanceId:item.Id,
+                        isRB_Branch_Id: true
                     }
                     let query = {
                         blank: "y",

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -278,13 +278,14 @@
         }
         this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
         this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:''
+        this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
         this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
         this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) 
         if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
             ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
             ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
                 this.disabled = false;
-                this.msg.OutBranchId = -1
+                this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
                 this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1
                 // this.msg.RB_Department_Id = -1
                 this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1

src/components/FinancialModule/addFinancialDocuments.vue

@@ -171,7 +171,7 @@
                    (<el-select  filterable  v-model='msg.RB_Branch_Id'  ref='CostTypeId' 
                    @change="admin_get_DepartmentGetList(msg.RB_Branch_Id)"  
                    class="w120 _border_b_1"
-                   :disabled="orderObj&&orderObj.Rate?true:false">
+                   :disabled="orderObj&&(orderObj.Rate||orderObj.isRB_Branch_Id)?true:false">
                            <el-option v-for='item in companyList'
                                :label='item.BName'
                                :value='item.Id'