mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新报销模块

Browse Source
This commit is contained in:
yaooo 2023-12-19 11:47:33 +08:00
parent 261908caff
commit 0e30107b12
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/adminapi/lists/expense/ExpenseReimbursementLists.php
View File

@ -38,7 +38,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['reimburser', 'reimbursement_date', 'customer_id', 'payee_name', 'payee_account'], '=' => ['er.reimburser', 'er.reimbursement_date', 'er.customer_id', 'er.payee_name', 'er.payee_account'],
]; ];
} }
@ -54,13 +54,6 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
*/ */
public function lists(): array public function lists(): array
{ {
return ExpenseReimbursement::where($this->searchWhere)
->field(['id', 'org_id', 'dept_id', 'approve_id', 'reimburser', 'reimbursement_date', 'customer_id', 'pay_type', 'reimbursement_amount', 'reimbursement_amount_daxie', 'payee_name', 'payee_bank', 'payee_account', 'remark', 'annex'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->toArray();
return Db::name('ExpenseReimbursement')->alias('er') return Db::name('ExpenseReimbursement')->alias('er')
->where($this->searchWhere) ->where($this->searchWhere)
->leftJoin('orgs o','o.id = er.org_id') ->leftJoin('orgs o','o.id = er.org_id')