This commit is contained in:
parent
1e227cb3e6
commit
12becd3734
|
|
@ -20037,7 +20037,7 @@
|
|||
<WCFMetadata Include="Service References\" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||
|
|
|
|||
|
|
@ -7,25 +7,24 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>安全环境预算</title>
|
||||
<style type="text/css">
|
||||
.labcenter
|
||||
{
|
||||
.labcenter {
|
||||
text-align: center;
|
||||
}
|
||||
.LabelColor
|
||||
{
|
||||
|
||||
.LabelColor {
|
||||
color: Red;
|
||||
font-size:small;
|
||||
font-size: small;
|
||||
}
|
||||
.f-grid-row.Yellow
|
||||
{
|
||||
|
||||
.f-grid-row.Yellow {
|
||||
background-color: Yellow;
|
||||
}
|
||||
.f-grid-row.Green
|
||||
{
|
||||
|
||||
.f-grid-row.Green {
|
||||
background-color: LightGreen;
|
||||
}
|
||||
.f-grid-row.Red
|
||||
{
|
||||
|
||||
.f-grid-row.Red {
|
||||
background-color: Red;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -48,7 +47,6 @@
|
|||
<f:DropDownList ID="drpYear" runat="server" Label="年度" AutoPostBack="true"
|
||||
OnSelectedIndexChanged="drpYear_SelectedIndexChanged" Width="180px"
|
||||
EnableEdit="true" ShowLabel="true" LabelWidth="50px">
|
||||
|
||||
</f:DropDownList>
|
||||
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="日期" ID="txtStartTime"
|
||||
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="150px" LabelWidth="50px">
|
||||
|
|
@ -56,17 +54,12 @@
|
|||
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="至" ID="txtEndTime"
|
||||
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="140px" LabelWidth="30px">
|
||||
</f:DatePicker>
|
||||
|
||||
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1"
|
||||
>
|
||||
<f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Hidden="true">
|
||||
</f:Button>
|
||||
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
|
||||
Hidden="true">
|
||||
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Hidden="true">
|
||||
</f:Button>
|
||||
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
|
|
@ -156,10 +149,10 @@
|
|||
|
||||
function onGridDataLoad(event) {
|
||||
this.mergeColumns(['Subject1', 'Subject2', 'Subject3', 'Subject4', 'Subject5'], { depends: true });
|
||||
// this.mergeColumns(['Subject1']);
|
||||
// this.mergeColumns(['CheckPersonName']);
|
||||
// this.mergeColumns(['CheckTime']);
|
||||
// this.mergeColumns(['FlowOperateName']);
|
||||
// this.mergeColumns(['Subject1']);
|
||||
// this.mergeColumns(['CheckPersonName']);
|
||||
// this.mergeColumns(['CheckTime']);
|
||||
// this.mergeColumns(['FlowOperateName']);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Reference in New Issue