Commit 2b792c6a authored by youjie's avatar youjie

no message

parent bea472ce
......@@ -941,11 +941,12 @@ export default {
if(this.orderObj&&this.orderObj.Rate&&this.orderObj.Money){
let yballPrice = 0
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
yballPrice += Number(yballPrice+item.UnitPriceTo)
yballPrice += Number(yballPrice)+Number(item.UnitPrice)
console.log(item)
})
this.yballPriceTo = yballPrice
if(this.orderObj.Money!=this.yballPriceTo){
this.Error(`原币总金额必须等于${this.orderObj.Money}!`)
this.Error(`原币总金额等于${this.orderObj.Money}!`)
return
}
}
......@@ -1437,10 +1438,7 @@ 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 {
}else {
this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
}
} else {
......@@ -1603,10 +1601,6 @@ 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 => {})
......@@ -1828,12 +1822,8 @@ export default {
this.EmployeeId=userInfo.EmployeeId;
this.emplyeeName=userInfo.emName;
this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_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;
......
......@@ -382,14 +382,14 @@
OtherType:69,
ReFinanceId:item.Id,
Rate: item.CurrencyRateList[0].Rate,
OutBranchId: this.msg.OutBranchId
}
let query = {
blank: "y",
tab: "新增付款单据",
Type: 2,
IsUploadPic: 1,
orderObj: JSON.stringify(obj)
orderObj: JSON.stringify(obj),
companyID: this.msg.OutBranchId
}
if(this.msg.OutBranchId>-1){
query.id = 30
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment