shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

12121

This commit is contained in:
jackchenyang 2024-05-12 15:49:21 +08:00
parent 1a73dfd0a6
commit 48a84cfd6c
6 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

10
HJGL/FineUIPro.Web/HotProcessHard/HotProessTrustEdit.aspx.designer.cs generated
View File

@ -2,15 +2,17 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，这些更改将会丢失。 // 重新生成代码，则所做更改将丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HotProcessHard { namespace FineUIPro.Web.HotProcessHard
{
public partial class HotProessTrustEdit { public partial class HotProessTrustEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。

4
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
View File

@ -38,7 +38,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
<f:HiddenField runat="server" ID="Id"> <f:HiddenField runat="server" ID="hdPMIDelegationId">
</f:HiddenField> </f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
@ -180,7 +180,7 @@
</Items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="Window2" Title="<%$ Resources:Lan,PopForm %>" Hidden="true" EnableIFrame="true" <f:Window ID="Window2" Title="<%$ Resources:Lan,PopForm %>" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" EnableMaximize="true" Target="Parent" EnableResize="true" runat="server" OnClose="Window2_Close"
IsModal="true" Width="1090px" Height="660px"> IsModal="true" Width="1090px" Height="660px">
</f:Window> </f:Window>

12
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
View File

@ -280,8 +280,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnAdd)) if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnAdd))
{ {
this.SetTextTemp(); this.SetTextTemp();
string window = String.Format("PMIDelegationEdit.aspx", string.Empty, "新增 - ") ; string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", string.Empty, "新增 - ") ;
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.PMIDelegationId) PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hdPMIDelegationId.ClientID)
+ Window2.GetShowReference(window)); + Window2.GetShowReference(window));
} }
else else
@ -303,9 +303,9 @@ namespace FineUIPro.Web.WeldingProcess.PMI
var trustManage = Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId); var trustManage = Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId);
if (trustManage != null) if (trustManage != null)
{ {
string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", this.PMIDelegationId, "编辑 - "); string openUrl = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", this.PMIDelegationId, "编辑 - ");
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.PMIDelegationId) PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hdPMIDelegationId.ClientID)
+ Window2.GetShowReference(window)); + Window2.GetShowReference(openUrl));
} }
else else
{ {
@ -363,7 +363,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e) protected void Window2_Close(object sender, WindowCloseEventArgs e)
{ {
this.InitTreeMenu(); this.InitTreeMenu();
this.BindGrid(); this.BindGrid();

4
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs generated
View File

@ -96,13 +96,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
protected global::FineUIPro.Toolbar Toolbar2; protected global::FineUIPro.Toolbar Toolbar2;
/// <summary> /// <summary>
/// Id 控件。 /// hdPMIDelegationId 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.HiddenField Id; protected global::FineUIPro.HiddenField hdPMIDelegationId;
/// <summary> /// <summary>
/// ToolbarFill1 控件。 /// ToolbarFill1 控件。

2
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
View File

@ -43,7 +43,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
this.PMIDelegationId = Request.Params["PMIDelegationId"]; this.PMIDelegationId = Request.QueryString["PMIDelegationId"];
BLL.Project_InstallationService.InitInstallationDropDownList(this.drpInstallationId, true, this.CurrUser.LoginProjectId, Resources.Lan.PleaseSelect);//装置 BLL.Project_InstallationService.InitInstallationDropDownList(this.drpInstallationId, true, this.CurrUser.LoginProjectId, Resources.Lan.PleaseSelect);//装置
BLL.Base_UnitService.InitUnitDropDownList(this.drpUnitId, true, BLL.Const.UnitType_5, Resources.Lan.PleaseSelect);//单位 BLL.Base_UnitService.InitUnitDropDownList(this.drpUnitId, true, BLL.Const.UnitType_5, Resources.Lan.PleaseSelect);//单位