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
54f17a40
authored
Jul 07, 2022
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
申请审核
parent
bba56874
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
app/Http/Controllers/Api/SupplierApiController.php
app/Http/Services/SupplierService.php
resources/views/script/SupplierListScript.blade.php
app/Http/Controllers/Api/SupplierApiController.php
View file @
54f17a40
...
...
@@ -186,8 +186,8 @@ class SupplierApiController extends Controller
if
(
!
$result
)
{
$this
->
response
(
-
1
,
'修改失败'
);
}
//如果是申请审核,还要去修改审核状态,
如果是忽略更新审核的话,也没必要走下面的步骤
if
(
$isAudit
&&
!
checkPerm
(
'IgnoreUpdateAudit'
)
)
{
//如果是申请审核,还要去修改审核状态,
if
(
$isAudit
)
{
$supplierService
=
new
SupplierService
();
$auditData
[]
=
[
'supplier_id'
=>
$supplierId
,
...
...
app/Http/Services/SupplierService.php
View file @
54f17a40
...
...
@@ -70,7 +70,6 @@ class SupplierService
'return_phone'
]);
$shippingAddress
=
array_get
(
$channel
,
'shipping_address'
);
$attachment
=
$channel
[
'attachment'
];
unset
(
$channel
[
'return_phone'
],
$channel
[
'return_address'
],
$channel
[
'return_consignee'
]);
unset
(
$channel
[
'shipping_address'
],
$channel
[
'cn_delivery_time_period'
],
...
...
@@ -181,11 +180,8 @@ class SupplierService
$supplierAddressService
->
saveShippingAddress
(
$supplierId
,
$shippingAddress
);
}
else
{
/**这里的是更新供应商的操作**/
$supplierId
=
$this
->
newSupplierId
=
$channel
[
'supplier_id'
];
$supplier
=
SupplierChannelModel
::
where
(
'supplier_id'
,
$supplierId
)
->
first
()
->
toArray
();
//要做进一步判断,部分字段修改不需要审核
$auditService
=
new
SupplierAuditService
();
$needAudit
=
$auditService
->
checkNeedAudit
(
$supplierId
,
$channel
);
...
...
resources/views/script/SupplierListScript.blade.php
View file @
54f17a40
...
...
@@ -455,7 +455,7 @@
}
});
if
(
!
canApplyInReview
)
{
layer
.
msg
(
'选择的供应商里,存在 审核中/待复审 状态的供应商,无法
申请审核
'
,
{
icon
:
5
})
layer
.
msg
(
'选择的供应商里,存在 审核中/待复审 状态的供应商,无法
分配采购员
'
,
{
icon
:
5
})
}
else
{
let
supplierIds
=
Array
.
from
(
data
,
({
supplier_id
})
=>
supplier_id
);
if
(
supplierIds
.
length
>
20
)
{
...
...
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