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-25 13:58:26 +08:00
parent 5c088d427f
commit 3cb8dea883
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/lists/bill/RedemptionBillLists.php
View File

@ -60,7 +60,8 @@ class RedemptionBillLists extends BaseAdminDataLists implements ListsSearchInter
->leftJoin('orgs o','o.id = rb.org_id') ->leftJoin('orgs o','o.id = rb.org_id')
->leftJoin('dept d','d.id = rb.dept_id') ->leftJoin('dept d','d.id = rb.dept_id')
->leftJoin('acceptance_bill ab','ab.id = rb.acceptance_bill_id') ->leftJoin('acceptance_bill ab','ab.id = rb.acceptance_bill_id')
->field('rb.*, d.name as dept_name, o.name as org_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date') ->leftJoin('bank_account ba','ba.id = ab.bank_account_id')
->field('rb.*, d.name as dept_name, o.name as org_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date, ba.deposit_bank, ba.account_name, ba.account')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['rb.id' => 'desc']) ->order(['rb.id' => 'desc'])
->select()->each(function($item, $key){ ->select()->each(function($item, $key){

3
app/adminapi/lists/bill/TransferBillLists.php
View File

@ -62,7 +62,8 @@ class TransferBillLists extends BaseAdminDataLists implements ListsSearchInterfa
->leftJoin('procurement_contract pc','pc.id = tb.procurement_contract_id') ->leftJoin('procurement_contract pc','pc.id = tb.procurement_contract_id')
->leftJoin('project p','p.id = pc.project_id') ->leftJoin('project p','p.id = pc.project_id')
->leftJoin('acceptance_bill ab','ab.id = tb.acceptance_bill_id') ->leftJoin('acceptance_bill ab','ab.id = tb.acceptance_bill_id')
->field('tb.*, d.name as dept_name, o.name as org_name, p.name as project_name, pc.contract_no, pc.contract_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date') ->leftJoin('bank_account ba','ba.id = ab.bank_account_id')
->field('tb.*, d.name as dept_name, o.name as org_name, p.name as project_name, pc.contract_no, pc.contract_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date, ba.deposit_bank, ba.account_name, ba.account')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['tb.id' => 'desc']) ->order(['tb.id' => 'desc'])
->select()->each(function($item, $key){ ->select()->each(function($item, $key){