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

update

Browse Source
This commit is contained in:
weiz 2024-05-28 09:18:07 +08:00
parent 52868c6346
commit 6c58cf9b4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/adminapi/controller/works/finance/IncomeController.php
View File

@ -29,7 +29,7 @@
}else{ }else{
$where[] = ['is_cash','in','0,1,2']; $where[] = ['is_cash','in','0,1,2'];
} }
$lists = Db::name('oa_invoice')->field('id,is_cash,enter_amount,enter_time,type,invoice_title,amount,invoice_type,admin_id,create_time,code,open_time')->where('check_status',5)->where($where) $lists = Db::name('oa_invoice')->field('id,is_cash,enter_amount,enter_time,type,invoice_title,amount,invoice_type,admin_id,create_time,code,open_time,check_admin_ids,open_admin_id')->where('check_status',5)->where($where)
->page($page_no, $page_size)->order('id desc')->select()->each(function($data){ ->page($page_no, $page_size)->order('id desc')->select()->each(function($data){
$admin = Admin::field('name,dept_id')->where('id',$data['admin_id'])->findOrEmpty(); $admin = Admin::field('name,dept_id')->where('id',$data['admin_id'])->findOrEmpty();
$dept = Dept::where('id',$admin['dept_id'])->value('name'); $dept = Dept::where('id',$admin['dept_id'])->value('name');
@ -110,13 +110,13 @@
public function lists(){ public function lists(){
$params = $this->request->get(['invoice_id']); $params = $this->request->get(['invoice_id']);
if(empty($params['id'])){ if(empty($params['invoice_id'])){
return $this->fail('参数错误'); return $this->fail('参数错误');
} }
$data = Db::name('oa_invoice_income')->where('inid',$params['invoice_id'])->order('create_time desc')->select()->each(function($data){ $data = Db::name('oa_invoice_income')->where('inid',$params['invoice_id'])->order('create_time desc')->select()->each(function($data){
$data['enter_time'] = date('Y-m-d',$data['enter_time']); $data['enter_time'] = date('Y-m-d',$data['enter_time']);
$data['admin_name'] = Admin::where('id',$data['admin_id'])?->value('name'); $data['admin_name'] = Admin::where('id',$data['admin_id'])?->value('name');
}); })->toArray();
return $this->data($data); return $this->data($data);
} }
} }