diff --git a/PEIS/ReportFiles/Logo-德宏.jpg b/PEIS/ReportFiles/Logo-德宏.jpg new file mode 100644 index 0000000..2ccd1e9 Binary files /dev/null and b/PEIS/ReportFiles/Logo-德宏.jpg differ diff --git a/PEIS/ReportFiles/Logo.jpg b/PEIS/ReportFiles/Logo.jpg index 2ccd1e9..10647e1 100644 Binary files a/PEIS/ReportFiles/Logo.jpg and b/PEIS/ReportFiles/Logo.jpg differ diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index f7754e7..47793c4 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,12 +1,11 @@  - + using System; using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Windows.Forms; using System.Drawing; -using System.Drawing.Imaging; using System.Data; using System.IO; using FastReport; @@ -22,10 +21,10 @@ namespace FastReport { String _pDeptName = "科室"; string picpathbase = System.Windows.Forms.Application.StartupPath + "\\ReportFiles\\"; - private void Logo_BeforePrint(object sender, EventArgs e) - { - Logo.ImageLocation = picpathbase + "Logo.jpg"; - } +// private void Logo_BeforePrint(object sender, EventArgs e) +// { +// Logo.ImageLocation = picpathbase + "Logo.jpg"; +// } private void General_AfterData(object sender, EventArgs e) { @@ -52,28 +51,28 @@ namespace FastReport { if(Cell171.Text.Contains("↑")) { - Cell167.FillColor = Color.LightCoral; - Cell168.FillColor = Color.LightCoral; - Cell169.FillColor = Color.LightCoral; - Cell170.FillColor = Color.LightCoral; - Cell171.FillColor = Color.LightCoral; + Cell167.TextColor = Color.Red; + Cell168.TextColor = Color.Red; + Cell169.TextColor = Color.Red; + Cell170.TextColor = Color.Red; + Cell171.TextColor = Color.Red; }else if (Cell171.Text.Contains("↓")) { - Cell167.FillColor = Color.LightCyan; - Cell168.FillColor = Color.LightCyan; - Cell169.FillColor = Color.LightCyan; - Cell170.FillColor = Color.LightCyan; - Cell171.FillColor = Color.LightCyan; + Cell167.TextColor = Color.Blue; + Cell168.TextColor = Color.Blue; + Cell169.TextColor = Color.Blue; + Cell170.TextColor = Color.Blue; + Cell171.TextColor = Color.Blue; }else { - Cell167.FillColor = Color.White; - Cell168.FillColor = Color.White; - Cell169.FillColor = Color.White; - Cell170.FillColor = Color.White; - Cell171.FillColor = Color.White; + Cell167.TextColor = Color.Black; + Cell168.TextColor = Color.Black; + Cell169.TextColor = Color.Black; + Cell170.TextColor = Color.Black; + Cell171.TextColor = Color.Black; } } - + private void Picture4_BeforePrint(object sender, EventArgs e) { DataSourceBase rowData = Report.GetDataSource("P"); @@ -90,14 +89,13 @@ namespace FastReport } } - private void Page6_StartPage(object sender, EventArgs e) + private void Page5_StartPage(object sender, EventArgs e) { DataSourceBase rowData = Report.GetDataSource("I"); - Object rowValue = rowData.CurrentRow; - if(rowValue == null) + Object rowValue = rowData.CurrentRow; + if(rowValue == null ) { - Page6.Visible = false; - return; + Page5.Visible = false; } } @@ -107,8 +105,7 @@ namespace FastReport Object rowValue = rowData.CurrentRow; if(rowValue == null) { - Page6.Visible = false; - return; + Page5.Visible = false; } var Picture = rowValue.GetType().GetProperty("ReportImage").GetValue(rowValue, null); @@ -132,12 +129,41 @@ namespace FastReport using (MemoryStream ms = new MemoryStream(imageBytes)) { Image image = Image.FromStream(ms); - using (MemoryStream stream = new MemoryStream()) - { - image.Save(stream, ImageFormat.Png); - return image; - } - + return image; + } + } + + private void Picture6_BeforePrint(object sender, EventArgs e) + { + Picture6.ImageLocation = picpathbase + "Logo.jpg"; + } + + private void Picture7_BeforePrint(object sender, EventArgs e) + { + Picture7.ImageLocation = picpathbase + "Logo.jpg"; + } + + private void Picture8_BeforePrint(object sender, EventArgs e) + { + Picture8.ImageLocation = picpathbase + "Logo.jpg"; + } + + private void DataFooter5_BeforePrint(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("L"); + if(rowData.RowCount == (rowData.CurrentRowNo + 1)) + { + DataFooter5.Height = 0.75F; + } + } + + private void GroupFooter1_BeforePrint(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("G"); + if(rowData.RowCount == (rowData.CurrentRowNo + 1)) + { + GroupFooter1.Height = 0; + GroupFooter1.Visible = false; } } } @@ -158,55 +184,48 @@ namespace FastReport - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + - - + + @@ -222,92 +241,38 @@ namespace FastReport - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + @@ -315,36 +280,110 @@ namespace FastReport - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + + @@ -354,158 +393,147 @@ namespace FastReport - - + + + + + + + + + + + + + - - - - - + + + + + + + + + + - + - - - - - + + + + + - - - - + + + + - - - - + + + + - + - - - - - - - + + + + + + + + + + + + + - - + + - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - - - - + + + + - + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + + + @@ -516,25 +544,80 @@ namespace FastReport - - - - + + + + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + +