Commit 651ce583 authored by 华国豪's avatar 华国豪 🙄

1

parent 4d14dfff
...@@ -1206,7 +1206,12 @@ export default { ...@@ -1206,7 +1206,12 @@ export default {
this.msg.ClientID = this.msg.ClientID==0?'':this.msg.ClientID; this.msg.ClientID = this.msg.ClientID==0?'':this.msg.ClientID;
if (id || id === 0) { if (id || id === 0) {
if (!this.orderObj) { // if (!this.orderObj) {
// this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
// }
if (!this.orderObj && id > 0) {
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id
} else {
this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
} }
} else { } else {
...@@ -1384,11 +1389,17 @@ export default { ...@@ -1384,11 +1389,17 @@ export default {
let resdata = res.data.data; let resdata = res.data.data;
if(resdata.IsGroupCommon==0){ if(resdata.IsGroupCommon==0){
let BranchList=resdata.BranchList; let BranchList=resdata.BranchList;
let num = 0
data.forEach(x=>{ data.forEach(x=>{
x.disabled=true; x.disabled=true;
BranchList.forEach(y=>{ BranchList.forEach(y=>{
if(x.Id==y){ if(x.Id==y){
x.disabled=false; x.disabled=false;
if(num < 1 && !this.$route.query.edit) {
this.msg.RB_Branch_Id = x.Id
console.log(resdata.BranchList, this.msg.RB_Branch_Id)
}
num = num + 1
} }
}) })
}) })
......
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