Commit a2a3c5dd authored by 黄媛媛's avatar 黄媛媛

111

parent e0df0994
......@@ -348,36 +348,8 @@ export default {
// })
let tempArr = [];
let bb=[];
setTimeout(()=>{
data.forEach((x,index)=>{
this.companyList.forEach(y=>{
y.list=[];
if(y.OutBranchName==x.OutBranchName){
console.log(y,'xxxx');
y.list.push(x);
}
})
})
console.log(this.companyList,'bbbbbbbbbbbbb');
},2000)
// for (let i = 0; i < data.length; i++) {
// if (tempArr.indexOf(data[i].OutBranchName) === -1) {
// bb.push({
// name: data[i].OutBranchName,
// List: [data[i]]
// });
// tempArr.push(data[i].MonthStr);
// } else {
// for (let j = 0; j < bb.length; j++) {
// if (bb[j].OutBranchName == data[i].OutBranchName) {
// bb[j].List.push(data[i]);
// break;
// }
// }
// }
// }
this.companyList.forEach(item=>{
// let obj={
// name:item.OutBranchName.replace('印象',''),
......@@ -431,7 +403,23 @@ export default {
}
}
}
console.log(this.companyList,'company');
// console.log(this.companyList,'company');
let companyArr=[];
this.companyList.forEach(item=>{
let obj={
OutBranchName:item.OutBranchName,
List:[],
};
companyArr.push(obj);
})
dataList.forEach((x,index)=>{
companyArr.forEach(y=>{
if(y.OutBranchName==x.OutBranchName){
y.List.push(x);
}
})
})
console.log(companyArr,'bbbbbbbbbbbbb');
},
getName(item){
return item.replace('印象','');
......
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