diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index ad2e916c..dd111259 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -153,7 +153,13 @@ ..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll + + ..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.Fakes.dll + + + ..\packages\ZKWeb.System.Drawing.4.0.0\lib\net45\ZKWeb.System.Drawing.dll + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index e9884f10..a03ae3e3 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -99,9 +99,6 @@ ..\FineUIPro\Reference BLL\Interop.WIA.dll - - False - False @@ -12219,6 +12216,35 @@ + + + {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} + 2 + 4 + 0 + primary + False + True + + + {00020905-0000-0000-C000-000000000046} + 8 + 4 + 0 + primary + False + True + + + {0002E157-0000-0000-C000-000000000046} + 5 + 3 + 0 + primary + False + True + + diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx index 2a453bc0..714b9e94 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx @@ -37,19 +37,19 @@ - - + + - - + + - + @@ -64,14 +64,14 @@ - - + + - - + + @@ -89,14 +89,14 @@ - - + + - - + + diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs index 1c089ee6..68f28bea 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs @@ -68,6 +68,23 @@ namespace FineUIPro.Web.HJGL.PersonManage this.drpWeldingMode.SelectedValue = welderQualify.WelderMode; } } + if (welderQualify.IsAudit == true) + { + this.txtQualificationItem.Enabled = false; + this.txtWeldingMethod.Enabled = false; + this.txtMaterialType.Enabled = false; + this.txtWeldingLocation.Enabled = false; + this.txtWeldType.Enabled = false; + this.ckbIsCanWeldG.Enabled = false; + this.txtThicknessMin.Enabled = false; + this.txtThicknessMax.Enabled = false; + this.txtSizesMin.Enabled = false; + this.txtSizesMax.Enabled = false; + this.txtThicknessMin2.Enabled = false; + this.txtThicknessMax2.Enabled = false; + this.txtSizesMin2.Enabled = false; + this.txtSizesMax2.Enabled = false; + } } var w = BLL.SitePerson_PersonService.GetSitePersonById(this.hdWelderId.Text); if (w != null)