lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
夏菊 2025-07-17 14:22:57 +08:00
parent 9fd7ab5407 fa795065b6
commit 8feab6e0f2
8 changed files with 191 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
View File

@ -80,7 +80,15 @@
<f:DropDownList ID="drpProposeUnit" ShowRedStar="true" EmptyText="--请选择--" AutoSelectFirstItem="false"
LabelWidth="120px" Required="true" runat="server" Label="提出单位" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:Label runat="server" Hidden="true"></f:Label>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="110px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow>

28
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx.cs
View File

@ -128,6 +128,7 @@ namespace FineUIPro.Web.CQMS.Check
{
State = BLL.Const.JointCheck_Compile;
}
this.hdAttachUrl.Text = this.JointCheckId;
jointCheckDetails.Clear();
BindData();
}
@ -528,7 +529,16 @@ namespace FineUIPro.Web.CQMS.Check
}
else
{
jointCheck.JointCheckId = SQLHelper.GetNewID(typeof(Model.Check_JointCheck)); ;
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
jointCheck.JointCheckId = this.hdAttachUrl.Text;
}
else
{
jointCheck.JointCheckId = SQLHelper.GetNewID(typeof(Model.Check_JointCheck));
this.hdAttachUrl.Text = jointCheck.JointCheckId;
}
// jointCheck.JointCheckId = SQLHelper.GetNewID(typeof(Model.Check_JointCheck));
jointCheck.CheckMan = CurrUser.UserId;
JointCheckService.AddJointCheck(jointCheck);
if (saveType == "submit")
@ -825,5 +835,21 @@ namespace FineUIPro.Web.CQMS.Check
}
return str;
}
#region 附件上传
/// <summary>
/// 附件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录
{
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Check_JointCheck));
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/JointCheck&menuId={1}&edit=1", this.hdAttachUrl.Text, BLL.Const.JointCheckMenuId)));
}
#endregion
}
}

33
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Check {
namespace FineUIPro.Web.CQMS.Check
{
public partial class EditJointCheck {
public partial class EditJointCheck
{
/// <summary>
/// form1 控件。
@ -120,6 +122,33 @@ namespace FineUIPro.Web.CQMS.Check {
/// </remarks>
protected global::FineUIPro.DropDownList drpProposeUnit;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// drpJointCheckMans1 控件。
/// </summary>

10
SGGL/FineUIPro.Web/CQMS/Check/JointCheckView.aspx
View File

@ -96,7 +96,15 @@
<f:TextBox ID="drpProposeUnit" LabelWidth="120" runat="server" Label="提出单位" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<f:Label runat="server" Hidden="true"></f:Label>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label" runat="server" Label="上传附件"
LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow>

5
SGGL/FineUIPro.Web/CQMS/Check/JointCheckView.aspx.cs
View File

@ -172,5 +172,10 @@ namespace FineUIPro.Web.CQMS.Check
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/JointCheck&menuId={1}&edit=1", itemId, BLL.Const.JointCheckMenuId)));
}
}
protected void btnAttach_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/JointCheck&menuId={1}&edit=1", this.JointCheckId, BLL.Const.JointCheckMenuId)));
}
}
}

33
SGGL/FineUIPro.Web/CQMS/Check/JointCheckView.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Check {
namespace FineUIPro.Web.CQMS.Check
{
public partial class JointCheckView {
public partial class JointCheckView
{
/// <summary>
/// form1 控件。
@ -120,6 +122,33 @@ namespace FineUIPro.Web.CQMS.Check {
/// </remarks>
protected global::FineUIPro.TextBox drpProposeUnit;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// txtJointCheckMans1 控件。
/// </summary>

2
SGGL/FineUIPro.Web/ZHDD/ZHDD.aspx.cs
View File

@ -36,7 +36,7 @@ namespace FineUIPro.Web.ZHDD
var j2 = JsonConvert.DeserializeObject<dynamic>(res2);
string session_id = j2.session_id;
string token = j2.token;
ifZHDD.Src = "https://aqm.cwcec.com/login/#token=" + session_id+"&user_name=" + username + "target=home";
ifZHDD.Src = "https://aqm.cwcec.com/login/#token=" + session_id+"&user_name=" + username + "&=home";
}
}

2
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -15,7 +15,7 @@
<link href="~/res/index/css/index.css" rel="stylesheet" />
<link href="~/res/index/css/home.css" rel="stylesheet" />
<link rel="stylesheet" href="~/res/css/swiper.min.css">
<script src="~/res/lib/flex.js"></script>
<%--<script src="~/res/lib/flex.js"></script>--%>
<script src="~/res/lib/jquery.js"></script>
<script src="~/res/lib/china.js"></script>
<script src="~/res/lib/echarts.min.js"></script>