合并最新

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="CompletionReportView.aspx.cs" ValidateRequest="false" Inherits="FineUIPro.Web.HSSE.Manager.CompletionReportView" %>
-<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
-    TagPrefix="uc1" %>
+ 
 <!DOCTYPE html>

 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -21,6 +20,11 @@
                    </f:TextBox>
                    <f:TextBox ID="txtCompletionReportName" runat="server" Label="名称" LabelWidth="90px" LabelAlign="Right" Readonly="true">
                    </f:TextBox>
+                   
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
                    <f:TextBox ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" Readonly="true" LabelWidth="90px">
                    </f:TextBox>
                    <f:TextBox ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right" LabelWidth="90px"
@@ -30,19 +34,12 @@
            </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 runat="server" Label="备注" ID="txtRemark"  LabelAlign="Right" LabelWidth="90px" Height="120px"
+                        Readonly="true">
+                    </f:TextArea>
                </Items>
            </f:FormRow>
+             
        </Rows>
        <Toolbars>
            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">