合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -1,6 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CompletionReportEdit.aspx.cs" ValidateRequest="false" Inherits="FineUIPro.Web.HSSE.Manager.CompletionReportEdit" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -20,31 +19,31 @@
<f:TextBox ID="txtCompletionReportCode" runat="server" Label="编号" LabelAlign="Right" Readonly="true" LabelWidth="90px"
MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtCompletionReportName" runat="server" Label="名称" Required="true" ShowRedStar="true" LabelWidth="90px"
<f:TextBox ID="txtCompletionReportName" runat="server" Label="文件名称" Required="true" ShowRedStar="true" LabelWidth="90px"
LabelAlign="Right" MaxLength="50">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" LabelWidth="90px">
</f:DropDownList>
<f:DatePicker ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right" LabelWidth="90px"
EnableEdit="true">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label="完工报告内容" ID="txtFileContent" ShowLabel="false" Editor="UMEditor"
BasePath="~/res/umeditor/" ToolbarSet="Full" Height="220" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="90px" Height="120px" >
</f:TextArea>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@@ -59,9 +58,7 @@
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" ToolTip="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>