Commit eaff939b by 杨树贤

优化筛选逻辑

parent c3a69892
......@@ -45,12 +45,15 @@ class AttachmentAuditFilter
}
}
}
// 默认只显示审核中的数据
if (empty($map['status'])) {
if (isset($map['status']) && $map['status'] === "0") {
$query->where('status', AttachmentAuditModel::STATUS_PENDING);
} else {
$query->where('status', $map['status']);
if (!empty($map['status'])) {
$query->where('status', $map['status']);
}else{
$query->where('status', AttachmentAuditModel::STATUS_PENDING);
}
}
// 供应商名称筛选
......
......@@ -893,4 +893,15 @@ class DataService
'international_code' => 'TW',
]);
}
public static function initSupplierAccountName()
{
$supplierAccountList = SupplierAccountModel::where('account_name', '')->get()->toArray();
foreach ($supplierAccountList as $supplierAccount) {
$supplierAccount['account_name'] = SupplierAccountService::generateAccountName($supplierAccount['supplier_id']);
SupplierAccountModel::where('id', $supplierAccount['id'])->update([
'account_name' => $supplierAccount['account_name'],
]);
}
}
}
......@@ -26,7 +26,7 @@
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('审核uid','审核人',request()->get('audit_uid'),$auditUidList) !!}
{!! $statusPresenter->render('audit_name','审核人',request()->get('audit_name'),$auditUidList) !!}
</div>
</div>
<div class="layui-row">
......
......@@ -26,7 +26,7 @@
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('审核uid','审核人',request()->get('audit_uid'),$auditUidList) !!}
{!! $statusPresenter->render('audit_name','审核人',request()->get('audit_name'),$auditUidList) !!}
</div>
</div>
<div class="layui-row">
......
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