20240401 质量月报导出

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx

@@ -837,7 +837,6 @@
                         </Rows>
                     </f:Form>
                 </Items>
-<<<<<<< HEAD
                 <Toolbars>
                     <f:Toolbar ID="Toolbar4" Position="bottom" ToolbarAlign="left" runat="server">
                         <Items>
@@ -848,15 +847,10 @@
                 </Toolbars>
                 <Items>
                     <f:Form ID="Form19" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" Hidden="true">
-=======
-                 
-                <Items>
-                     <f:Form ID="Form19" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
->>>>>>> 0ae4143492852fa438a0c21d967acf7271ee604e
                         <Rows>
                             <f:FormRow>
                                 <Items>
-                                    <f:TextArea runat="server" ID="txtAre8" EmptyText="请填写备注" Text=""
+                                    <f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
                                         AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
                                     </f:TextArea>
                                 </Items>
@@ -1458,8 +1452,6 @@
                                         </Columns>
                                     </f:Grid>
                                 </Items>
-
-                                 
                             </f:FormRow>
                             <f:FormRow>
                                 <Items>
@@ -1469,17 +1461,6 @@
                         </Rows>
                     </f:Form>
                 </Items>
-                <Items>
-                                     <f:Form ID="Form26" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
-                                        <Rows>
-                                            <f:FormRow>
-                                                <Items>
-                                                   <f:Label runat="server" Text="备注：质量巡检指工程师现场质量巡检情况。"></f:Label>
-                                                </Items>
-                                            </f:FormRow>
-                                        </Rows>
-                                    </f:Form>
-                                </Items>
             </f:Panel>
 
             <%--16.质量专项检查情况--%>

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />