合并分支 'workorder' 到 'master'

projectV6



查看合并请求 !2462

@@ -28,6 +28,7 @@ class AsideTicketController extends BaseController
         $lists = Tickets::with([
         $lists = Tickets::with([
             'logs.engineer',
             'logs.engineer',
             'project.pm',
             'project.pm',
+            'project.projectV6',
         ])
         ])
             ->when(!empty($validated['engineer_id']), function ($query) use ($validated) {
             ->when(!empty($validated['engineer_id']), function ($query) use ($validated) {
                 // 查 gl_tickets 表 submit_user_id 或 gl_ticket_logs 表 engineer_id
                 // 查 gl_tickets 表 submit_user_id 或 gl_ticket_logs 表 engineer_id

@@ -19,7 +19,7 @@ class TicketProject extends Base
     public function projectV6()
     public function projectV6()
     {
     {
         return $this->hasOne(Project::class, 'id', 'table_id')
         return $this->hasOne(Project::class, 'id', 'table_id')
-            ->where('version', 6);
+            ->select(['id', 'title', 'company', 'is_upgrade', 'project_type']);
     }
     }
 
 
     // 项目经理
     // 项目经理