提交代码

2023-10-18 11:27:20 +08:00
parent 16638e5e5e
commit 96b329b814
9 changed files with 152 additions and 9 deletions
@@ -51,7 +51,7 @@
                                <f:RadioItem Text="待提交" Value="0" />
                                <f:RadioItem Text="待整改" Value="1" />
                                <f:RadioItem Text="待确认" Value="2" />
-                                  <f:RadioItem Text="已确认" Value="3" />
+                                  <f:RadioItem Text="已关闭" Value="3" />
                            </f:RadioButtonList>
                            <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
                             <f:RadioButtonList runat="server" ID="rbType" Width="180px" AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.HSSE.Check
        {
            string strSql = @"SELECT CheckSpecial.CheckSpecialId,CodeRecords.Code AS CheckSpecialCode,"
                          + @" CheckItemSet.CheckItemName,CheckSpecial.CheckTime,(CASE WHEN CheckSpecial.CheckType ='1' THEN '联合检查' ELSE '专项检查' END) AS CheckTypeName"
-                          + @" ,(CASE WHEN CheckSpecial.States='2' THEN '待确认' WHEN CheckSpecial.States='3' THEN '已确认' WHEN CheckSpecial.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName"
+                          + @" ,(CASE WHEN CheckSpecial.States='2' THEN '待确认' WHEN CheckSpecial.States='3' THEN '已关闭' WHEN CheckSpecial.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName"
                          + @" FROM Check_CheckSpecial AS CheckSpecial "
                          + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON CheckSpecial.CheckSpecialId=CodeRecords.DataId "
                          + @" LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId = CheckSpecial.CheckItemSetId where 1=1";
@@ -100,9 +100,14 @@
            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                <Items>
                    <f:Label runat="server" ID="lbTemp"></f:Label>
-                     <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" OnClick="btnAttachUrl_Click"
+                     <f:Button ID="btnAttachUrl" Text="整改前照片" ToolTip="附件上传及查看" Icon="TableCell" runat="server" OnClick="btnAttachUrl_Click"
                        ValidateForms="SimpleForm1">
                    </f:Button>
+
+                     <f:Button ID="btnAttachUrl2" Text="整改后照片" ToolTip="附件上传及查看" Icon="TableCell" runat="server" OnClick="btnAttachUrl_Click2"
+                        ValidateForms="SimpleForm1">
+                    </f:Button>
+
                    <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
                    </f:Button>
@@ -90,6 +90,19 @@ namespace FineUIPro.Web.HSSE.Check
                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckSpecial&menuId={1}&type=-1", this.CheckSpecialId, BLL.Const.ProjectCheckSpecialMenuId)));
            }
        }
+
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click2(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.CheckSpecialId))
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckSpecial&menuId={1}&type=-1", this.CheckSpecialId+"zgh", BLL.Const.ProjectCheckSpecialMenuId)));
+            }
+        }
        #endregion

        /// <summary>
@@ -158,6 +158,15 @@ namespace FineUIPro.Web.HSSE.Check
        /// </remarks>
        protected global::FineUIPro.Button btnAttachUrl;

+        /// <summary>
+        /// btnAttachUrl2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl2;
+
        /// <summary>
        /// ToolbarFill1 控件。
        /// </summary>