修改

app/Model/Tag.php

@@ -12,7 +12,7 @@ class Tag extends DataScopeBaseModel
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
 
-    public static $field = ['title','id','code','sort','type', 'is_use'];
+    public static $field = ['title','id','code','sort','type', 'is_use', 'color'];
 
     const TYPE_ONE = 1;
     const TYPE_TWO = 2;

app/Service/ItemService.php

@@ -85,6 +85,7 @@ class ItemService extends Service
             $data[$key]['type'] = $erg['type'];
             $priority_tmp = $tag[$value['priority_id']] ?? [];
             $data[$key]['priority_title'] = $priority_tmp['title'] ?? '';
+            $data[$key]['priority_color'] = $priority_tmp['color'] ?? '';
         }
 
         return $data;
@@ -1046,6 +1047,7 @@ class ItemService extends Service
             $priority_tmp = $tag[$value['priority_id']] ?? [];
             $list[$key]['priority_title'] = $priority_tmp['title'] ?? '';
             $list[$key]['priority_code'] = $priority_tmp['code'] ?? '';
+            $list[$key]['priority_color'] = $priority_tmp['color'] ?? '';
             $node_tmp = $tag[$value['node_id']] ?? [];
             $list[$key]['node_title'] = $node_tmp['title'] ?? '';
             $list[$key]['node_code'] = $node_tmp['code'] ?? '';
@@ -1928,9 +1930,11 @@ class ItemService extends Service
         $priority_tmp = $tag[$customer['priority_id']] ?? [];
         $customer['priority_title'] = $priority_tmp['title'] ?? '';
         $customer['priority_code'] = $priority_tmp['code'] ?? '';
+        $customer['priority_color'] = $priority_tmp['color'] ?? '';
         $node_tmp = $tag[$customer['node_id']] ?? [];
         $customer['node_title'] = $node_tmp['title'] ?? '';
         $customer['node_code'] = $node_tmp['code'] ?? '';
+        $customer['node_color'] = $node_tmp['color'] ?? '';
         $item = Item::where('id', $customer['item_id'])->first();
         $customer['item_code'] = $item->code ?? '';
         $customer['item_title'] = $item->title ?? '';
@@ -1978,9 +1982,11 @@ class ItemService extends Service
             $priority_tmp = $tag[$value['priority_id']] ?? [];
             $list[$key]['priority_title'] = $priority_tmp['title'] ?? '';
             $list[$key]['priority_code'] = $priority_tmp['code'] ?? '';
+            $list[$key]['priority_color'] = $priority_tmp['color'] ?? '';
             $node_tmp = $tag[$value['mission_id']] ?? [];
             $list[$key]['mission_title'] = $node_tmp['title'] ?? '';
             $list[$key]['mission_code'] = $node_tmp['code'] ?? '';
+            $list[$key]['mission_color'] = $node_tmp['color'] ?? '';
         }
 
         return $list;
@@ -2207,9 +2213,11 @@ class ItemService extends Service
             $priority_tmp = $tag[$value['priority_id']] ?? [];
             $data['data'][$key]['priority_title'] = $priority_tmp['title'] ?? '';
             $data['data'][$key]['priority_code'] = $priority_tmp['code'] ?? '';
+            $data['data'][$key]['priority_color'] = $priority_tmp['color'] ?? '';
             $node_tmp = $tag[$value['node_id']] ?? [];
             $data['data'][$key]['node_title'] = $node_tmp['title'] ?? '';
             $data['data'][$key]['node_code'] = $node_tmp['code'] ?? '';
+            $data['data'][$key]['node_color'] = $node_tmp['color'] ?? '';
             $data['data'][$key]['item_title'] = $item[$value['item_id']] ?? '';
         }
 
@@ -2578,9 +2586,11 @@ class ItemService extends Service
         $priority_tmp = $tag[$customer['priority_id']] ?? [];
         $customer['priority_title'] = $priority_tmp['title'] ?? '';
         $customer['priority_code'] = $priority_tmp['code'] ?? '';
+        $customer['priority_color'] = $priority_tmp['color'] ?? '';
         $node_tmp = $tag[$customer['mission_id']] ?? [];
         $customer['mission_title'] = $node_tmp['title'] ?? '';
         $customer['mission_code'] = $node_tmp['code'] ?? '';
+        $customer['mission_color'] = $node_tmp['color'] ?? '';
         $customer['parent_item_node_mission_title'] = ItemNodeMission::where('id', $customer['parent_item_node_mission_id'])->value('title') ?? '';
         $customer['review_title'] = WorkFlowTemplates::where('id', $customer['review_id'])->value('title') ?? "";
 
@@ -3122,9 +3132,11 @@ class ItemService extends Service
             $priority_tmp = $tag[$value['priority_id']] ?? [];
             $data['data'][$key]['priority_title'] = $priority_tmp['title'] ?? '';
             $data['data'][$key]['priority_code'] = $priority_tmp['code'] ?? '';
+            $data['data'][$key]['priority_color'] = $priority_tmp['color'] ?? '';
             $node_tmp = $tag[$value['mission_id']] ?? [];
             $data['data'][$key]['mission_title'] = $node_tmp['title'] ?? '';
             $data['data'][$key]['mission_code'] = $node_tmp['code'] ?? '';
+            $data['data'][$key]['mission_color'] = $node_tmp['color'] ?? '';
             $data['data'][$key]['item_node_title'] = $item_node_map[$value['id']] ?? '';
         }
 

app/Service/TagService.php

@@ -43,6 +43,7 @@ class TagService extends Service
                 $model->type = $value['type'];
                 $model->sort = $value['sort'];
                 $model->is_use = $value['is_use'];
+                $model->color = $value['color'] ?? '';
                 $model->top_depart_id = $value['top_depart_id'];
                 $model->save();
             }
@@ -168,7 +169,7 @@ class TagService extends Service
         if (empty($ids)) return [];
 
         return Tag::whereIn('id', $ids)
-            ->select('id', 'title', 'code')
+            ->select('id', 'title', 'code', 'color')
             ->get()
             ->keyBy('id')
             ->toArray();