diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx index e15e44a..7062285 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,25 +148,25 @@ namespace FastReport - + - - + + - + - - - + + + @@ -178,7 +178,7 @@ namespace FastReport - + diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index 3ccd3a1..00a533b 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -163,39 +163,50 @@ namespace FastReport - + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + + + - + + + + + + + + + + - + @@ -217,82 +228,21 @@ namespace FastReport - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -310,8 +260,8 @@ namespace FastReport - - + + @@ -325,8 +275,76 @@ namespace FastReport + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -349,12 +367,21 @@ namespace FastReport - - + + - + + + + + + + + + + @@ -375,7 +402,7 @@ namespace FastReport - + @@ -385,10 +412,10 @@ namespace FastReport - + - + @@ -405,43 +432,7 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -450,7 +441,7 @@ namespace FastReport - + @@ -473,7 +464,7 @@ namespace FastReport - + @@ -488,7 +479,7 @@ namespace FastReport - + @@ -511,7 +502,7 @@ namespace FastReport - + @@ -523,13 +514,61 @@ namespace FastReport - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index d15e457..a5cede6 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -685,7 +685,7 @@ namespace PEIS.View.Enrollment try { var items = new List(); - _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHide && !(w.DeptName.Contains("金域"))).GroupBy(g => g.DeptCode).ForEach(dept => + _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHide ).GroupBy(g => g.DeptCode).ForEach(dept => { var item = new EnrollmentFeeItem() { diff --git a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs index 26f7e6e..c1aae15 100644 --- a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs @@ -274,7 +274,7 @@ namespace PEIS.View.Enrollment Address1 = Address1.Text.Trim(), Company = Company.Text.Trim(), Description = Description.Text.Trim(), - IsWeChatView = false + IsWeChatView = false, SpellCode = PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin[0] };