Commit 5a10d436 by mushishixian

fix

parent 7b195abd
......@@ -157,7 +157,7 @@ class SupplierFilter
$query->where('status', SupplierChannelModel::STATUS_PENDING);
break;
case "in_review":
//审核中
//待复审
$query->where('status', SupplierChannelModel::STATUS_IN_REVIEW);
break;
case "passed":
......
......@@ -58,6 +58,7 @@ class SupplierController extends Controller
//供应商列表
public function SupplierList($request)
{
//判断权限
$intracodeModel = new IntracodeModel();
$this->data['userCodes'] = $intracodeModel->getChannelUsersEncode();
$this->data['users'] = $intracodeModel->getAdminUserAndCode();
......
......@@ -16,7 +16,7 @@ class SupplierStatisticsService
$total = $this->getStatisticsCount('all');
//待审核,就是以前的草稿
$pending = $this->getStatisticsCount('pending');
//审核中
//待复审
$inReview = $this->getStatisticsCount('in_review');
//通过
$passed = $this->getStatisticsCount('passed');
......
......@@ -43,7 +43,6 @@ class ReceiptValidator
'account_no.required' => '银行账号不能为空',
'account_name.required' => '账户名称不能为空',
'certificate.required' => '银行信息凭证不能为空',
];
}
}
\ No newline at end of file
......@@ -12,7 +12,7 @@ class SupplierChannelModel extends Model
//待审核(没有补充所有必填信息)
const STATUS_PENDING = -1;
//审核中
//待复审
const STATUS_IN_REVIEW = 1;
//通过
const STATUS_PASSED = 2;
......
......@@ -90,7 +90,7 @@ return [
// -3 => '已拉黑',
-2 => '禁止交易',
-1 => '待审核',
1 => '审核中',
1 => '待复审',
2 => '已通过',
3 => '未通过'
],
......@@ -206,7 +206,7 @@ return [
'CompassMenuMap' => [
'total' => '全部',
'pending' => '待审核',
'in_review' => '审核中',
'in_review' => '待复审',
'passed' => '已通过',
'rejected' => '未通过',
'disable' => '禁止交易',
......
......@@ -122,7 +122,7 @@
if (obj.tr.hasClass('table-selected')) {
obj.tr.removeClass('table-selected')
obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');
}else{
} else {
obj.tr.addClass('table-selected')
obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');
}
......@@ -185,13 +185,20 @@
return;
}
let supplierId = data[0].supplier_id;
let status = data[0].status;
let canAuditAddSupplier = {{checkPerm("AuditAddSupplier")?1:0}};
if (canAuditAddSupplier === 0 && status === -1) {
layer.msg('你没有审核第一次新增供应商的权限', {icon: 5})
return
}
if (status !== 1 && status !== -1) {
layer.msg('该供应商已经被审核', {icon: 5})
return
}
if (status === -1) {
layer.msg('要审核中的供应商才可以审核', {icon: 5});
layer.msg('要待复审的供应商才可以审核', {icon: 5});
return
}
layer.open({
......
......@@ -19,9 +19,9 @@
if (data.field.status === '-2') {
confirmMessage = '确定要重新入驻吗,该供应商就会再次进入审核阶段'
} else if (data.field.status === '-1') {
confirmMessage = '确定要提交新增供应商信息吗?一旦提交,该供应商就会进入审核中阶段,审核过程中无法进行信息修改'
confirmMessage = '确定要提交新增供应商信息吗?一旦提交,该供应商就会进入待复审阶段,审核过程中无法进行信息修改'
} else {
confirmMessage = '确定要修改供应商信息吗?一旦修改,该供应商就会再次进入审核中阶段,审核过程中无法进行信息修改'
confirmMessage = '确定要修改供应商信息吗?一旦修改,该供应商就会再次进入待复审阶段,审核过程中无法进行信息修改'
}
layer.confirm(confirmMessage, function (index) {
let res = ajax('/api/supplier/UpdateSupplier', data.field)
......
......@@ -73,7 +73,7 @@
@if($supplier['status']==\App\Model\SupplierChannelModel::STATUS_IN_REVIEW)
<div class="layui-row">
<button type="button" style="margin-bottom: 25px;margin-top: 5px"
class="layui-btn layui-btn layui-btn-disabled">审核中,不能修改
class="layui-btn layui-btn layui-btn-disabled">待复审,不能修改
</button>
</div>
@endif
......
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