|
@@ -51,7 +51,7 @@ export class FormManagementDetailComponent implements OnInit {
|
51
|
51
|
id: v,
|
52
|
52
|
name: Object.values(Object.values(data[v])[0])[0][0][3],
|
53
|
53
|
departments: (
|
54
|
|
- Object.values(data[v]).map(vv => Object.keys(vv).map(vvv => ({id: vvv, name: vv[vvv][0][6], orders: vv[vvv]}))) as any
|
|
54
|
+ Object.values(data[v]).map(vv => Object.keys(vv).map(vvv => ({id: vvv, name: vv[vvv][0][6], orders: vv[vvv], checked: false, isDisabled: vv[vvv].every(vvvv => !(vvvv[12] == 2 || (!vvvv[8] && vvvv[12] != 2)))}))) as any
|
55
|
55
|
).flat()
|
56
|
56
|
}));
|
57
|
57
|
console.log(buildings)
|
|
@@ -72,7 +72,7 @@ export class FormManagementDetailComponent implements OnInit {
|
72
|
72
|
this.buildings.forEach(v => {
|
73
|
73
|
v.departments.forEach(vv => {
|
74
|
74
|
if(vv.checked){
|
75
|
|
- arr = arr.concat(vv.orders);
|
|
75
|
+ arr = arr.concat(vv.orders.filter(vvv => vvv[12] == 2 || (!vvv[8] && vvv[12] != 2)));
|
76
|
76
|
}
|
77
|
77
|
})
|
78
|
78
|
})
|