修改

app/Service/ItemService.php

@@ -377,7 +377,7 @@ class ItemService extends Service
         }
         $map = Employee::whereIn('id', $id)->select('title','id','number')->get()->toArray();
         $map = array_column($map,null,'id');
-        $map2 = Device::whereIn('id', $id2)->select('code','id','title')->get()->toArray();
+        $map2 = Device::whereIn('id', $id2)->select('code','id','title','type')->get()->toArray();
         $map2 = array_column($map2,null,'id');
 
         $unit = $receipt = [];
@@ -397,6 +397,7 @@ class ItemService extends Service
                     'data_id' => $value['data_id'],
                     'data_title' => $tmp['title'] ?? "",
                     'data_code' => $tmp['code'] ?? "",
+                    'type_title' => Device::$type[$tmp['type']],
                 ];
             }
         }
@@ -986,7 +987,7 @@ class ItemService extends Service
         }
         $map = Employee::whereIn('id', $id)->select('title','id','number')->get()->toArray();
         $map = array_column($map,null,'id');
-        $map2 = Device::whereIn('id', $id2)->select('code','id','title')->get()->toArray();
+        $map2 = Device::whereIn('id', $id2)->select('code','id','title','type')->get()->toArray();
         $map2 = array_column($map2,null,'id');
 
         $unit = $receipt = [];
@@ -1006,6 +1007,7 @@ class ItemService extends Service
                     'data_id' => $value['data_id'],
                     'data_title' => $tmp['title'] ?? "",
                     'data_code' => $tmp['code'] ?? "",
+                    'type_title' => Device::$type[$tmp['type']],
                 ];
             }
         }
@@ -1488,7 +1490,7 @@ class ItemService extends Service
         }
         $map = Employee::whereIn('id', $id)->select('title','id','number')->get()->toArray();
         $map = array_column($map,null,'id');
-        $map2 = Device::whereIn('id', $id2)->select('code','id','title')->get()->toArray();
+       $map2 = Device::whereIn('id', $id2)->select('code','id','title','type')->get()->toArray();
         $map2 = array_column($map2,null,'id');
 
         $unit = $receipt = [];
@@ -1508,6 +1510,7 @@ class ItemService extends Service
                     'data_id' => $value['data_id'],
                     'data_title' => $tmp['title'] ?? "",
                     'data_code' => $tmp['code'] ?? "",
+                    'type_title' => Device::$type[$tmp['type']],
                 ];
             }
         }