From ccc49dc1c17de7655ac07dd53c32782bc8c2024b Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Wed, 19 Feb 2025 14:12:01 +0800
Subject: [PATCH] =?UTF-8?q?20250219=20=E4=BA=BA=E5=91=98=E6=8A=A5=E9=AA=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comprehensive/InspectionEquipment.aspx    |  2 +-
 .../InspectionEquipmentDataInNew.aspx         |  2 +-
 .../InspectionEquipmentDataInNew.aspx.cs      |  8 ++++--
 .../InspectionEquipmentDataInNewEdit.aspx     |  4 +--
 ...ionEquipmentDataInNewEdit.aspx.designer.cs |  2 +-
 .../CQMS/Comprehensive/InspectionPerson.aspx  |  6 ++---
 .../InspectionPersonDataInNew.aspx            |  6 ++---
 .../InspectionPersonDataInNew.aspx.cs         | 25 +++++++++++++------
 .../InspectionPersonDataInNewEdit.aspx        | 20 +++++++--------
 ...ectionPersonDataInNewEdit.aspx.designer.cs |  6 ++---
 10 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
index 82c49569..8301b5ec 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
@@ -131,7 +131,7 @@
         </f:Window>
         <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1000px" Height="560px">
+            Width="1200px" Height="600px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
             EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx
index cb83cd3a..e1a06415 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx
@@ -112,7 +112,7 @@
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField>
                         <f:RenderField Width="110px" HeaderText="报验日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left">
+                           FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="80px" HeaderText="拟使用部位" ColumnID="Value13" DataField="Value13" SortField="Value13"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx.cs
index cf6723f8..fe46642a 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx.cs
@@ -427,11 +427,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         try
                         {
-                            Ins.InspectionDate = Convert.ToDateTime(tempData.Value12);
+                            Ins.InspectionDate = Funs.GetNewDateTime(tempData.Value12);
+                            if (Ins.InspectionDate == null)
+                            {
+                                errInfo += "报验日期[" + tempData.Value12 + "]格式错误；";
+                            }
                         }
                         catch (Exception)
                         {
-                            errInfo += "报验日期[" + tempData.Value12+ "]格式错误；";
+                            errInfo += "报验日期[" + tempData.Value12 + "]格式错误；";
                         }
                     }
                     if (!string.IsNullOrEmpty(tempData.Value13))
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx
index 0c3c33d7..bd644c12 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx
@@ -56,8 +56,8 @@
 </f:TextBox>
                         <f:TextBox ID="txtValue11" Label="本次抽检结果" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:DatePicker ID="txtValue12" Label="报验日期" runat="server" LabelWidth="120px">
-                        </f:DatePicker>
+                        <f:TextBox ID="txtValue12" Label="报验日期" runat="server" LabelWidth="120px">
+                        </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow ColumnWidths="25% 25% 50%">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx.designer.cs
index 44cb0ede..910cebb4 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx.designer.cs
@@ -174,7 +174,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtValue12;
+        protected global::FineUIPro.TextBox txtValue12;
 
         /// <summary>
         /// txtValue13 控件。
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
index cdef23bb..495d92cd 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
@@ -30,8 +30,8 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人员报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="ApprovalTime"
-                    SortDirection="DESC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
+                    ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="RemarkCode"
+                    SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"   OnRowDataBound="Grid1_RowDataBound"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound">
                     <Toolbars>
@@ -135,7 +135,7 @@
         </f:Window>
         <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1000px" Height="600px">
+            Width="1200px" Height="600px">
         </f:Window>
         <f:Window ID="Window3" Title="编辑焊工资质信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" 
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx
index 26ce8a89..81f9696c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx
@@ -104,10 +104,10 @@
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" HeaderText="有效期" ColumnID="Value9" DataField="Value9" SortField="Value9"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" HeaderText="批准时间" ColumnID="Value10" DataField="Value10" SortField="Value10"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="80px" HeaderText="是否在场" ColumnID="Value11" DataField="Value11" SortField="Value11"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
@@ -116,7 +116,7 @@
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" HeaderText="离场时间" ColumnID="Value13" DataField="Value13" SortField="Value13"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Right">
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField>  
                         <f:RenderField Width="80px" HeaderText="备注" ColumnID="Value14" DataField="Value14" SortField="Value14"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs
index def376b1..d1fae42e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs
@@ -312,12 +312,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS)
         {
             var oldViewInfos = from x in Funs.DB.Comprehensive_InspectionPerson
-                               where x.ProjectId == this.CurrUser.LoginProjectId
+                               where x.ProjectId == LoginProjectId
                                select x;
 
             var units = from x in Funs.DB.Base_Unit
                         join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
-                        where y.ProjectId == this.CurrUser.LoginProjectId
+                        where y.ProjectId == LoginProjectId
                         select x;
 
             var cns = from x in Funs.DB.Base_CNProfessional select x;
@@ -437,7 +437,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         try
                         {
-                            Ins.ValidityDate = Convert.ToDateTime(tempData.Value9.Trim());
+                            Ins.ValidityDate = Funs.GetNewDateTime(tempData.Value9.Trim());
+                            if (Ins.ValidityDate == null)
+                            {
+                                errInfo += "有效期[" + tempData.Value9.Trim() + "]错误；";
+                            }
                         }
                         catch (Exception)
                         {
@@ -448,7 +452,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         try
                         {
-                            Ins.ApprovalTime = Convert.ToDateTime(tempData.Value10.Trim());
+                            Ins.ApprovalTime = Funs.GetNewDateTime(tempData.Value10.Trim());
+                            if (Ins.ApprovalTime == null)
+                            {
+                                errInfo += "批准时间[" + tempData.Value10.Trim() + "]错误；";
+                            }
                         }
                         catch (Exception)
                         {
@@ -481,7 +489,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         try
                         {
-                            Ins.DepartureTime = Convert.ToDateTime(tempData.Value13.Trim());
+                            Ins.DepartureTime = Funs.GetNewDateTime(tempData.Value13.Trim());
+                            if (Ins.DepartureTime == null)
+                            {
+                                errInfo += "离场时间[" + tempData.Value13.Trim() + "]错误；";
+                            }
                         }
                         catch (Exception)
                         {
@@ -514,7 +526,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         Ins.ProjectId = LoginProjectId;
                         var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.UnitId == Ins.UnitId
-                                             && x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value14));
+                                             && x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
                         if (isExitISOValue != null) ///已存在
                         {
                             Ins.InspectionPersonId = isExitISOValue.InspectionPersonId;
@@ -591,7 +603,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         tempData.ToopValue = errInfo;
                         BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(tempData);
                         erreMessage += errInfo + ";";
-
                     }
                 }
             }
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx
index c68db1ee..2c0fee3f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
@@ -50,10 +50,10 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DatePicker ID="txtValue9" Label="有效期" runat="server" LabelWidth="120px">
-                        </f:DatePicker>
-                       <f:DatePicker ID="txtValue10" Label="批准时间" runat="server" LabelWidth="120px">
-</f:DatePicker>
+                        <f:TextBox ID="txtValue9" Label="有效期" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue10" Label="批准时间" runat="server" LabelWidth="120px">
+                        </f:TextBox>
                         <f:TextBox ID="txtValue11" Label="是否在场" runat="server" LabelWidth="120px">
                         </f:TextBox>
                         <f:TextBox ID="txtValue12" Label="培训" runat="server" LabelWidth="120px">
@@ -62,13 +62,13 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DatePicker ID="txtValue13" Label="离场时间" runat="server" LabelWidth="120px">
-                        </f:DatePicker>
+                        <f:TextBox ID="txtValue13" Label="离场时间" runat="server" LabelWidth="120px">
+                        </f:TextBox>
                         <f:TextBox ID="txtValue14" Label="备注" runat="server" LabelWidth="120px">
-                        </f:TextBox>  
+                        </f:TextBox>
                         <f:TextBox ID="txtValue15" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
-                        </f:TextBox>            
-                        <f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>            
+                        </f:TextBox>
+                        <f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx.designer.cs
index a00b866b..aeb60e1e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx.designer.cs
@@ -147,7 +147,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtValue9;
+        protected global::FineUIPro.TextBox txtValue9;
 
         /// <summary>
         /// txtValue10 控件。
@@ -156,7 +156,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtValue10;
+        protected global::FineUIPro.TextBox txtValue10;
 
         /// <summary>
         /// txtValue11 控件。
@@ -183,7 +183,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtValue13;
+        protected global::FineUIPro.TextBox txtValue13;
 
         /// <summary>
         /// txtValue14 控件。