修改

app/Service/ItemService.php

@@ -65,12 +65,12 @@ class ItemService extends Service
         list($status, $model) = $this->itemGannetCommon($data, $user);
         if(! $status) return [false, $model];
         $list = $model->get()->toArray();
-        $list = $this->fillItemGannetList($list);
+        $list = $this->fillItemGannetList($list, $data);
 
         return [true, $list];
     }
 
-    public function fillItemGannetList($data){
+    public function fillItemGannetList($data, $erg){
         if(empty($data)) return $data;
 
         $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_merge_recursive(array_column($data,'charge_id'), array_column($data,'crt_id'))));
@@ -80,6 +80,7 @@ class ItemService extends Service
             $data[$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data[$key]['charge_name'] = $emp[$value['charge_id']] ?? '';
             $data[$key]['state_title'] = ItemNodeMission::State_Type[$value['state']] ?? "";
+            $data[$key]['type'] = $data['type'];
             if(! isset($value['progress'])) $data[$key]['progress'] = rand(1,100); // todo
         }
 
@@ -103,6 +104,12 @@ class ItemService extends Service
             'item_node' => "(id = {$data['id']})",
             'item_node_mission' => "(parent_item_node_mission_id = {$data['id']})",
         ];
+        $next_type = [
+            'item' => 'item_node',
+            'item_node' => 'item_node_mission',
+            'item_node_mission' => 'item_node_mission',
+        ];
+        $data['type'] = $next_type[$data['type']];
         if (empty($data['type']) && ! isset($type[$data['type']])) return [false , '类型错误'];
         $class = $type[$data['type']];
         $select = $field[$data['type']];
@@ -114,7 +121,7 @@ class ItemService extends Service
             ->orderby('id', 'desc')
             ->get()->toArray();
 
-        $list = $this->fillItemGannetList($list);
+        $list = $this->fillItemGannetList($list, $data);
 
         return [true, $list];
     }