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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2022-12-07 17:16:46 +08:00
parent 97896322f6 09f094c34c
commit efe036aaff
23 changed files with 714 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx
+13 -13
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>
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
+17
View File
@@ -67,6 +67,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);
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx
-3
View File
@@ -216,9 +216,6 @@
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top"
runat="server" Text="删除">
</f:MenuButton>
<f:MenuButton ID="btnView" OnClick="btnView_Click" Icon="Find" EnablePostBack="true"
runat="server" Text="查看">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
Model.SitePerson_Person welder = BLL.SitePerson_PersonService.GetSitePersonById(this.tvControlItem.SelectedNodeID);
Model.SitePerson_Person welder = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID);
if (welder != null)
{
this.btnEdit.Hidden = false;
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.designer.cs
Generated
-9
View File
@@ -308,14 +308,5 @@ namespace FineUIPro.Web.HJGL.PersonManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
/// <summary>
/// btnView 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnView;
}
}
SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs
+13 -12
View File
@@ -225,6 +225,11 @@ namespace FineUIPro.Web.HJGL.WPQ
Alert.ShowInTop("焊丝、焊条不能同时为空！", MessageBoxIcon.Warning);
return;
}
if (this.rblIsAgree.SelectedValue == "false" && (this.drpPerson.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpPerson.SelectedValue)))
{
Alert.ShowInTop("请选择办理人！", MessageBoxIcon.Warning);
return;
}
string id = SaveData(BLL.Const.BtnSubmit);
ShowNotify("提交成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -352,7 +357,7 @@ namespace FineUIPro.Web.HJGL.WPQ
{
string newId = SQLHelper.GetNewID(typeof(Model.WPQ_WPQList));
wpq.WPQId = newId;
wpq.CompileMan = this.CurrUser.PersonId;
if (type == BLL.Const.BtnSubmit)
{
if (this.drpPerson.SelectedValue == BLL.Const._Null)
@@ -506,18 +511,14 @@ namespace FineUIPro.Web.HJGL.WPQ
Model.WPQ_WPQList wpq = BLL.WPQListServiceService.GetWPQById(WPQId);
if (wpq != null)
{
Model.WPQ_WPQListFlowOperate flowOperate = Funs.DB.WPQ_WPQListFlowOperate.FirstOrDefault(x => x.WPQId == WPQId && x.OperateName == "施工单位编制");
if (flowOperate != null)
Model.Person_Persons user = BLL.Person_PersonsService.GetPerson_PersonsById(wpq.CompileMan);
if (user != null)
{
Model.Person_Persons user = BLL.Person_PersonsService.GetPerson_PersonsById(flowOperate.OperateManId);
if (user != null)
{
ListItem[] list = new ListItem[1];
list[0] = new ListItem(user.PersonName ?? "", user.PersonId.ToString());
drpPerson.DataSource = list;
drpPerson.DataBind();
drpPerson.SelectedValue = user.PersonId;
}
ListItem[] list = new ListItem[1];
list[0] = new ListItem(user.PersonName ?? "", user.PersonId.ToString());
drpPerson.DataSource = list;
drpPerson.DataBind();
drpPerson.SelectedValue = user.PersonId;
}
}
}