diff --git a/app/adminapi/lists/administrative/AdministrativePaymentsLists.php b/app/adminapi/lists/administrative/AdministrativePaymentsLists.php index 2e59af68d..b2054daa5 100644 --- a/app/adminapi/lists/administrative/AdministrativePaymentsLists.php +++ b/app/adminapi/lists/administrative/AdministrativePaymentsLists.php @@ -60,12 +60,12 @@ class AdministrativePaymentsLists extends BaseAdminDataLists implements ListsSea ->leftJoin('orgs o','o.id = ap.org_id') ->leftJoin('dept d','d.id = ap.dept_id') ->leftJoin('administrative_contract ac','ac.id = ap.administrative_contract_id') - ->field('ap.*, d.name as dept_name, o.name as org_name, ac.supplier_id, ac.contract_no, ac.contract_name') + ->leftJoin('supplier s','s.id = ac.supplier_id') + ->field('ap.*, d.name as dept_name, o.name as org_name, ac.supplier_id, ac.contract_no, ac.contract_name, s.supplier_code, s.supplier_name') ->limit($this->limitOffset, $this->limitLength) ->order(['ap.id' => 'desc']) ->select()->each(function($item, $key){ //关联数据后续添加 - $item['supplier_name'] = '供应商名称'; $item['approve_no'] = '付款单号'; $item['approve_step'] = '流程步骤'; $item['approve_settle_status'] = 1; diff --git a/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php b/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php index 7a61dd125..cf744751e 100644 --- a/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php +++ b/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php @@ -60,7 +60,8 @@ class AdministrativeTicketCollectionLists extends BaseAdminDataLists implements ->leftJoin('orgs o','o.id = atc.org_id') ->leftJoin('dept d','d.id = atc.dept_id') ->leftJoin('administrative_contract ac','ac.id = atc.administrative_contract_id') - ->field('atc.*, d.name as dept_name, o.name as org_name, ac.supplier_id, ac.contract_no, ac.contract_name') + ->leftJoin('supplier s','s.id = ac.supplier_id') + ->field('atc.*, d.name as dept_name, o.name as org_name, ac.supplier_id, ac.contract_no, ac.contract_name, s.supplier_code, s.supplier_name') ->limit($this->limitOffset, $this->limitLength) ->order(['atc.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/lists/bill/TransferBillLists.php b/app/adminapi/lists/bill/TransferBillLists.php index 450ff0098..ba50f0fed 100644 --- a/app/adminapi/lists/bill/TransferBillLists.php +++ b/app/adminapi/lists/bill/TransferBillLists.php @@ -63,7 +63,8 @@ class TransferBillLists extends BaseAdminDataLists implements ListsSearchInterfa ->leftJoin('project p','p.id = pc.project_id') ->leftJoin('acceptance_bill ab','ab.id = tb.acceptance_bill_id') ->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') + ->leftJoin('supplier s','s.id = tb.supplier_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, tb.supplier_code, tb.supplier_name') ->limit($this->limitOffset, $this->limitLength) ->order(['tb.id' => 'desc']) ->select()->each(function($item, $key){