1、细节调整

msfy
lsm 9 months ago
parent 4a0b80df8a
commit c9ba7ae8c8
  1. 8
      PEIS/ReportFiles/Guide.frx
  2. 2
      PEIS/View/Enrollment/EnrollmentPersonForm.cs

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="08/22/2024 14:47:00" ReportInfo.CreatorVersion="2022.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="08/30/2024 09:08:38" ReportInfo.CreatorVersion="2022.1.0.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -124,7 +124,7 @@ namespace FastReport
<TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell36" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell36" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell37" Border.Lines="All" Text="民族" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell37" Border.Lines="All" Text="民族" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell38" Border.Lines="All" Text="[Nation]" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="3"/> <TableCell Name="Cell38" Border.Lines="All" Text="[Nation]" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="3"/>
<TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
</TableRow> </TableRow>
@ -156,7 +156,7 @@ namespace FastReport
</TableObject> </TableObject>
<BarcodeObject Name="Barcode1" Left="9.45" Top="9.45" Width="143.75" Height="56.7" AutoSize="false" Expression="[ExamID]" Text="" Barcode="Code128" Barcode.AutoEncode="true"/> <BarcodeObject Name="Barcode1" Left="9.45" Top="9.45" Width="143.75" Height="56.7" AutoSize="false" Expression="[ExamID]" Text="" Barcode="Code128" Barcode.AutoEncode="true"/>
</ReportTitleBand> </ReportTitleBand>
<DataBand Name="FeeItems" Top="438.21" Width="718.2" Height="81.27" CanGrow="true" CanShrink="true"> <DataBand Name="FeeItems" Top="438.88" Width="718.2" Height="81.27" CanGrow="true" CanShrink="true">
<TableObject Name="Table2" Width="718.2" Height="81.27"> <TableObject Name="Table2" Width="718.2" Height="81.27">
<TableColumn Name="Column11" Width="143.64"/> <TableColumn Name="Column11" Width="143.64"/>
<TableColumn Name="Column12" Width="143.64"/> <TableColumn Name="Column12" Width="143.64"/>
@ -180,7 +180,7 @@ namespace FastReport
</TableRow> </TableRow>
</TableObject> </TableObject>
</DataBand> </DataBand>
<PageFooterBand Name="PageFooter1" Top="521.48" Width="718.2" Height="37.8" Border.Lines="Top"> <PageFooterBand Name="PageFooter1" Top="522.81" Width="718.2" Height="37.8" Border.Lines="Top">
<TextObject Name="Text7" Width="160.65" Height="28.35" Text="第[Page#]页,共[TotalPages#]页" Font="微软雅黑, 10pt"/> <TextObject Name="Text7" Width="160.65" Height="28.35" Text="第[Page#]页,共[TotalPages#]页" Font="微软雅黑, 10pt"/>
<TextObject Name="Text8" Left="500.85" Width="217.35" Height="28.35" Text="打印时间:[Date]" Font="微软雅黑, 10pt"/> <TextObject Name="Text8" Left="500.85" Width="217.35" Height="28.35" Text="打印时间:[Date]" Font="微软雅黑, 10pt"/>
</PageFooterBand> </PageFooterBand>

@ -510,7 +510,7 @@ namespace PEIS.View.Enrollment
try try
{ {
var items = new List<EnrollmentFeeItem>(); var items = new List<EnrollmentFeeItem>();
_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() var item = new EnrollmentFeeItem()
{ {

Loading…
Cancel
Save