修改质量奖罚

SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs

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

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

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

@@ -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();
                 }