Commit 6fe475ec by 杨树贤

修改字眼

parent 1e3f8146
...@@ -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');
......
...@@ -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) {
......
...@@ -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');
......
...@@ -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;
......
...@@ -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;
......
...@@ -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 => '初审不通过',
......
...@@ -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' => '草稿',
......
...@@ -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});
} }
} }
......
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