lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240401 质量月报导出

This commit is contained in:
毕文静 2024-04-01 09:14:40 +08:00
parent f2e1e51281
commit 76a9c48dd1
3 changed files with 2 additions and 1461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
View File

@ -837,7 +837,6 @@
</Rows> </Rows>
</f:Form> </f:Form>
</Items> </Items>
<<<<<<< HEAD
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar4" Position="bottom" ToolbarAlign="left" runat="server"> <f:Toolbar ID="Toolbar4" Position="bottom" ToolbarAlign="left" runat="server">
<Items> <Items>
@ -848,15 +847,10 @@
</Toolbars> </Toolbars>
<Items> <Items>
<f:Form ID="Form19" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" Hidden="true"> <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> <Rows>
<f:FormRow> <f:FormRow>
<Items> <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"> AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
</f:TextArea> </f:TextArea>
</Items> </Items>
@ -1458,8 +1452,6 @@
</Columns> </Columns>
</f:Grid> </f:Grid>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
@ -1469,17 +1461,6 @@
</Rows> </Rows>
</f:Form> </f:Form>
</Items> </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> </f:Panel>
<%--16.质量专项检查情况--%> <%--16.质量专项检查情况--%>

1440
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
SGGL/WebAPI/WebAPI.csproj.user
View File

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