lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改焊工合格项目

This commit is contained in:
高飞 2022-11-30 15:03:09 +08:00
parent 037798f67e
commit 1321b305e5
4 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/BLL/BLL.csproj
View File

@ -153,7 +153,13 @@
<Reference Include="ThoughtWorks.QRCode">
<HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll</HintPath>
</Reference>
<Reference Include="ThoughtWorks.QRCode.Fakes">
<HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.Fakes.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="ZKWeb.System.Drawing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ZKWeb.System.Drawing.4.0.0\lib\net45\ZKWeb.System.Drawing.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="API\APIBaseInfoService.cs" />

32
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -99,9 +99,6 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@ -12219,6 +12216,35 @@
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
<VersionMinor>3</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>

26
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx
View File

@ -37,19 +37,19 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtWeldingMethod" runat="server" Label="焊接方法" LabelWidth="160px" Enabled="false"></f:TextBox>
<f:TextBox ID="txtMaterialType" runat="server" Label="型号、牌号、级别" LabelWidth="160px" Enabled="false"></f:TextBox>
<f:TextBox ID="txtWeldingMethod" runat="server" Label="焊接方法" LabelWidth="160px" ></f:TextBox>
<f:TextBox ID="txtMaterialType" runat="server" Label="型号、牌号、级别" LabelWidth="160px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtWeldingLocation" runat="server" Label="焊接位置" LabelWidth="160px" Enabled="false"></f:TextBox>
<f:TextBox ID="txtWeldType" runat="server" Label="可焊焊缝类型" LabelWidth="160px" Enabled="false"></f:TextBox>
<f:TextBox ID="txtWeldingLocation" runat="server" Label="焊接位置" LabelWidth="160px" ></f:TextBox>
<f:TextBox ID="txtWeldType" runat="server" Label="可焊焊缝类型" LabelWidth="160px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox ID="ckbIsCanWeldG" runat="server" Label="是否可焊安装口" LabelWidth="160px" Enabled="false"></f:CheckBox>
<f:CheckBox ID="ckbIsCanWeldG" runat="server" Label="是否可焊安装口" LabelWidth="160px" ></f:CheckBox>
<f:DropDownList ID="drpWeldingMode" runat="server" Label="机动化程度"
LabelAlign="Right">
</f:DropDownList>
@ -64,14 +64,14 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtThicknessMin" runat="server" Label="壁厚覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtThicknessMax" runat="server" Label="壁厚覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtThicknessMin" runat="server" Label="壁厚覆盖范围（最小值）" LabelWidth="200px" ></f:TextBox>
<f:TextBox ID="txtThicknessMax" runat="server" Label="壁厚覆盖范围（最大值）" LabelWidth="200px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSizesMin" runat="server" Label="管径覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtSizesMax" runat="server" Label="管径覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtSizesMin" runat="server" Label="管径覆盖范围（最小值）" LabelWidth="200px" ></f:TextBox>
<f:TextBox ID="txtSizesMax" runat="server" Label="管径覆盖范围（最大值）" LabelWidth="200px" ></f:TextBox>
</Items>
</f:FormRow>
</Rows>
@ -89,14 +89,14 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtThicknessMin2" runat="server" Label="壁厚覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtThicknessMax2" runat="server" Label="壁厚覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtThicknessMin2" runat="server" Label="壁厚覆盖范围（最小值）" LabelWidth="200px" ></f:TextBox>
<f:TextBox ID="txtThicknessMax2" runat="server" Label="壁厚覆盖范围（最大值）" LabelWidth="200px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSizesMin2" runat="server" Label="管径覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtSizesMax2" runat="server" Label="管径覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
<f:TextBox ID="txtSizesMin2" runat="server" Label="管径覆盖范围（最小值）" LabelWidth="200px" ></f:TextBox>
<f:TextBox ID="txtSizesMax2" runat="server" Label="管径覆盖范围（最大值）" LabelWidth="200px" ></f:TextBox>
</Items>
</f:FormRow>
</Rows>

17
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
View File

@ -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)