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:
李鹏飞
2023-03-14 16:07:07 +08:00
parent 0b936deed0 643ef1ceb8
commit a6909295b5
12 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/EditSportDataCheck.aspx
+1 -1
View File
@@ -49,7 +49,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" LabelWidth="110px" Label="项目名称" LabelAlign="Right"
MaxLength="50">
>
</f:TextBox>
<f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
MaxLength="50">
SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx
+1 -1
View File
@@ -49,7 +49,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" LabelWidth="110px" Label="项目名称" LabelAlign="Right"
MaxLength="50">
>
</f:TextBox>
<f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
MaxLength="50">
SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx
+1 -1
View File
@@ -44,7 +44,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
MaxLength="50">
>
</f:TextBox>
<f:TextBox ID="txtCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
MaxLength="50">
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
protected DataTable insklistData()
{
string strSql = @"SELECT ins.*,un.UnitName,u.PersonName as CompileManName,case ins.Type when '1' then '奖励' else '处罚' end as TypeStr,case ins.Type when '1' then rt.RewardCause else pt.PunishCause end as Cause,case ins.Type when '1' then rt.RewardDecision else pt.PunishDecision end as Decision"
string strSql = @"SELECT ins.*,un.UnitName,u.PersonName as CompileManName,case ins.Type when '1' then '奖励' else '处罚' end as TypeStr,case ins.Type when '1' then rt.RewardCause else pt.PunishCause end as Cause,ins.RewardAndPunishDecision as Decision"
+ @" FROM RewardAndPunish_RewardAndPunish ins"
+ @" left join Base_Unit un on un.UnitId = ins.UnitId"
+ @" left join Base_RewardType rt on rt.RewardTypeId = ins.RewardAndPunishTypeId"
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx
+1 -1
View File
@@ -64,7 +64,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRewardAndPunishDecision" runat="server" Label="奖罚决定" ShowRedStar="true" Required="true" Readonly="true"
<f:TextBox ID="txtRewardAndPunishDecision" runat="server" Label="奖罚决定" ShowRedStar="true" Required="true"
MaxLength="200" LabelWidth="100px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx.cs
+5
View File
@@ -80,6 +80,10 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
drpRewardAndPunishType.SelectedValue = RewardAndPunish.RewardAndPunishTypeId;
drpRewardAndPunishType_SelectedIndexChanged(null, null);
}
if (!string.IsNullOrEmpty(RewardAndPunish.RewardAndPunishDecision))
{
this.txtRewardAndPunishDecision.Text = RewardAndPunish.RewardAndPunishDecision;
}
gvApprove.DataSource = BLL.RewardAndPunishApproveService.getListData(this.RewardAndPunishId);
gvApprove.DataBind();
if (!string.IsNullOrEmpty(RewardAndPunish.State))
@@ -295,6 +299,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
RewardAndPunish.Type = this.rblType.SelectedValue;
RewardAndPunish.RewardAndPunishTypeId = this.drpRewardAndPunishType.SelectedValue;
RewardAndPunish.RewardAndPunishBasis = this.txtRewardAndPunishBasis.Text.Trim();
RewardAndPunish.RewardAndPunishDecision = this.txtRewardAndPunishDecision.Text.Trim();
if (saveType == "submit")
{
RewardAndPunish.State = this.drpHandleType.SelectedValue;
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishView.aspx.cs
+4
View File
@@ -76,6 +76,10 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
drpRewardAndPunishType.SelectedValue = RewardAndPunish.RewardAndPunishTypeId;
drpRewardAndPunishType_SelectedIndexChanged(null, null);
}
if (!string.IsNullOrEmpty(RewardAndPunish.RewardAndPunishDecision))
{
this.txtRewardAndPunishDecision.Text = RewardAndPunish.RewardAndPunishDecision;
}
gvApprove.DataSource = BLL.RewardAndPunishApproveService.getListData(this.RewardAndPunishId);
gvApprove.DataBind();
}
SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx
+1 -1
View File
@@ -45,7 +45,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
MaxLength="50">
>
</f:TextBox>
<f:TextBox ID="txtCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
MaxLength="50">