Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
liexin_supplier
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e944a130
authored
Jul 19, 2023
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
chain
parent
24c597fd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
app/Http/Controllers/Filter/SupplierFilter.php
app/Http/Controllers/SupplierApplyController.php
resources/views/web/supplier/SupplierListFilter.blade.php
app/Http/Controllers/Filter/SupplierFilter.php
View file @
e944a130
...
...
@@ -124,6 +124,18 @@ class SupplierFilter
$endTime
=
strtotime
(
$times
[
1
]);
$query
->
whereBetween
(
'update_time'
,
[
$startTime
,
$endTime
]);
}
if
(
!
empty
(
$map
[
'sku_create_time'
]))
{
$times
=
explode
(
'~'
,
$map
[
'sku_create_time'
]);
$startTime
=
strtotime
(
$times
[
0
]);
$endTime
=
strtotime
(
$times
[
1
]);
$query
->
whereBetween
(
'sku_create_time'
,
[
$startTime
,
$endTime
]);
}
if
(
!
empty
(
$map
[
'sku_update_time'
]))
{
$times
=
explode
(
'~'
,
$map
[
'sku_update_time'
]);
$startTime
=
strtotime
(
$times
[
0
]);
$endTime
=
strtotime
(
$times
[
1
]);
$query
->
whereBetween
(
'sku_update_time'
,
[
$startTime
,
$endTime
]);
}
if
(
!
empty
(
$map
[
'blacklist_uid'
]))
{
$query
=
$query
->
whereHas
(
'blacklist'
,
function
(
$q
)
use
(
$map
)
{
...
...
app/Http/Controllers/SupplierApplyController.php
View file @
e944a130
...
...
@@ -39,7 +39,7 @@ class SupplierApplyController extends Controller
}
//
操作日志
列表
//
芯链申请
列表
public
function
SupplierApplyList
(
$request
)
{
$this
->
data
[
'auditUidList'
]
=
SupplierApplyModel
::
pluck
(
'audit_name'
,
'audit_uid'
)
->
toArray
();
...
...
resources/views/web/supplier/SupplierListFilter.blade.php
View file @
e944a130
...
...
@@ -92,11 +92,11 @@
</a>
</div>
@endif
{{--
<div
class=
"layui-row"
>
--}}
{{--
<a
title=
"公司性质为现货商性质的供应商没有上传品质协议"
class=
"main_filter"
--
}}
{{
--
id=
"no_quality_assurance_agreement"
>
--}}
{{--
</a>
--}}
{{--
</div>
--}}
{{--
<div
class=
"layui-row"
>
--}}
{{--
<a
title=
"公司性质为现货商性质的供应商没有上传品质协议"
class=
"main_filter"
--
}}
{{
--
id=
"no_quality_assurance_agreement"
>
--}}
{{--
</a>
--}}
{{--
</div>
--}}
<div
class=
"layui-row"
>
<a
title=
"采购员全离职"
class=
"main_filter"
id=
"all_channel_user_resigned"
>
</a>
...
...
@@ -261,7 +261,7 @@
<div
class=
"layui-row"
>
<div
class=
"layui-inline"
style=
"width: 600px"
>
@inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
{!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间']) !!}
{!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间'
,'sku_create_time' => '首次上传sku时间','sku_update_time'=> '最新上传sku时间'
]) !!}
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment