diff --git a/app/adminapi/controller/works/finance/ExpenseController.php b/app/adminapi/controller/works/finance/ExpenseController.php index a4ce3a2bc..82f60dda3 100644 --- a/app/adminapi/controller/works/finance/ExpenseController.php +++ b/app/adminapi/controller/works/finance/ExpenseController.php @@ -173,6 +173,7 @@ $data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : ''; $data['copy_users'] = !empty($copy_users) ? implode(',',$copy_users) : ''; $data['detail'] = json_decode($data['detail'],true); + $data['annex'] = json_decode($data['annex'],true); $data['total_amount'] = 0; foreach ($data['detail'] as $v){ $data['total_amount'] += $v['amount']; diff --git a/app/adminapi/controller/works/finance/IncomeController.php b/app/adminapi/controller/works/finance/IncomeController.php index 9aa0f0b6a..0dafaef11 100644 --- a/app/adminapi/controller/works/finance/IncomeController.php +++ b/app/adminapi/controller/works/finance/IncomeController.php @@ -80,9 +80,12 @@ $income_amount += $v['amount']; $save_data[] = [ 'inid' => $params['invoice_id'], - 'amount' => $params['amount'], + 'amount' => $v['amount'], 'admin_id' => $this->adminId, - '' + 'enter_time' => strtotime($v['enter_time']), + 'remarks' => $v['remarks'] ?? '', + 'create_time' => time(), + 'status' => 1 ]; } if($income_amount > (bcsub($invoice['amount'],$invoice['enter_amount'],2))){ @@ -90,6 +93,13 @@ } Db::startTrans(); try { + $enter_amount = bcadd($income_amount,$invoice['enter_amount'],2); + Db::name('oa_invoice_income')->insertAll($save_data); + Db::name('oa_invoice')->where('id',$params['invoice_id'])->update([ + 'enter_amount' => $enter_amount, + 'enter_time' => time(), + 'is_cash' => $enter_amount < $invoice['amount'] ? 1 : 2 + ]); Db::commit(); return $this->success('ok'); } catch (\Exception $e) { @@ -97,4 +107,8 @@ return $this->fail(); } } + + public function lists(){ + + } } \ No newline at end of file diff --git a/app/adminapi/controller/works/finance/InvoiceController.php b/app/adminapi/controller/works/finance/InvoiceController.php index 094ea3fda..ae31de75e 100644 --- a/app/adminapi/controller/works/finance/InvoiceController.php +++ b/app/adminapi/controller/works/finance/InvoiceController.php @@ -216,6 +216,7 @@ $data['dept_name'] = $dept ?? ''; $data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : ''; $data['create_time'] = date('Y-m-d H:i:s',$data['create_time']); + $data['annex'] = json_decode($data['annex'],true); $data['check_status_text'] = match ($data['check_status']){ 0=>'待审核',1=>'审核中,待开具',2=>'审核通过',3=>'审核不通过',4=>'撤销审核',5=>'已开具',10=>'已作废' }; @@ -225,6 +226,9 @@ $data['invoice_type_text'] = match ($data['invoice_type']){ 1=>'增值税专用发票',2=>'普通发票',3=>'专用发票' }; + $data['is_cash_text'] = match ($data['is_cash']){ + 0=>'未到账',1=>'部分到账',2=>'全部到账' + }; $data['open_time'] = !empty($data['open_time']) ? date('Y-m-d H:i:s',$data['open_time']) : ''; $data['open_admin_name'] = Admin::where('id',$data['open_admin_id'])?->value('name');