From f890cb9a9b724ee27a7ecf46935f76db2e3a7262 Mon Sep 17 00:00:00 2001 From: lsm Date: Tue, 8 Oct 2024 11:34:37 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C2=E3=80=81=E9=87=91=E5=9F=9F=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=96=E6=B6=88=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/ReportFiles/Guide.frx | 45 ++++++++++++------- PEIS/ReportFiles/PReport.frx | 46 ++++++++++---------- PEIS/View/Enrollment/EnrollmentPersonForm.cs | 2 +- 3 files changed, 54 insertions(+), 39 deletions(-) diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx index 7062285..d0b6a9f 100644 --- a/PEIS/ReportFiles/Guide.frx +++ b/PEIS/ReportFiles/Guide.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -148,28 +148,28 @@ namespace FastReport - + - - + + - + - - - - - - - + + + + + + + @@ -178,9 +178,24 @@ namespace FastReport - - - + + + + + + + + + + + + + + + + + + diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index d50d027..0912732 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -162,32 +162,32 @@ namespace FastReport - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - + @@ -312,7 +312,7 @@ namespace FastReport - + @@ -353,7 +353,7 @@ namespace FastReport - + @@ -528,7 +528,7 @@ namespace FastReport - + @@ -567,7 +567,7 @@ namespace FastReport - + diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index d81b178..ea22905 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -510,7 +510,7 @@ namespace PEIS.View.Enrollment try { var items = new List(); - _lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHide && !(w.DeptName.Contains("金域"))).GroupBy(g => g.DeptCode).ForEach(dept => + _lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHide ).GroupBy(g => g.DeptCode).ForEach(dept => { var item = new EnrollmentFeeItem() {