diff --git a/app/finance/controller/Income.php b/app/finance/controller/Income.php index 81d7f59..c55f792 100644 --- a/app/finance/controller/Income.php +++ b/app/finance/controller/Income.php @@ -155,6 +155,11 @@ class Income extends BaseController $fileArray = Db::name('File')->where('id','in',$detail['file_ids'])->select(); $detail['fileArray'] = $fileArray; } + + if($detail['other_file_ids'] !=''){ + $fileArrayOther = Db::name('File')->where('id','in',$detail['other_file_ids'])->select(); + $detail['fileArrayOther'] = $fileArrayOther; + } $detail['not_income'] = ($detail['amount']*100 - $detail['enter_amount']*100)/100; //已到账的记录 $detail['income'] = InvoiceIncome::field('i.*,a.name as admin') diff --git a/app/finance/view/income/add.html b/app/finance/view/income/add.html index a773e07..7b92ca5 100644 --- a/app/finance/view/income/add.html +++ b/app/finance/view/income/add.html @@ -253,7 +253,7 @@ function gouguInit() { other_file_ids:val }, success: function (e) { - //location.reload(); + location.reload(); } }) }, @@ -263,7 +263,7 @@ function gouguInit() { type:'post', data:{ id:$('[name="id"]').val(), - //other_file_ids:val + other_file_ids:val }, success: function (e) { location.reload();