diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工序交接记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工序交接记录.frx
new file mode 100644
index 0000000..62bbe8c
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工序交接记录.frx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx
new file mode 100644
index 0000000..28ac4d5
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx
@@ -0,0 +1,248 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ private void Table2_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ // print the table body
+ Table2.PrintRow(0);
+ Table2.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道预制施工检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道预制施工检查记录.frx
new file mode 100644
index 0000000..7c75456
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道预制施工检查记录.frx
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门检验试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门检验试验记录.frx
new file mode 100644
index 0000000..d1e5eef
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门检验试验记录.frx
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门试验确认表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门试验确认表.frx
new file mode 100644
index 0000000..6db822e
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门试验确认表.frx
@@ -0,0 +1,210 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ private void Table2_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ // print the table body
+ Table2.PrintRow(0);
+ Table2.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx
new file mode 100644
index 0000000..8a237ed
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 12bfa62..214980b 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -14,9 +14,8 @@
-
-
- CurrentPage
+ Login.aspx
+ SpecificPage
True
False
False
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx
index e69ce08..cf621a9 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx
@@ -5,7 +5,7 @@
- 管件宏观检查验收记录表
+ 管件宏观检查记录表
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.designer.cs
index 1a341b6..609ce83 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.designer.cs
@@ -156,7 +156,7 @@ namespace FineUIPro.Web.JGZL
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.TextArea txtTestResults;
+ protected global::FineUIPro.TextBox txtTestResults;
///
/// txtRemark 控件。
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 9cb9284..30834b7 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+
diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs
index 6372404..1f59d8f 100644
--- a/HJGL_DS/Model/Model.cs
+++ b/HJGL_DS/Model/Model.cs
@@ -86240,7 +86240,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_ID", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_ID", DbType="NVarChar(50)")]
public string STE_ID
{
get
@@ -86320,7 +86320,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeFittingName", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeFittingName", DbType="NVarChar(100)")]
public string PipeFittingName
{
get
@@ -86360,7 +86360,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Conclusion", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Conclusion", DbType="NVarChar(500)")]
public string Conclusion
{
get