Commit 1db501fc by 杨树贤

Merge branch 'master' into ysx-审核小程序对接-20220831

parents 7497525d 68347186
......@@ -358,7 +358,7 @@ class SupplierApiController extends Controller
//还要去请求天眼查获取资料
$company = $unitedCompanyInfo['company'];
if (!$company) {
$this->response(-2, '公司未进行工商注册,请修改后重新提交');
$this->response(-2, '公司未进行工商注册');
}
} else {
$this->response(-2, '供应商跳过天眼查校验');
......
......@@ -52,8 +52,7 @@ class SupplierValidator
}
//没有忽略校验的权限并且供应商地区属于内地和港台才会去校验天眼查
if (!checkPerm('IgnoreCompanyCheck') && in_array($validateData['region'],
config('field.NeedCheckCompanyRegion'))) {
if (!checkPerm('IgnoreCompanyCheck') && in_array($validateData['region'], [2])) {
$needCheckFlag = false;
//新增的校验,然后修改的话,如果没有集团编码,并且是标准添加(非标准添加,即是特殊权限添加,不需要校验),也要去校验
if ($isAdd) {
......@@ -148,6 +147,9 @@ class SupplierValidator
$errorMessageList = [];
//判断供应商类型,如果类型为临时,而且名字属于不能修改为临时的代购供应商列表里面,就要报错
if (empty($validateData['supplier_type'])) {
return '请选择供应商类型';
}
if ($validateData['supplier_type'] == 2 && in_array($validateData['supplier_name'],
config('field.SkipChangeSupplierTypeNames'))) {
$errorMessageList[] = '该供应商是代购供应商,不能修改为临时供应商';
......
......@@ -354,7 +354,7 @@
if (ignoreCompanyCheck) {
layer.msg('公司未进行工商注册', {icon: 5})
} else {
$('#supplier_name').next('#supplier_check_tip').find('p').text('公司未进行工商注册,请修改后重新提交');
$('#supplier_name').next('#supplier_check_tip').find('p').text('公司未进行工商注册');
layer.msg('验证失败,公司未进行工商注册', {icon: 5})
resetCompanyInfo(supplierName !== '');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment