|
...
|
...
|
@@ -66,6 +66,20 @@ class AsideTicketController extends BaseController |
|
|
|
->orWhere('company_name', 'like', '%' . $search . '%');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
})
|
|
|
|
// 根据TicketProject的status字段筛选
|
|
|
|
->when($request->input('project_status') !== null, function ($query) use ($request) {
|
|
|
|
$projectStatus = $request->input('project_status');
|
|
|
|
return $query->whereHas('project', function ($q) use ($projectStatus) {
|
|
|
|
$q->where('status', $projectStatus);
|
|
|
|
});
|
|
|
|
})
|
|
|
|
// 根据TicketProject的project_cate字段筛选
|
|
|
|
->when($request->input('project_cate') !== null, function ($query) use ($request) {
|
|
|
|
$projectCate = $request->input('project_cate');
|
|
|
|
return $query->whereHas('project', function ($q) use ($projectCate) {
|
|
|
|
$q->where('project_cate', $projectCate);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
// 添加排序功能
|
...
|
...
|
|