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
0cde93c8
authored
Jul 17, 2023
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
云芯修改芯链
parent
24c597fd
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
71 additions
and
70 deletions
.env
app/Http/Controllers/Api/ExternalApiController.php
app/Http/Controllers/Api/SupplierApiController.php
app/Http/Controllers/SupplierAccountController.php
app/Http/Controllers/SupplierApplyController.php
app/Http/Services/DataService.php
app/Http/Services/SupplierAuditService.php
app/Http/Services/SupplierService.php
app/Http/Services/SupplierStatisticsService.php
app/Http/Validators/SupplierAccountValidator.php
config/field.php
config/fixed.php
resources/views/script/AddSupplierScript.blade.php
resources/views/script/SupplierApplyListScript.blade.php
resources/views/script/UpdateSupplierScript.blade.php
resources/views/web/AddSupplierAccount.blade.php
resources/views/web/QuerySupplier.blade.php
resources/views/web/UpdateSupplierAccount.blade.php
resources/views/web/supplier/SupplierListFilter.blade.php
.env
View file @
0cde93c8
...
@@ -41,7 +41,7 @@ DB_SELF_USERNAME=spu
...
@@ -41,7 +41,7 @@ DB_SELF_USERNAME=spu
DB_SELF_PASSWORD=spu
DB_SELF_PASSWORD=spu
DB_SELF_PORT=3306
DB_SELF_PORT=3306
#
云芯
MYSQL配置
#
芯链
MYSQL配置
DB_HOST_YUNXIN=192.168.1.252
DB_HOST_YUNXIN=192.168.1.252
DB_DATABASE_YUNXIN=liexin_yunxin
DB_DATABASE_YUNXIN=liexin_yunxin
DB_USERNAME_YUNXIN=liexin_yunxin
DB_USERNAME_YUNXIN=liexin_yunxin
...
...
app/Http/Controllers/Api/ExternalApiController.php
View file @
0cde93c8
...
@@ -79,7 +79,7 @@ class ExternalApiController extends Controller
...
@@ -79,7 +79,7 @@ class ExternalApiController extends Controller
if
(
$canApplySupplier
!==
true
)
{
if
(
$canApplySupplier
!==
true
)
{
$this
->
externalResponse
(
-
1
,
$canApplySupplier
);
$this
->
externalResponse
(
-
1
,
$canApplySupplier
);
}
}
//判断这个手机号对应的
云芯
账号是否已经存在
//判断这个手机号对应的
芯链
账号是否已经存在
$existAccount
=
SupplierAccountModel
::
where
(
'mobile'
,
$data
[
'mobile'
])
->
exists
();
$existAccount
=
SupplierAccountModel
::
where
(
'mobile'
,
$data
[
'mobile'
])
->
exists
();
if
(
$existAccount
)
{
if
(
$existAccount
)
{
$this
->
externalResponse
(
-
1
,
'该手机号已经有对应的芯链账号,请重新选择手机号'
);
$this
->
externalResponse
(
-
1
,
'该手机号已经有对应的芯链账号,请重新选择手机号'
);
...
...
app/Http/Controllers/Api/SupplierApiController.php
View file @
0cde93c8
...
@@ -515,7 +515,7 @@ class SupplierApiController extends Controller
...
@@ -515,7 +515,7 @@ class SupplierApiController extends Controller
}
}
//设置
云芯
账号
//设置
芯链
账号
public
function
SetYunxinChannelUid
(
$request
)
public
function
SetYunxinChannelUid
(
$request
)
{
{
$supplierId
=
$request
->
get
(
'supplier_id'
);
$supplierId
=
$request
->
get
(
'supplier_id'
);
...
@@ -541,7 +541,7 @@ class SupplierApiController extends Controller
...
@@ -541,7 +541,7 @@ class SupplierApiController extends Controller
}
}
}
}
//批量分配
云芯
采购员
//批量分配
芯链
采购员
public
function
BatchAllocateYunxinChannelUser
(
$request
)
public
function
BatchAllocateYunxinChannelUser
(
$request
)
{
{
$channelUid
=
$request
->
get
(
'channel_uid'
);
$channelUid
=
$request
->
get
(
'channel_uid'
);
...
...
app/Http/Controllers/SupplierAccountController.php
View file @
0cde93c8
...
@@ -48,7 +48,7 @@ class SupplierAccountController extends Controller
...
@@ -48,7 +48,7 @@ class SupplierAccountController extends Controller
public
function
AddSupplierAccount
(
$request
)
public
function
AddSupplierAccount
(
$request
)
{
{
//获取所有启用的供应商编码,而且类型是包括
云芯
//获取所有启用的供应商编码,而且类型是包括
芯链
$model
=
new
SupplierChannelModel
();
$model
=
new
SupplierChannelModel
();
$suppliers
=
$model
->
where
(
'is_type'
,
0
)
$suppliers
=
$model
->
where
(
'is_type'
,
0
)
->
whereRaw
(
'stockup_type like "%5%"'
)
->
whereRaw
(
'stockup_type like "%5%"'
)
...
@@ -69,7 +69,7 @@ class SupplierAccountController extends Controller
...
@@ -69,7 +69,7 @@ class SupplierAccountController extends Controller
$id
=
$request
->
get
(
'id'
);
$id
=
$request
->
get
(
'id'
);
$model
=
new
SupplierAccountModel
();
$model
=
new
SupplierAccountModel
();
$account
=
$model
->
where
(
'id'
,
$id
)
->
first
()
->
toArray
();
$account
=
$model
->
where
(
'id'
,
$id
)
->
first
()
->
toArray
();
//获取所有启用的供应商编码,而且类型是包括
云芯
//获取所有启用的供应商编码,而且类型是包括
芯链
$model
=
new
SupplierChannelModel
();
$model
=
new
SupplierChannelModel
();
$suppliers
=
$model
->
where
(
'is_type'
,
0
)
$suppliers
=
$model
->
where
(
'is_type'
,
0
)
->
whereRaw
(
'stockup_type like "%5%"'
)
->
whereRaw
(
'stockup_type like "%5%"'
)
...
...
app/Http/Controllers/SupplierApplyController.php
View file @
0cde93c8
...
@@ -53,7 +53,7 @@ class SupplierApplyController extends Controller
...
@@ -53,7 +53,7 @@ class SupplierApplyController extends Controller
$apply
=
SupplierApplyModel
::
with
(
'supplier'
)
->
where
(
'id'
,
$id
)
->
first
()
->
toArray
();
$apply
=
SupplierApplyModel
::
with
(
'supplier'
)
->
where
(
'id'
,
$id
)
->
first
()
->
toArray
();
$apply
[
'supplier_group_name'
]
=
array_get
(
config
(
'fixed.SupplierGroup'
),
$apply
[
'supplier'
][
'supplier_group'
]);
$apply
[
'supplier_group_name'
]
=
array_get
(
config
(
'fixed.SupplierGroup'
),
$apply
[
'supplier'
][
'supplier_group'
]);
$this
->
data
[
'apply'
]
=
$apply
;
$this
->
data
[
'apply'
]
=
$apply
;
$this
->
data
[
'title'
]
=
'
云芯
入驻审核'
;
$this
->
data
[
'title'
]
=
'
芯链
入驻审核'
;
return
$this
->
view
(
'
云芯
入驻审核'
);
return
$this
->
view
(
'
芯链
入驻审核'
);
}
}
}
}
\ No newline at end of file
app/Http/Services/DataService.php
View file @
0cde93c8
...
@@ -1264,7 +1264,7 @@ class DataService
...
@@ -1264,7 +1264,7 @@ class DataService
//有上架sku的供应商
//有上架sku的供应商
$supplierCount
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'supplier_group'
,
'!='
,
4
)
->
whereNotIn
(
'supplier_name'
,
config
(
'field.SkipChangeSupplierTypeNames'
))
->
whereNotIn
(
'supplier_code'
,
$excludeSupplierCodeList
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
count
();
$supplierCount
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'supplier_group'
,
'!='
,
4
)
->
whereNotIn
(
'supplier_name'
,
config
(
'field.SkipChangeSupplierTypeNames'
))
->
whereNotIn
(
'supplier_code'
,
$excludeSupplierCodeList
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
count
();
//
云芯
供应商编码
//
芯链
供应商编码
$yunxinSupplierCodes
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'stockup_type'
,
'like'
,
'%5%'
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
pluck
(
'supplier_code'
)
->
toArray
();
$yunxinSupplierCodes
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'stockup_type'
,
'like'
,
'%5%'
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
pluck
(
'supplier_code'
)
->
toArray
();
//找出哪些是芯链上传的
//找出哪些是芯链上传的
...
@@ -1300,7 +1300,7 @@ class DataService
...
@@ -1300,7 +1300,7 @@ class DataService
//有上架sku的供应商
//有上架sku的供应商
$supplierCount
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'supplier_group'
,
'!='
,
4
)
->
whereNotIn
(
'supplier_name'
,
config
(
'field.SkipChangeSupplierTypeNames'
))
->
whereNotIn
(
'supplier_code'
,
$excludeSupplierCodeList
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
count
();
$supplierCount
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'supplier_group'
,
'!='
,
4
)
->
whereNotIn
(
'supplier_name'
,
config
(
'field.SkipChangeSupplierTypeNames'
))
->
whereNotIn
(
'supplier_code'
,
$excludeSupplierCodeList
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
count
();
//
云芯
供应商编码
//
芯链
供应商编码
$yunxinSupplierCodes
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'stockup_type'
,
'like'
,
'%5%'
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
pluck
(
'supplier_code'
)
->
toArray
();
$yunxinSupplierCodes
=
SupplierChannelModel
::
where
(
'is_type'
,
0
)
->
where
(
'stockup_type'
,
'like'
,
'%5%'
)
->
where
(
'sku_num'
,
'>'
,
0
)
->
pluck
(
'supplier_code'
)
->
toArray
();
//找出哪些是芯链上传的
//找出哪些是芯链上传的
...
...
app/Http/Services/SupplierAuditService.php
View file @
0cde93c8
...
@@ -276,7 +276,7 @@ class SupplierAuditService
...
@@ -276,7 +276,7 @@ class SupplierAuditService
return
true
;
return
true
;
}
else
{
}
else
{
if
(
$field
===
'stockup_type'
)
{
if
(
$field
===
'stockup_type'
)
{
//还要单独判断供应商的stockup_type,只有是操作
云芯
这个值的时候,才不去审核,真是服了
//还要单独判断供应商的stockup_type,只有是操作
芯链
这个值的时候,才不去审核,真是服了
$oldStockupType
=
explode
(
','
,
trim
(
$supplier
[
'stockup_type'
],
''
));
$oldStockupType
=
explode
(
','
,
trim
(
$supplier
[
'stockup_type'
],
''
));
$newStockupType
=
explode
(
','
,
trim
(
$channel
[
'stockup_type'
],
''
));
$newStockupType
=
explode
(
','
,
trim
(
$channel
[
'stockup_type'
],
''
));
if
(
count
(
$oldStockupType
)
>
count
(
$newStockupType
))
{
if
(
count
(
$oldStockupType
)
>
count
(
$newStockupType
))
{
...
...
app/Http/Services/SupplierService.php
View file @
0cde93c8
...
@@ -781,7 +781,7 @@ class SupplierService
...
@@ -781,7 +781,7 @@ class SupplierService
$supplier
=
SupplierChannelModel
::
where
(
'supplier_name'
,
$supplierName
)
->
first
();
$supplier
=
SupplierChannelModel
::
where
(
'supplier_name'
,
$supplierName
)
->
first
();
$supplier
=
!
empty
(
$supplier
)
?
$supplier
->
toArray
()
:
[];
$supplier
=
!
empty
(
$supplier
)
?
$supplier
->
toArray
()
:
[];
if
(
$supplier
)
{
if
(
$supplier
)
{
//查询是否是
云芯
商家
//查询是否是
芯链
商家
$existsYunxinAccount
=
SupplierAccountModel
::
where
(
'supplier_id'
,
$supplier
[
'supplier_id'
])
->
exists
();
$existsYunxinAccount
=
SupplierAccountModel
::
where
(
'supplier_id'
,
$supplier
[
'supplier_id'
])
->
exists
();
$supplier
[
'is_yunxin_supplier'
]
=
$existsYunxinAccount
?
1
:
0
;
$supplier
[
'is_yunxin_supplier'
]
=
$existsYunxinAccount
?
1
:
0
;
}
}
...
...
app/Http/Services/SupplierStatisticsService.php
View file @
0cde93c8
...
@@ -85,25 +85,25 @@ class SupplierStatisticsService
...
@@ -85,25 +85,25 @@ class SupplierStatisticsService
'all_channel_user_resigned'
=>
null
,
'all_channel_user_resigned'
=>
null
,
//历史平台合作供应商
//历史平台合作供应商
'uploaded_sku'
=>
null
,
'uploaded_sku'
=>
null
,
// 非
云芯
供应商
// 非
芯链
供应商
'not_yunxin'
=>
null
,
'not_yunxin'
=>
null
,
//已上架(非
云芯
)供应商
//已上架(非
芯链
)供应商
'not_yunxin_and_has_sku'
=>
null
,
'not_yunxin_and_has_sku'
=>
null
,
//已下架(非
云芯
)供应商
//已下架(非
芯链
)供应商
'not_yunxin_and_has_no_sku'
=>
null
,
'not_yunxin_and_has_no_sku'
=>
null
,
//
云芯
供应商
//
芯链
供应商
'yunxin'
=>
null
,
'yunxin'
=>
null
,
//已上架(
云芯
)供应商
//已上架(
芯链
)供应商
'yunxin_and_has_sku'
=>
null
,
'yunxin_and_has_sku'
=>
null
,
//已下架(
云芯
)供应商
//已下架(
芯链
)供应商
'yunxin_and_has_no_sku'
=>
null
,
'yunxin_and_has_no_sku'
=>
null
,
//3天内到期(
云芯
)供应商
//3天内到期(
芯链
)供应商
'yunxin_expired_at_days'
=>
null
,
'yunxin_expired_at_days'
=>
null
,
//3天内到期(非
云芯
)供应商
//3天内到期(非
芯链
)供应商
'not_yunxin_expired_at_days'
=>
null
,
'not_yunxin_expired_at_days'
=>
null
,
//已过期(
云芯
)供应商
//已过期(
芯链
)供应商
'yunxin_expired'
=>
null
,
'yunxin_expired'
=>
null
,
//已过期(非
云芯
)供应商
//已过期(非
芯链
)供应商
'not_yunxin_expired'
=>
null
,
'not_yunxin_expired'
=>
null
,
//缺少平台合作协议(线上)
//缺少平台合作协议(线上)
'no_cooperation_agreement'
=>
null
,
'no_cooperation_agreement'
=>
null
,
...
...
app/Http/Validators/SupplierAccountValidator.php
View file @
0cde93c8
...
@@ -55,7 +55,7 @@ class SupplierAccountValidator
...
@@ -55,7 +55,7 @@ class SupplierAccountValidator
{
{
return
[
return
[
'supplier_code.required'
=>
'请选择一个供应商'
,
'supplier_code.required'
=>
'请选择一个供应商'
,
'a_type.required'
=>
'类型必须勾选为
云芯
商家'
,
'a_type.required'
=>
'类型必须勾选为
芯链
商家'
,
'mobile.required'
=>
'登录账号不能为空'
,
'mobile.required'
=>
'登录账号不能为空'
,
'mobile.regex'
=>
'账号格式必须为手机号'
,
'mobile.regex'
=>
'账号格式必须为手机号'
,
'password_raw.required'
=>
'账号密码不能为空'
,
'password_raw.required'
=>
'账号密码不能为空'
,
...
...
config/field.php
View file @
0cde93c8
...
@@ -68,7 +68,7 @@ return [
...
@@ -68,7 +68,7 @@ return [
'SupplierAccountType'
=>
[
'SupplierAccountType'
=>
[
0
=>
'其它'
,
0
=>
'其它'
,
1
=>
'
云芯
商家'
1
=>
'
芯链
商家'
],
],
'AttachmentFields'
=>
[
'AttachmentFields'
=>
[
...
@@ -133,7 +133,7 @@ return [
...
@@ -133,7 +133,7 @@ return [
'OutsideContactType'
=>
[
'OutsideContactType'
=>
[
1
=>
'人工上传'
,
1
=>
'人工上传'
,
2
=>
'API对接'
,
2
=>
'API对接'
,
3
=>
'
云芯
上传'
3
=>
'
芯链
上传'
],
],
//以下供应商为代购供应商,不要更改为临时的,保持为正式供应商
//以下供应商为代购供应商,不要更改为临时的,保持为正式供应商
...
@@ -226,7 +226,7 @@ return [
...
@@ -226,7 +226,7 @@ return [
4
=>
'专营API'
,
4
=>
'专营API'
,
5
=>
'专营数据包'
,
5
=>
'专营数据包'
,
6
=>
'专营后台上传'
,
6
=>
'专营后台上传'
,
7
=>
'专营
云芯
上传'
,
7
=>
'专营
芯链
上传'
,
8
=>
'专营采集'
,
8
=>
'专营采集'
,
],
],
...
...
config/fixed.php
View file @
0cde93c8
...
@@ -55,7 +55,7 @@ return [
...
@@ -55,7 +55,7 @@ return [
'OutsideContactType'
=>
[
'OutsideContactType'
=>
[
1
=>
'API'
,
1
=>
'API'
,
//2 => 'FTP',
//2 => 'FTP',
3
=>
'
云芯
'
,
3
=>
'
芯链
'
,
],
],
'StockupTypeOld'
=>
[
'StockupTypeOld'
=>
[
...
@@ -65,7 +65,7 @@ return [
...
@@ -65,7 +65,7 @@ return [
7
=>
'联营-原厂直供'
,
7
=>
'联营-原厂直供'
,
2
=>
'自营-自采'
,
2
=>
'自营-自采'
,
4
=>
'自营-寄售'
,
4
=>
'自营-寄售'
,
// 5 => '联营-
云芯
商家',
// 5 => '联营-
芯链
商家',
],
],
'StockupType'
=>
[
'StockupType'
=>
[
...
@@ -75,7 +75,7 @@ return [
...
@@ -75,7 +75,7 @@ return [
7
=>
'原厂直供'
,
7
=>
'原厂直供'
,
2
=>
'猎芯仓库'
,
2
=>
'猎芯仓库'
,
4
=>
'现货寄售'
,
4
=>
'现货寄售'
,
5
=>
'
云芯
商家'
,
5
=>
'
芯链
商家'
,
],
],
'SupplierPayType'
=>
[
'SupplierPayType'
=>
[
...
@@ -93,7 +93,7 @@ return [
...
@@ -93,7 +93,7 @@ return [
'SupplierApiType'
=>
[
'SupplierApiType'
=>
[
1
=>
'API'
,
1
=>
'API'
,
2
=>
'FTP'
,
2
=>
'FTP'
,
3
=>
'
云芯
'
,
3
=>
'
芯链
'
,
],
],
...
@@ -241,16 +241,16 @@ return [
...
@@ -241,16 +241,16 @@ return [
'pay_type_term'
=>
'账期供应商'
,
'pay_type_term'
=>
'账期供应商'
,
'all_channel_user_resigned'
=>
'采购员全离职'
,
'all_channel_user_resigned'
=>
'采购员全离职'
,
'uploaded_sku'
=>
'历史平台合作供应商'
,
'uploaded_sku'
=>
'历史平台合作供应商'
,
'not_yunxin'
=>
'非
云芯
供应商'
,
'not_yunxin'
=>
'非
芯链
供应商'
,
'not_yunxin_and_has_sku'
=>
'已上架(非
云芯
)供应商'
,
'not_yunxin_and_has_sku'
=>
'已上架(非
芯链
)供应商'
,
'not_yunxin_and_has_no_sku'
=>
'已下架(非
云芯
)供应商'
,
'not_yunxin_and_has_no_sku'
=>
'已下架(非
芯链
)供应商'
,
'yunxin'
=>
'
云芯
供应商'
,
'yunxin'
=>
'
芯链
供应商'
,
'yunxin_and_has_sku'
=>
'已上架(
云芯
)供应商'
,
'yunxin_and_has_sku'
=>
'已上架(
芯链
)供应商'
,
'yunxin_and_has_no_sku'
=>
'已下架(
云芯
)供应商'
,
'yunxin_and_has_no_sku'
=>
'已下架(
芯链
)供应商'
,
'yunxin_expired_at_days'
=>
'3天内到期(
云芯
)供应商'
,
'yunxin_expired_at_days'
=>
'3天内到期(
芯链
)供应商'
,
'not_yunxin_expired_at_days'
=>
'3天内到期(非
云芯
)供应商'
,
'not_yunxin_expired_at_days'
=>
'3天内到期(非
芯链
)供应商'
,
'yunxin_expired'
=>
'已过期(
云芯
)供应商'
,
'yunxin_expired'
=>
'已过期(
芯链
)供应商'
,
'not_yunxin_expired'
=>
'已过期(非
云芯
)供应商'
,
'not_yunxin_expired'
=>
'已过期(非
芯链
)供应商'
,
'no_cooperation_agreement'
=>
'缺少平台合作协议(线上)'
,
'no_cooperation_agreement'
=>
'缺少平台合作协议(线上)'
,
],
],
//Sku列表的罗盘对应菜单id
//Sku列表的罗盘对应菜单id
...
...
resources/views/script/AddSupplierScript.blade.php
View file @
0cde93c8
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
//不让选,也不隐藏
//不让选,也不隐藏
form
.
on
(
'checkbox(stockup_type_filter)'
,
function
(
data
)
{
form
.
on
(
'checkbox(stockup_type_filter)'
,
function
(
data
)
{
if
(
data
.
elem
.
checked
&&
data
.
elem
.
name
===
"stockup_type[5]"
)
{
if
(
data
.
elem
.
checked
&&
data
.
elem
.
name
===
"stockup_type[5]"
)
{
layer
.
msg
(
'新增供应商没法设置为
云芯账号类型,设置云芯
账号要先去魔方系统配置阶梯系数'
,
{
icon
:
5
})
layer
.
msg
(
'新增供应商没法设置为
芯链账号类型,设置芯链
账号要先去魔方系统配置阶梯系数'
,
{
icon
:
5
})
$
(
'input[name="stockup_type[5]"]'
).
next
().
click
();
$
(
'input[name="stockup_type[5]"]'
).
next
().
click
();
}
}
});
});
...
...
resources/views/script/SupplierApplyListScript.blade.php
View file @
0cde93c8
...
@@ -96,11 +96,11 @@
...
@@ -96,11 +96,11 @@
return
;
return
;
}
}
if
(
data
[
0
].
has_ladder_ratio
!==
1
&&
data
[
0
].
has_ladder_ratio
!==
1
)
{
if
(
data
[
0
].
has_ladder_ratio
!==
1
&&
data
[
0
].
has_ladder_ratio
!==
1
)
{
layer
.
msg
(
'请先设置该供应商为“
云芯
商家”,并且配置“阶梯系数”后,再进行审核操作'
,
{
icon
:
5
});
layer
.
msg
(
'请先设置该供应商为“
芯链
商家”,并且配置“阶梯系数”后,再进行审核操作'
,
{
icon
:
5
});
return
;
return
;
}
}
if
(
data
[
0
].
is_yunxin
!==
1
)
{
if
(
data
[
0
].
is_yunxin
!==
1
)
{
layer
.
msg
(
'请先设置该供应商为“
云芯
商家”,再进行审核操作'
,
{
icon
:
5
});
layer
.
msg
(
'请先设置该供应商为“
芯链
商家”,再进行审核操作'
,
{
icon
:
5
});
return
;
return
;
}
}
if
(
data
[
0
].
has_ladder_ratio
!==
1
)
{
if
(
data
[
0
].
has_ladder_ratio
!==
1
)
{
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
type
:
2
,
type
:
2
,
content
:
'/supplier_apply/AuditSupplierApply?view=iframe&id='
+
id
,
content
:
'/supplier_apply/AuditSupplierApply?view=iframe&id='
+
id
,
area
:
[
'800px'
,
'600px'
],
area
:
[
'800px'
,
'600px'
],
title
:
'
云芯
入驻审核'
,
title
:
'
芯链
入驻审核'
,
end
:
function
()
{
end
:
function
()
{
table
.
reload
(
'supplierApplyList'
);
table
.
reload
(
'supplierApplyList'
);
}
}
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
let
hasLadderRatio
=
table
.
cache
[
'supplierApplyList'
][
rowIndex
].
has_ladder_ratio
;
let
hasLadderRatio
=
table
.
cache
[
'supplierApplyList'
][
rowIndex
].
has_ladder_ratio
;
let
yunxinHtml
=
isYunxin
?
'
<
i
class
=
"layui-icon layui-icon-ok-circle"
style
=
"color: limegreen"
><
/i>' : '<i class="layui-icon layui-icon-close-fill" style="color: orangered"></i
>
';
let
yunxinHtml
=
isYunxin
?
'
<
i
class
=
"layui-icon layui-icon-ok-circle"
style
=
"color: limegreen"
><
/i>' : '<i class="layui-icon layui-icon-close-fill" style="color: orangered"></i
>
';
let ratioHtml = hasLadderRatio ? '
<
i
class
=
"layui-icon layui-icon-ok-circle"
style
=
"color: limegreen"
><
/i>' : '<i class="layui-icon layui-icon-close-fill" style="color:orangered"></i
>
';
let ratioHtml = hasLadderRatio ? '
<
i
class
=
"layui-icon layui-icon-ok-circle"
style
=
"color: limegreen"
><
/i>' : '<i class="layui-icon layui-icon-close-fill" style="color:orangered"></i
>
';
let html = '
<
p
>
云芯
商家
' + yunxinHtml + '
<
/p><p>阶梯系数 ' + ratioHtml + '</
p
>
'
let html = '
<
p
>
芯链
商家
' + yunxinHtml + '
<
/p><p>阶梯系数 ' + ratioHtml + '</
p
>
'
auditConditionTipsVal = layer.tips(html, self, {
auditConditionTipsVal = layer.tips(html, self, {
tips: [3, "#555555"],
tips: [3, "#555555"],
time: 1000000,
time: 1000000,
...
...
resources/views/script/UpdateSupplierScript.blade.php
View file @
0cde93c8
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
});
});
//点击
云芯
//点击
芯链
form
.
on
(
'checkbox(stockup_type_filter)'
,
function
(
data
)
{
form
.
on
(
'checkbox(stockup_type_filter)'
,
function
(
data
)
{
if
(
data
.
elem
.
checked
&&
data
.
elem
.
name
===
"stockup_type[5]"
)
{
if
(
data
.
elem
.
checked
&&
data
.
elem
.
name
===
"stockup_type[5]"
)
{
let
url
=
'/api/supplier/checkHasLadderPriceSetting?supplier_id='
+
getQueryVariable
(
'supplier_id'
);
let
url
=
'/api/supplier/checkHasLadderPriceSetting?supplier_id='
+
getQueryVariable
(
'supplier_id'
);
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
if
(
res
.
err_code
===
0
)
{
if
(
res
.
err_code
===
0
)
{
}
else
{
}
else
{
layer
.
msg
(
'请先去魔方系统配置阶梯系数,再新建
云芯
账号'
,
{
icon
:
5
})
layer
.
msg
(
'请先去魔方系统配置阶梯系数,再新建
芯链
账号'
,
{
icon
:
5
})
$
(
'input[name="stockup_type[5]"]'
).
next
().
click
();
$
(
'input[name="stockup_type[5]"]'
).
next
().
click
();
}
}
},
},
...
...
resources/views/web/AddSupplierAccount.blade.php
View file @
0cde93c8
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
账号类型 :
</label>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
账号类型 :
</label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
type=
"checkbox"
name=
"a_type"
title=
"
云芯
商家"
lay-skin=
"primary"
checked
>
<input
type=
"checkbox"
name=
"a_type"
title=
"
芯链
商家"
lay-skin=
"primary"
checked
>
</div>
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
...
...
resources/views/web/QuerySupplier.blade.php
View file @
0cde93c8
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
是否有平台合作 :
<span
id=
"uploaded_sku"
></span>
是否有平台合作 :
<span
id=
"uploaded_sku"
></span>
</div>
</div>
<div
class=
"layui-col-md4"
>
<div
class=
"layui-col-md4"
>
是否
云芯
商家 :
<span
id=
"is_yunxin_supplier"
></span>
是否
芯链
商家 :
<span
id=
"is_yunxin_supplier"
></span>
</div>
</div>
</div>
</div>
</form>
</form>
...
...
resources/views/web/UpdateSupplierAccount.blade.php
View file @
0cde93c8
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
账号类型 :
</label>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
账号类型 :
</label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
type=
"checkbox"
name=
"a_type"
title=
"
云芯
商家"
lay-skin=
"primary"
@
if
(!
empty
($
account
['
a_type
'])&&$
account
['
a_type
']==
1
)
checked
@
endif
>
<input
type=
"checkbox"
name=
"a_type"
title=
"
芯链
商家"
lay-skin=
"primary"
@
if
(!
empty
($
account
['
a_type
'])&&$
account
['
a_type
']==
1
)
checked
@
endif
>
</div>
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
...
...
resources/views/web/supplier/SupplierListFilter.blade.php
View file @
0cde93c8
...
@@ -151,55 +151,55 @@
...
@@ -151,55 +151,55 @@
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"非
云芯
供应商"
id=
"not_yunxin"
>
<a
class=
"main_filter"
title=
"非
芯链
供应商"
id=
"not_yunxin"
>
非
云芯
供应商
非
芯链
供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"已上架(非
云芯
)供应商"
id=
"not_yunxin_and_has_sku"
>
<a
class=
"main_filter"
title=
"已上架(非
芯链
)供应商"
id=
"not_yunxin_and_has_sku"
>
已上架(非
云芯
)供应商
已上架(非
芯链
)供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"已下架(非
云芯
)供应商"
id=
"not_yunxin_and_has_no_sku"
>
<a
class=
"main_filter"
title=
"已下架(非
芯链
)供应商"
id=
"not_yunxin_and_has_no_sku"
>
已下架(非
云芯
)供应商
已下架(非
芯链
)供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"
云芯
供应商"
id=
"yunxin"
>
<a
class=
"main_filter"
title=
"
芯链
供应商"
id=
"yunxin"
>
云芯
供应商
芯链
供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"已上架(
云芯
)供应商"
id=
"yunxin_and_has_sku"
>
<a
class=
"main_filter"
title=
"已上架(
芯链
)供应商"
id=
"yunxin_and_has_sku"
>
已上架(
云芯
)供应商
已上架(
芯链
)供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"已下架(
云芯
)供应商"
id=
"yunxin_and_has_no_sku"
>
<a
class=
"main_filter"
title=
"已下架(
芯链
)供应商"
id=
"yunxin_and_has_no_sku"
>
已下架(
云芯
)供应商
已下架(
芯链
)供应商
</a>
</a>
</div>
</div>
</div>
</div>
<div
class=
"split-item"
id=
"s8"
style=
"text-align: center"
>
<div
class=
"split-item"
id=
"s8"
style=
"text-align: center"
>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"3天内到期(
云芯
)供应商"
id=
"yunxin_expired_at_days"
>
<a
class=
"main_filter"
title=
"3天内到期(
芯链
)供应商"
id=
"yunxin_expired_at_days"
>
3天内到期(
云芯
)供应商
3天内到期(
芯链
)供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"3天内到期(非
云芯
)供应商"
id=
"not_yunxin_expired_at_days"
>
<a
class=
"main_filter"
title=
"3天内到期(非
芯链
)供应商"
id=
"not_yunxin_expired_at_days"
>
3天内到期(非
云芯
)供应商
3天内到期(非
芯链
)供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"已过期(
云芯
)供应商"
id=
"yunxin_expired"
>
<a
class=
"main_filter"
title=
"已过期(
芯链
)供应商"
id=
"yunxin_expired"
>
已过期(
云芯
)供应商
已过期(
芯链
)供应商
</a>
</a>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-row"
>
<a
class=
"main_filter"
title=
"已过期(非
云芯
)供应商"
id=
"not_yunxin_expired"
>
<a
class=
"main_filter"
title=
"已过期(非
芯链
)供应商"
id=
"not_yunxin_expired"
>
已过期(非
云芯
)供应商
已过期(非
芯链
)供应商
</a>
</a>
</div>
</div>
</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