lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改项目策划和总包合同导出问题

This commit is contained in:
高飞 2023-07-19 14:33:51 +08:00
parent a927236069
commit 500cb73a84
5 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -75,6 +75,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="FastReport, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
@ -95,8 +98,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Interop.WIA, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@ -113,17 +116,17 @@
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI">
<HintPath>..\FineUIPro\Reference BLL\NPOI.dll</HintPath>
<Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
</Reference>
<Reference Include="NPOI.OOXML">
<HintPath>..\FineUIPro\Reference BLL\NPOI.OOXML.dll</HintPath>
<Reference Include="NPOI.OOXML, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OOXML.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXml4Net">
<HintPath>..\FineUIPro\Reference BLL\NPOI.OpenXml4Net.dll</HintPath>
<Reference Include="NPOI.OpenXml4Net, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXmlFormats">
<HintPath>..\FineUIPro\Reference BLL\NPOI.OpenXmlFormats.dll</HintPath>
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>

10
SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx
View File

@ -72,19 +72,19 @@
FieldType="String" HeaderText="项目类型" HeaderTextAlign="Center" TextAlign="Left"
RendererFunction="renderProjectType">
</f:RenderField>
<f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
<f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件" ColumnID="Actions"
Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="MainContractId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/MainContractAttachUrl&menuId=CBC47C8B-141C-446B-90D9-CE8F5AE66CE4"
HeaderTextAlign="Center" />
<f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="tfCompileMan" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.MainContractService.ConvertState(Eval("States")) %>'></asp:Label>
<asp:Label ID="lblCompileMan" runat="server" Text='<%# BLL.MainContractService.ConvertState(Eval("States")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ApproveMan" Width="60px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="tfTeamType" Width="60px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertApproveMan(Eval("MainContractId")) %>'></asp:Label>
<asp:Label ID="lbTeamType" runat="server" Text='<%# ConvertApproveMan(Eval("MainContractId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>

8
SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx.designer.cs generated
View File

@ -130,22 +130,22 @@ namespace FineUIPro.Web.ZHGL.Plan {
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// Label1 控件。
/// lblCompileMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
protected global::System.Web.UI.WebControls.Label lblCompileMan;
/// <summary>
/// Label2 控件。
/// lbTeamType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
protected global::System.Web.UI.WebControls.Label lbTeamType;
/// <summary>
/// ToolbarSeparator1 控件。

10
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlan.aspx
View File

@ -72,19 +72,19 @@
FieldType="String" HeaderText="项目类型" HeaderTextAlign="Center" TextAlign="Left"
RendererFunction="renderProjectType">
</f:RenderField>
<f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
<f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件" ColumnID="Actions"
Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ProjectPlanId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/ProjectPlanAttachUrl&menuId=CBC47C8B-141C-446B-90D9-CE8F5AE66CE4"
HeaderTextAlign="Center" />
<f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="tfCompileMan" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.ProjectPlanService.ConvertState(Eval("States")) %>'></asp:Label>
<asp:Label ID="lblCompileMan" runat="server" Text='<%# BLL.ProjectPlanService.ConvertState(Eval("States")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ApproveMan" Width="60px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="tfTeamType" Width="60px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertApproveMan(Eval("ProjectPlanId")) %>'></asp:Label>
<asp:Label ID="lbTeamType" runat="server" Text='<%# ConvertApproveMan(Eval("ProjectPlanId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>

8
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlan.aspx.designer.cs generated
View File

@ -130,22 +130,22 @@ namespace FineUIPro.Web.ZHGL.Plan {
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// Label1 控件。
/// lblCompileMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
protected global::System.Web.UI.WebControls.Label lblCompileMan;
/// <summary>
/// Label2 控件。
/// lbTeamType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
protected global::System.Web.UI.WebControls.Label lbTeamType;
/// <summary>
/// ToolbarSeparator1 控件。