diff --git a/app/adminapi/lists/bill/AcceptanceBillLists.php b/app/adminapi/lists/bill/AcceptanceBillLists.php index bb48e5daf..7cb8d0ee1 100644 --- a/app/adminapi/lists/bill/AcceptanceBillLists.php +++ b/app/adminapi/lists/bill/AcceptanceBillLists.php @@ -62,7 +62,7 @@ class AcceptanceBillLists extends BaseAdminDataLists implements ListsSearchInter ->leftJoin('project p','p.id = ab.project_id') ->leftJoin('contract c','c.id = ab.contract_id') ->leftJoin('custom ct','ct.id = ab.customer_id') - ->field('ap.*, d.name as dept_name, o.name as org_name, , p.name as project_name, c.contract_code, c.contract_name') + ->field('ap.*, d.name as dept_name, o.name as org_name, p.name as project_name, c.contract_code, c.contract_name') ->limit($this->limitOffset, $this->limitLength) ->order(['ap.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/lists/bill/TransferBillLists.php b/app/adminapi/lists/bill/TransferBillLists.php index 9c4746fd6..3bd8b176e 100644 --- a/app/adminapi/lists/bill/TransferBillLists.php +++ b/app/adminapi/lists/bill/TransferBillLists.php @@ -62,7 +62,7 @@ class TransferBillLists extends BaseAdminDataLists implements ListsSearchInterfa ->leftJoin('procurement_contract pc','pc.id = tb.procurement_contract_id') ->leftJoin('project p','p.id = pc.project_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') + ->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') ->limit($this->limitOffset, $this->limitLength) ->order(['tb.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/logic/bill/TransferBillLogic.php b/app/adminapi/logic/bill/TransferBillLogic.php index da14ca2ea..718d2e326 100644 --- a/app/adminapi/logic/bill/TransferBillLogic.php +++ b/app/adminapi/logic/bill/TransferBillLogic.php @@ -119,7 +119,6 @@ class TransferBillLogic extends BaseLogic */ public static function detail($params): array { - return TransferBill::findOrEmpty($params['id'])->toArray(); $transferBill = TransferBill::findOrEmpty($params['id']); $transferBill->org; $transferBill->dept;