|
@@ -1791,13 +1791,13 @@ class Payment extends BaseController
|
|
|
->alias("a")
|
|
|
->leftJoin("pay b", "a.payNo=b.payNo and b.is_del=0 and b.status=2")
|
|
|
->where(['b.is_del' => 0])
|
|
|
- ->whereIn('b.hpNo', array_column($post['list'], 'hpNo'))
|
|
|
- ->column("a.id,a.payNo,a.hpNo,a.invoiceType,a.inv_fee as invoice_fee,a.status,b.inv_status,b.inv_fee,b.companyNo,b.ainv_fee,b.winv_fee,b.hpNo");
|
|
|
+ ->whereIn('a.hpNo', array_column($post['list'], 'hpNo'))
|
|
|
+ ->column("a.id,a.payNo,a.hpNo,a.invoiceType,a.inv_fee as invoice_fee,a.status,b.inv_status,b.inv_fee,b.companyNo,b.ainv_fee,b.winv_fee,a.hpNo");
|
|
|
|
|
|
$val_hpNo = Validate::rule([
|
|
|
'hpNo|回票申请编号' => 'require',
|
|
|
'status|审核状态' => 'require|number|in:4,9',
|
|
|
- 'remark|审核备注' => 'requireIf:status:7|max:255'
|
|
|
+ 'remark|审核备注' => 'requireIf:status,7|max:255'
|
|
|
]);
|
|
|
|
|
|
foreach ($post['list'] as $item) {
|