|
|
|
|
@ -90,11 +90,6 @@ class OrdersController extends CommonController
|
|
|
|
|
}
|
|
|
|
|
$this->model = $this->model->where("project_id", $project_id);
|
|
|
|
|
|
|
|
|
|
// 订单号搜索(精确或模糊)
|
|
|
|
|
if ($request->filled('order_no')) {
|
|
|
|
|
$this->model = $this->model->where("serial", "like", "%" . trim($request->order_no) . "%");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($request->keyword) {
|
|
|
|
|
$this->model = $this->model->where(function ($query) use ($request) {
|
|
|
|
|
$query->where("serial", "like", "%" . $request->keyword . "%")
|
|
|
|
|
|