|
|
@@ -163,11 +163,14 @@ class MachineProductionReportAdd extends Api
|
|
|
->select();
|
|
|
$arr = ['胶印车间', '凹印车间', '丝印车间', '烫模车间', '检验车间', '研发中心'];
|
|
|
$data = [];
|
|
|
- $data['使用部门'] = $arr;
|
|
|
+ $data['使用部门'] = [];
|
|
|
foreach ($arr as $value) {
|
|
|
$data[$value] = [];
|
|
|
foreach ($rows as $row){
|
|
|
if($row['使用部门']==$value){
|
|
|
+ if (!in_array($row['使用部门'], $data['使用部门'])) {
|
|
|
+ array_push($data['使用部门'],$row['使用部门']);
|
|
|
+ }
|
|
|
unset($row['使用部门']);
|
|
|
array_push($data[$value], $row);
|
|
|
}
|