Merge branch 'feature/inv' into develop
This commit is contained in:
@@ -581,10 +581,10 @@ class InvRequisitionService
|
|||||||
|
|
||||||
// 时间范围筛选
|
// 时间范围筛选
|
||||||
if (!empty($request->get('start_time'))) {
|
if (!empty($request->get('start_time'))) {
|
||||||
$query->where('qr_claim_time', '>=', strtotime($request->get('start_time')));
|
$query->where('created_at', '>=', strtotime($request->get('start_time')));
|
||||||
}
|
}
|
||||||
if (!empty($request->get('end_time'))) {
|
if (!empty($request->get('end_time'))) {
|
||||||
$query->where('qr_claim_time', '<=', strtotime($request->get('end_time')));
|
$query->where('created_at', '<=', strtotime($request->get('end_time')));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 排序
|
// 排序
|
||||||
|
|||||||
Reference in New Issue
Block a user