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
6fe475ec
authored
Jul 19, 2022
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修改字眼
parent
1e3f8146
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
13 deletions
app/Http/Controllers/Api/SupplierApiController.php
app/Http/Services/SupplierService.php
app/Http/Services/SupplierStatisticsService.php
app/Model/SupplierChannelModel.php
app/Model/SupplierShareApplyModel.php
config/field.php
config/fixed.php
resources/views/script/SupplierListScript.blade.php
app/Http/Controllers/Api/SupplierApiController.php
View file @
6fe475ec
...
@@ -397,7 +397,7 @@ class SupplierApiController extends Controller
...
@@ -397,7 +397,7 @@ class SupplierApiController extends Controller
}
}
//批量修改渠道开发员
//批量修改渠道开发员
//修改后自动触发转正,资料不完善,进入待
审核
//修改后自动触发转正,资料不完善,进入待
提审
public
function
BatchAllocatePurchaseUser
(
$request
)
public
function
BatchAllocatePurchaseUser
(
$request
)
{
{
$purchaseUid
=
$request
->
get
(
'purchase_uid'
);
$purchaseUid
=
$request
->
get
(
'purchase_uid'
);
...
...
app/Http/Services/SupplierService.php
View file @
6fe475ec
...
@@ -120,7 +120,7 @@ class SupplierService
...
@@ -120,7 +120,7 @@ class SupplierService
}
}
return
$value
;
return
$value
;
},
$channel
);
},
$channel
);
//默认是待
审核
//默认是待
提审
//判断是否是直接添加并且申请审核
//判断是否是直接添加并且申请审核
if
(
$isDirectApply
)
{
if
(
$isDirectApply
)
{
$channel
[
'status'
]
=
SupplierChannelModel
::
STATUS_IN_REVIEW
;
$channel
[
'status'
]
=
SupplierChannelModel
::
STATUS_IN_REVIEW
;
...
@@ -384,7 +384,7 @@ class SupplierService
...
@@ -384,7 +384,7 @@ class SupplierService
'to_follow_up'
=>
1
,
'to_follow_up'
=>
1
,
]);
]);
}
}
//判断是否是非正式供应商,如果是,自动转正,并且修改为待
审核
状态
//判断是否是非正式供应商,如果是,自动转正,并且修改为待
提审
状态
$this
->
autoChangeIsType
(
$supplier
);
$this
->
autoChangeIsType
(
$supplier
);
}
}
...
@@ -460,7 +460,7 @@ class SupplierService
...
@@ -460,7 +460,7 @@ class SupplierService
$contactResult
=
$contactModel
->
insert
(
$contact
);
$contactResult
=
$contactModel
->
insert
(
$contact
);
}
}
if
(
$contactResult
&&
$needLog
)
{
if
(
$contactResult
&&
$needLog
)
{
//判断是否是非正式(is_type=1)供应商,如果是,自动转正,并且修改为待
审核
状态
//判断是否是非正式(is_type=1)供应商,如果是,自动转正,并且修改为待
提审
状态
$this
->
autoChangeIsType
(
$supplier
);
$this
->
autoChangeIsType
(
$supplier
);
//记录日志
//记录日志
$adminUserService
=
new
AdminUserService
();
$adminUserService
=
new
AdminUserService
();
...
@@ -554,7 +554,7 @@ class SupplierService
...
@@ -554,7 +554,7 @@ class SupplierService
return
true
;
return
true
;
}
}
//判断是否自动转正,并且还要修改为待
审核
状态给相关人员进行补充资料
//判断是否自动转正,并且还要修改为待
提审
状态给相关人员进行补充资料
public
function
autoChangeIsType
(
$supplier
)
public
function
autoChangeIsType
(
$supplier
)
{
{
if
(
$supplier
[
'is_type'
]
==
1
)
{
if
(
$supplier
[
'is_type'
]
==
1
)
{
...
...
app/Http/Services/SupplierStatisticsService.php
View file @
6fe475ec
...
@@ -22,7 +22,7 @@ class SupplierStatisticsService
...
@@ -22,7 +22,7 @@ class SupplierStatisticsService
$total
=
$this
->
getStatisticsCount
(
'all'
);
$total
=
$this
->
getStatisticsCount
(
'all'
);
//待复审
//待复审
$needReview
=
$this
->
getStatisticsCount
(
'need_review'
);
$needReview
=
$this
->
getStatisticsCount
(
'need_review'
);
//待
审核
//待
提审
$pending
=
$this
->
getStatisticsCount
(
'pending'
);
$pending
=
$this
->
getStatisticsCount
(
'pending'
);
//审核中
//审核中
$inReview
=
$this
->
getStatisticsCount
(
'in_review'
);
$inReview
=
$this
->
getStatisticsCount
(
'in_review'
);
...
...
app/Model/SupplierChannelModel.php
View file @
6fe475ec
...
@@ -12,7 +12,7 @@ class SupplierChannelModel extends Model
...
@@ -12,7 +12,7 @@ class SupplierChannelModel extends Model
//待复审(第一次新增)
//待复审(第一次新增)
const
STATUS_NEED_REVIEW
=
-
1
;
const
STATUS_NEED_REVIEW
=
-
1
;
//待
审核
//待
提审
const
STATUS_PENDING
=
0
;
const
STATUS_PENDING
=
0
;
//审核中
//审核中
const
STATUS_IN_REVIEW
=
1
;
const
STATUS_IN_REVIEW
=
1
;
...
...
app/Model/SupplierShareApplyModel.php
View file @
6fe475ec
...
@@ -14,7 +14,7 @@ class SupplierShareApplyModel extends Model
...
@@ -14,7 +14,7 @@ class SupplierShareApplyModel extends Model
const
STATUS_PASS
=
2
;
const
STATUS_PASS
=
2
;
//待复审
//待复审
const
STATUS_NEED_REVIEW
=
1
;
const
STATUS_NEED_REVIEW
=
1
;
//待
审核
//待
提审
const
STATUS_PENDING
=
0
;
const
STATUS_PENDING
=
0
;
//审核不通过
//审核不通过
const
STATUS_AUDIT_REJECT
=
-
1
;
const
STATUS_AUDIT_REJECT
=
-
1
;
...
...
config/field.php
View file @
6fe475ec
...
@@ -86,7 +86,7 @@ return [
...
@@ -86,7 +86,7 @@ return [
'legal_ID_card'
'legal_ID_card'
],
],
//-2是复审不通过,-1是初审不通过,0是待
审核
,1是待复审,2是复审通过
//-2是复审不通过,-1是初审不通过,0是待
提审
,1是待复审,2是复审通过
'SupplierShareApplyStatus'
=>
[
'SupplierShareApplyStatus'
=>
[
-
2
=>
'复审不通过'
,
-
2
=>
'复审不通过'
,
-
1
=>
'初审不通过'
,
-
1
=>
'初审不通过'
,
...
...
config/fixed.php
View file @
6fe475ec
...
@@ -97,7 +97,7 @@ return [
...
@@ -97,7 +97,7 @@ return [
'SupplierStatus'
=>
[
'SupplierStatus'
=>
[
0
=>
'待
审核
'
,
0
=>
'待
提审
'
,
-
1
=>
'待复审'
,
-
1
=>
'待复审'
,
1
=>
'审核中'
,
1
=>
'审核中'
,
3
=>
'未通过'
,
3
=>
'未通过'
,
...
@@ -218,7 +218,7 @@ return [
...
@@ -218,7 +218,7 @@ return [
//罗盘菜单对应id
//罗盘菜单对应id
'CompassMenuMap'
=>
[
'CompassMenuMap'
=>
[
'total'
=>
'全部'
,
'total'
=>
'全部'
,
'pending'
=>
'待
审核
'
,
'pending'
=>
'待
提审
'
,
'need_review'
=>
'待复审'
,
'need_review'
=>
'待复审'
,
'in_review'
=>
'审核中'
,
'in_review'
=>
'审核中'
,
'draft'
=>
'草稿'
,
'draft'
=>
'草稿'
,
...
...
resources/views/script/SupplierListScript.blade.php
View file @
6fe475ec
...
@@ -397,7 +397,7 @@
...
@@ -397,7 +397,7 @@
}
}
});
});
if
(
!
canApplyInReview
)
{
if
(
!
canApplyInReview
)
{
layer
.
msg
(
'选择的供应商里,存在非待
审核
状态的供应商,无法申请审核'
,
{
icon
:
5
})
layer
.
msg
(
'选择的供应商里,存在非待
提审
状态的供应商,无法申请审核'
,
{
icon
:
5
})
return
;
return
;
}
}
//还要去事先检测供应商信息是否完整
//还要去事先检测供应商信息是否完整
...
@@ -489,7 +489,7 @@
...
@@ -489,7 +489,7 @@
}
}
});
});
}
else
{
}
else
{
layer
.
msg
(
'只有待
审核
,已通过或者未通过状态,并且没有sku的供应商才可以禁用'
,
{
'icon'
:
5
});
layer
.
msg
(
'只有待
提审
,已通过或者未通过状态,并且没有sku的供应商才可以禁用'
,
{
'icon'
:
5
});
}
}
}
}
...
...
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