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
5a10d436
authored
Jun 16, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
7b195abd
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
12 deletions
app/Http/Controllers/Filter/SupplierFilter.php
app/Http/Controllers/SupplierController.php
app/Http/Services/SupplierStatisticsService.php
app/Http/Validators/ReceiptValidator.php
app/Model/SupplierChannelModel.php
config/fixed.php
resources/views/script/SupplierListScript.blade.php
resources/views/script/UpdateSupplierScript.blade.php
resources/views/web/SupplierDetail.blade.php
app/Http/Controllers/Filter/SupplierFilter.php
View file @
5a10d436
...
...
@@ -157,7 +157,7 @@ class SupplierFilter
$query
->
where
(
'status'
,
SupplierChannelModel
::
STATUS_PENDING
);
break
;
case
"in_review"
:
//
审核中
//
待复审
$query
->
where
(
'status'
,
SupplierChannelModel
::
STATUS_IN_REVIEW
);
break
;
case
"passed"
:
...
...
app/Http/Controllers/SupplierController.php
View file @
5a10d436
...
...
@@ -58,6 +58,7 @@ class SupplierController extends Controller
//供应商列表
public
function
SupplierList
(
$request
)
{
//判断权限
$intracodeModel
=
new
IntracodeModel
();
$this
->
data
[
'userCodes'
]
=
$intracodeModel
->
getChannelUsersEncode
();
$this
->
data
[
'users'
]
=
$intracodeModel
->
getAdminUserAndCode
();
...
...
app/Http/Services/SupplierStatisticsService.php
View file @
5a10d436
...
...
@@ -16,7 +16,7 @@ class SupplierStatisticsService
$total
=
$this
->
getStatisticsCount
(
'all'
);
//待审核,就是以前的草稿
$pending
=
$this
->
getStatisticsCount
(
'pending'
);
//
审核中
//
待复审
$inReview
=
$this
->
getStatisticsCount
(
'in_review'
);
//通过
$passed
=
$this
->
getStatisticsCount
(
'passed'
);
...
...
app/Http/Validators/ReceiptValidator.php
View file @
5a10d436
...
...
@@ -43,7 +43,6 @@ class ReceiptValidator
'account_no.required'
=>
'银行账号不能为空'
,
'account_name.required'
=>
'账户名称不能为空'
,
'certificate.required'
=>
'银行信息凭证不能为空'
,
];
}
}
\ No newline at end of file
app/Model/SupplierChannelModel.php
View file @
5a10d436
...
...
@@ -12,7 +12,7 @@ class SupplierChannelModel extends Model
//待审核(没有补充所有必填信息)
const
STATUS_PENDING
=
-
1
;
//
审核中
//
待复审
const
STATUS_IN_REVIEW
=
1
;
//通过
const
STATUS_PASSED
=
2
;
...
...
config/fixed.php
View file @
5a10d436
...
...
@@ -90,7 +90,7 @@ return [
// -3 => '已拉黑',
-
2
=>
'禁止交易'
,
-
1
=>
'待审核'
,
1
=>
'
审核中
'
,
1
=>
'
待复审
'
,
2
=>
'已通过'
,
3
=>
'未通过'
],
...
...
@@ -206,7 +206,7 @@ return [
'CompassMenuMap'
=>
[
'total'
=>
'全部'
,
'pending'
=>
'待审核'
,
'in_review'
=>
'
审核中
'
,
'in_review'
=>
'
待复审
'
,
'passed'
=>
'已通过'
,
'rejected'
=>
'未通过'
,
'disable'
=>
'禁止交易'
,
...
...
resources/views/script/SupplierListScript.blade.php
View file @
5a10d436
...
...
@@ -122,7 +122,7 @@
if
(
obj
.
tr
.
hasClass
(
'table-selected'
))
{
obj
.
tr
.
removeClass
(
'table-selected'
)
obj
.
tr
.
find
(
'.layui-form-checkbox'
).
removeClass
(
'layui-form-checked'
);
}
else
{
}
else
{
obj
.
tr
.
addClass
(
'table-selected'
)
obj
.
tr
.
find
(
'.layui-form-checkbox'
).
addClass
(
'layui-form-checked'
);
}
...
...
@@ -185,13 +185,20 @@
return
;
}
let
supplierId
=
data
[
0
].
supplier_id
;
let
status
=
data
[
0
].
status
;
let
canAuditAddSupplier
=
{{
checkPerm
(
"AuditAddSupplier"
)?
1
:
0
}};
if
(
canAuditAddSupplier
===
0
&&
status
===
-
1
)
{
layer
.
msg
(
'你没有审核第一次新增供应商的权限'
,
{
icon
:
5
})
return
}
if
(
status
!==
1
&&
status
!==
-
1
)
{
layer
.
msg
(
'该供应商已经被审核'
,
{
icon
:
5
})
return
}
if
(
status
===
-
1
)
{
layer
.
msg
(
'要
审核中
的供应商才可以审核'
,
{
icon
:
5
});
layer
.
msg
(
'要
待复审
的供应商才可以审核'
,
{
icon
:
5
});
return
}
layer
.
open
({
...
...
resources/views/script/UpdateSupplierScript.blade.php
View file @
5a10d436
...
...
@@ -19,9 +19,9 @@
if
(
data
.
field
.
status
===
'-2'
)
{
confirmMessage
=
'确定要重新入驻吗,该供应商就会再次进入审核阶段'
}
else
if
(
data
.
field
.
status
===
'-1'
)
{
confirmMessage
=
'确定要提交新增供应商信息吗?一旦提交,该供应商就会进入
审核中
阶段,审核过程中无法进行信息修改'
confirmMessage
=
'确定要提交新增供应商信息吗?一旦提交,该供应商就会进入
待复审
阶段,审核过程中无法进行信息修改'
}
else
{
confirmMessage
=
'确定要修改供应商信息吗?一旦修改,该供应商就会再次进入
审核中
阶段,审核过程中无法进行信息修改'
confirmMessage
=
'确定要修改供应商信息吗?一旦修改,该供应商就会再次进入
待复审
阶段,审核过程中无法进行信息修改'
}
layer
.
confirm
(
confirmMessage
,
function
(
index
)
{
let
res
=
ajax
(
'/api/supplier/UpdateSupplier'
,
data
.
field
)
...
...
resources/views/web/SupplierDetail.blade.php
View file @
5a10d436
...
...
@@ -73,7 +73,7 @@
@if($supplier['status']==\App\Model\SupplierChannelModel::STATUS_IN_REVIEW)
<div
class=
"layui-row"
>
<button
type=
"button"
style=
"margin-bottom: 25px;margin-top: 5px"
class=
"layui-btn layui-btn layui-btn-disabled"
>
审核中
,不能修改
class=
"layui-btn layui-btn layui-btn-disabled"
>
待复审
,不能修改
</button>
</div>
@endif
...
...
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