From 699aed4ef18d43996b4501ec9428a90d19586ef6 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Mon, 17 Apr 2023 23:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=A8=A1=E6=9D=BF=E5=B1=95=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=8Ajs=E6=96=B9=E6=B3=95=EF=BC=8C=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E3=80=81PDF=E6=96=87=E4=BB=B6=E6=94=AF=E6=8C=81=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=95=B4=E4=BD=93=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E4=BA=86=E6=96=87=E4=BB=B6=E6=9B=B4=E8=83=BD=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BD=93=E9=AA=8C=E3=80=82=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=9D=97=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AFbug=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=88=B0=E8=B4=A6=E6=A8=A1=E5=9D=97=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0=E5=88=B0=E8=B4=A6?=
 =?UTF-8?q?=E5=87=AD=E6=8D=AE=E7=AD=89=E8=B5=84=E6=96=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/finance/controller/Income.php | 5 +++++
 app/finance/view/income/add.html  | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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();