no message

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1437,6 +1437,9 @@ export default {
                        // }
                        if (!this.orderObj && id > 0) {
                            this.msg.RB_Branch_Id = this.msg.RB_Branch_Id
+                       }else if(this.orderObj&&this.orderObj.OutBranchId!=''){
+                        //    台湾提成公司
+                        this.msg.RB_Branch_Id = this.orderObj.OutBranchId;
                        } else {
                            this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
                        }
@@ -1448,6 +1451,8 @@ export default {
                    } else if(this.$route.query.companyID){
                      this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
                    }
+                   
+                
                    this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
                    this.msg.PayDate = this.msg.PayDate ;
                    this.msg.detailList=[];
@@ -1563,6 +1568,7 @@ export default {
                    this.loading=false;
                    this.$message.error(res.data.message);
                }
+               
            }, err => {})
        },
        admin_get_DepartmentGetList(Bid, T){
@@ -1597,6 +1603,11 @@ export default {
                  }else {
                    this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().RB_Department_Id;
                  }
+                //  台湾提成公司
+                if(this.orderObj&&this.orderObj.OutBranchId!=''){
+                    this.msg.RB_Branch_Id = this.orderObj.OutBranchId;
+                }
+                
              }
          }, err => {})
        },
@@ -1660,7 +1671,7 @@ export default {
                    }, err => {})
 
                }
-               if(this.msg.RB_Branch_Id){
+               if(this.msg.RB_Branch_Id!=''){
                    this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id)  
                }
            }, err => {})
@@ -1779,6 +1790,7 @@ export default {
            this.tradeObj = JSON.parse(this.$route.query.tradeObj);
        } else{
            this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
+           
        }
        this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
        let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
@@ -1806,6 +1818,7 @@ export default {
    },
 
    mounted(){
+    
        // 付款单新增或修改  获取最大金额
        if((this.$route.query.type && this.$route.query.type==2) || (this.$route.query.Type && this.$route.query.Type==2)){
            this.MaxMoney();
@@ -1815,7 +1828,13 @@ export default {
        this.EmployeeId=userInfo.EmployeeId;
        this.emplyeeName=userInfo.emName;
        this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
-       this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
+       //  台湾提成公司
+       if(this.orderObj&&this.orderObj.OutBranchId!=''){
+        this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.OutBranchId;
+       }else{
+        this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
+       }
+       
        this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id;
        this.IsUploadPic = this.$route.query.IsUploadPic;
        this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';

src/components/FinancialModule/domesticCommissionTW.vue

@@ -65,7 +65,7 @@
                 <th>总提成</th>
                 <th>所属公司提成</th>
                 <th>财务单据</th>
-                <th width="150">汇率</th>
+                <th width="280">汇率</th>
                 <th>操作信息</th>
                 <th>操作</th>
             </tr>
@@ -91,7 +91,8 @@
                             <div
                             :style="{'border-top': y!=0? '1px solid #eeee':''}"
                             style="text-align: left;">
-                                <span style="cursor: pointer;">
+                                <span v-if="x.OutBranchName">{{x.OutBranchName}}：</span>
+                                <span>
                                     {{x.Rate?x.Rate:'未设汇率'}}
                                 </span>
                                <span style="color: #6E6E6E;">{{x.CurrencyName}}</span>
@@ -381,7 +382,8 @@
                     XSTC: 1,
                     OtherType:69,
                     ReFinanceId:item.Id,
-                    Rate: item.CurrencyRateList[0].Rate
+                    Rate: item.CurrencyRateList[0].Rate,
+                    OutBranchId: this.msg.OutBranchId
                 }
                 let query = {
                     blank: "y",