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

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2025-05-08 18:39:01 +08:00
parent 3a36b8e3ef fb75ac6652
commit 96139ddfb8
5 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SGGL/BLL/DropListService.cs
View File

@ -465,11 +465,11 @@ namespace BLL
public static ListItem[] GetBidType() public static ListItem[] GetBidType()
{ {
ListItem[] list = new ListItem[5]; ListItem[] list = new ListItem[5];
list[0] = new ListItem("公开招标", "公开招标"); list[0] = new ListItem("招标", "公开招标");
list[1] = new ListItem("邀请招标", "邀请招标"); list[1] = new ListItem("谈判", "邀请招标");
list[2] = new ListItem("询比价 ", "询比价"); list[2] = new ListItem("询比 ", "询比价");
list[3] = new ListItem("竞争性谈判", "竞争性谈判"); list[3] = new ListItem("竞价", "竞争性谈判");
list[4] = new ListItem("单一来源", "单一来源"); list[4] = new ListItem("直接分包", "单一来源");
return list; return list;
} }

4
SGGL/BLL/PHTGL/BiddingManagement/ActionPlanFormationService.cs
View File

@ -205,8 +205,8 @@ namespace BLL
/// <param name="isShowPlease">是否显示请选择</param> /// <param name="isShowPlease">是否显示请选择</param>
public static void InitGetBidTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) public static void InitGetBidTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{ {
dropName.DataValueField = "Text"; dropName.DataValueField = "Value";
dropName.DataTextField = "Value"; dropName.DataTextField = "Text";
dropName.DataSource = BLL.DropListService.GetBidType(); dropName.DataSource = BLL.DropListService.GetBidType();
dropName.DataBind(); dropName.DataBind();
if (isShowPlease) if (isShowPlease)

4
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormation.aspx
View File

@ -74,10 +74,10 @@
<f:RenderField ColumnID="State" DataField="State" Width="120px" FieldType="String" HeaderText="状态" TextAlign="Center" <f:RenderField ColumnID="State" DataField="State" Width="120px" FieldType="String" HeaderText="状态" TextAlign="Center"
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="BidProject" DataField="BidProject" Width="200px" FieldType="String" HeaderText="招标工程" TextAlign="Center" <f:RenderField ColumnID="BidProject" DataField="BidProject" Width="200px" FieldType="String" HeaderText="分包工程" TextAlign="Center"
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="BidType" DataField="BidType" Width="120px" FieldType="String" HeaderText="招标方式" TextAlign="Center" <f:RenderField ColumnID="BidType" DataField="BidType" Width="120px" FieldType="String" HeaderText="分包方式" TextAlign="Center"
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="PriceType" DataField="PriceType" Width="180px" FieldType="String" HeaderText="计价方式" TextAlign="Center" <f:RenderField ColumnID="PriceType" DataField="PriceType" Width="180px" FieldType="String" HeaderText="计价方式" TextAlign="Center"

14
SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
View File

@ -1248,7 +1248,12 @@ namespace FineUIPro.Web.ZHGL.Environmental
newItem.ArchitectureReportId = report.ArchitectureReportId; newItem.ArchitectureReportId = report.ArchitectureReportId;
newItem.BaseNumber = System.Web.HttpUtility.HtmlDecode(item.BaseNumber); newItem.BaseNumber = System.Web.HttpUtility.HtmlDecode(item.BaseNumber);
newItem.SortIndex = System.Web.HttpUtility.HtmlDecode(item.SortIndex); newItem.SortIndex = System.Web.HttpUtility.HtmlDecode(item.SortIndex);
newItem.LastYearValue = System.Web.HttpUtility.HtmlDecode(item.LastYearValue); string str = item.LastYearValue;
if (str == "6E-05")
{
str = "0.00006";
}
newItem.LastYearValue = System.Web.HttpUtility.HtmlDecode(str);
newItem.ThisYearValue = System.Web.HttpUtility.HtmlDecode(item.ThisYearValue); newItem.ThisYearValue = System.Web.HttpUtility.HtmlDecode(item.ThisYearValue);
newItem.Rate = System.Web.HttpUtility.HtmlDecode(item.Rate); newItem.Rate = System.Web.HttpUtility.HtmlDecode(item.Rate);
ArchitectureReportItemService.AddArchitectureReportItem(newItem); ArchitectureReportItemService.AddArchitectureReportItem(newItem);
@ -1331,7 +1336,12 @@ namespace FineUIPro.Web.ZHGL.Environmental
{ {
try try
{ {
decimal d = Convert.ToDecimal(values.Value<string>("LastYearValue")); string str = values.Value<string>("LastYearValue");
if (str == "6E-05")
{
str = "0.00006";
}
decimal d = Convert.ToDecimal(str);
} }
catch (Exception) catch (Exception)
{ {

2
SGGL/Model/Model.csproj
View File

@ -29,7 +29,7 @@
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>5</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Debug\Model.xml</DocumentationFile> <DocumentationFile>bin\Debug\Model.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>