diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs
index 2717abb6..0fcfc585 100644
--- a/SGGL/BLL/DropListService.cs
+++ b/SGGL/BLL/DropListService.cs
@@ -465,11 +465,11 @@ namespace BLL
public static ListItem[] GetBidType()
{
ListItem[] list = new ListItem[5];
- list[0] = new ListItem("公开招标", "公开招标");
- list[1] = new ListItem("邀请招标", "邀请招标");
- list[2] = new ListItem("询比价 ", "询比价");
- list[3] = new ListItem("竞争性谈判", "竞争性谈判");
- list[4] = new ListItem("单一来源", "单一来源");
+ list[0] = new ListItem("招标", "公开招标");
+ list[1] = new ListItem("谈判", "邀请招标");
+ list[2] = new ListItem("询比 ", "询比价");
+ list[3] = new ListItem("竞价", "竞争性谈判");
+ list[4] = new ListItem("直接分包", "单一来源");
return list;
}
diff --git a/SGGL/BLL/PHTGL/BiddingManagement/ActionPlanFormationService.cs b/SGGL/BLL/PHTGL/BiddingManagement/ActionPlanFormationService.cs
index 1a0b5602..18a35f6b 100644
--- a/SGGL/BLL/PHTGL/BiddingManagement/ActionPlanFormationService.cs
+++ b/SGGL/BLL/PHTGL/BiddingManagement/ActionPlanFormationService.cs
@@ -205,8 +205,8 @@ namespace BLL
/// 是否显示请选择
public static void InitGetBidTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
- dropName.DataValueField = "Text";
- dropName.DataTextField = "Value";
+ dropName.DataValueField = "Value";
+ dropName.DataTextField = "Text";
dropName.DataSource = BLL.DropListService.GetBidType();
dropName.DataBind();
if (isShowPlease)
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormation.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormation.aspx
index a8ccbfd7..83c6e59a 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormation.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormation.aspx
@@ -74,10 +74,10 @@
-
-
("values");
- int rowIndex = mergedRow.Value("index");
- string sortIndex = values.Value("SortIndex");
- if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
- {
- if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0)
- {
- isEmpty = true;
- break;
- }
- }
- }
- if (isEmpty)
- {
- ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空,必须填报数据!", MessageBoxIcon.Warning);
- return;
- }*/
+ /* bool isEmpty = false;
+ foreach (JObject mergedRow in Grid1.GetMergedData())
+ {
+ JObject values = mergedRow.Value("values");
+ int rowIndex = mergedRow.Value("index");
+ string sortIndex = values.Value("SortIndex");
+ if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
+ {
+ if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0)
+ {
+ isEmpty = true;
+ break;
+ }
+ }
+ }
+ if (isEmpty)
+ {
+ ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空,必须填报数据!", MessageBoxIcon.Warning);
+ return;
+ }*/
Save("add");
ShowNotify("保存成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -1331,7 +1336,12 @@ namespace FineUIPro.Web.ZHGL.Environmental
{
try
{
- decimal d = Convert.ToDecimal(values.Value("LastYearValue"));
+ string str = values.Value("LastYearValue");
+ if (str == "6E-05")
+ {
+ str = "0.00006";
+ }
+ decimal d = Convert.ToDecimal(str);
}
catch (Exception)
{
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index 91c452bc..0a35e1d5 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -29,7 +29,7 @@
bin\Debug\
DEBUG;TRACE
prompt
- 5
+ 4
false
bin\Debug\Model.xml