更新报销模块

This commit is contained in:
yaooo 2023-12-19 11:45:33 +08:00
parent 9d6d42f5c9
commit 261908caff

View File

@ -18,7 +18,7 @@ namespace app\adminapi\lists\expense;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\expense\ExpenseReimbursement; use app\common\model\expense\ExpenseReimbursement;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use think\facade\Db;
/** /**
* ExpenseReimbursement列表 * ExpenseReimbursement列表
@ -60,6 +60,23 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()
->toArray(); ->toArray();
return Db::name('ExpenseReimbursement')->alias('er')
->where($this->searchWhere)
->leftJoin('orgs o','o.id = er.org_id')
->leftJoin('dept d','d.id = er.dept_id')
->leftJoin('custom ct','ct.id = er.customer_id')
->field('er.*, d.name as dept_name, o.name as org_name, ct.name as customer_name')
->limit($this->limitOffset, $this->limitLength)
->order(['er.id' => 'desc'])
->select()->each(function($item, $key){
//关联数据后续添加
$item['approve_no'] = '付款单号';
$item['approve_step'] = '流程步骤';
$item['approve_settle_status'] = 1;
return $item;
})
->toArray();
} }