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
4f5f6f78
authored
Aug 04, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
efbbf00b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
app/Http/Controllers/Api/SupplierApiController.php
app/Http/Controllers/SupplierController.php
resources/views/web/AuditSupplier.blade.php
app/Http/Controllers/Api/SupplierApiController.php
View file @
4f5f6f78
...
@@ -420,7 +420,7 @@ class SupplierApiController extends Controller
...
@@ -420,7 +420,7 @@ class SupplierApiController extends Controller
{
{
$supplierId
=
$request
->
get
(
'supplier_id'
);
$supplierId
=
$request
->
get
(
'supplier_id'
);
$blockReason
=
$request
->
get
(
'block_reason'
);
$blockReason
=
$request
->
get
(
'block_reason'
);
if
(
empty
(
$blockReason
))
{
if
(
empty
(
trim
(
$blockReason
)
))
{
$this
->
response
(
-
1
,
'必须填写拉黑原因'
);
$this
->
response
(
-
1
,
'必须填写拉黑原因'
);
}
}
if
(
mb_strlen
(
$blockReason
)
>
200
)
{
if
(
mb_strlen
(
$blockReason
)
>
200
)
{
...
...
app/Http/Controllers/SupplierController.php
View file @
4f5f6f78
...
@@ -180,7 +180,8 @@ class SupplierController extends Controller
...
@@ -180,7 +180,8 @@ class SupplierController extends Controller
$supplier
=
$model
->
where
(
'supplier_id'
,
$supplierId
)
->
first
();
$supplier
=
$model
->
where
(
'supplier_id'
,
$supplierId
)
->
first
();
//获取最后一条非分配渠道员的日志
//获取最后一条非分配渠道员的日志
$logModel
=
new
LogModel
();
$logModel
=
new
LogModel
();
$auditContent
=
$logModel
->
where
(
'supplier_id'
,
$supplierId
)
->
where
(
'action'
,
'!='
,
'分配渠道开发员'
)
$auditContent
=
$logModel
->
where
(
'supplier_id'
,
$supplierId
)
// ->where('action', '!=', '分配渠道开发员')
->
where
(
'action'
,
'!='
,
''
)
->
where
(
'action'
,
'!='
,
''
)
->
where
(
'type'
,
'!='
,
3
)
->
where
(
'type'
,
'!='
,
3
)
->
orderBy
(
'id'
,
'desc'
)
->
first
();
->
orderBy
(
'id'
,
'desc'
)
->
first
();
...
...
resources/views/web/AuditSupplier.blade.php
View file @
4f5f6f78
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
审核内容 :
</label>
<label
class=
"layui-form-label"
>
审核内容 :
</label>
<div
class=
"layui-input-block block-42"
style=
"padding-top: 7px"
>
<div
class=
"layui-input-block block-42"
style=
"padding-top: 7px"
>
@if (!empty($auditContent))
<b>
{{$auditContent['action'] .' : '}}
</b>
<b>
{{$auditContent['action'] .' : '}}
</b>
@if(is_array($auditContent['content']))
@if(is_array($auditContent['content']))
@foreach($auditContent['content'] as $content)
@foreach($auditContent['content'] as $content)
...
@@ -30,6 +31,9 @@
...
@@ -30,6 +31,9 @@
@else
@else
{{$auditContent['content']}}
{{$auditContent['content']}}
@endif
@endif
@else
暂无
@endif
</div>
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
...
...
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