From 18fa475a8f566a6fcbea526812c3c63a8b689aa1 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 10 Apr 2025 10:29:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZHGL/Environmental/ArchitectureReportSave.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs index 31cff99c..23539efc 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs @@ -1228,7 +1228,7 @@ namespace FineUIPro.Web.ZHGL.Environmental ShowNotify("该月份记录已存在！", MessageBoxIcon.Warning); return; } - } + } else { Model.Environmental_ArchitectureReport oldReport = BLL.ArchitectureReportService.GetArchitectureReportByArchitectureReportId(ArchitectureReportId); From eb753a1fa459d4056f702cd6a1493d007dbc1334 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 10 Apr 2025 10:45:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArchitectureReportSave.aspx.cs | 58 +++++++++++-------- SGGL/Model/Model.csproj | 2 +- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs index 23539efc..292dbbeb 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs @@ -1228,7 +1228,7 @@ namespace FineUIPro.Web.ZHGL.Environmental ShowNotify("该月份记录已存在！", MessageBoxIcon.Warning); return; } - } + } else { Model.Environmental_ArchitectureReport oldReport = BLL.ArchitectureReportService.GetArchitectureReportByArchitectureReportId(ArchitectureReportId); @@ -1248,7 +1248,12 @@ namespace FineUIPro.Web.ZHGL.Environmental newItem.ArchitectureReportId = report.ArchitectureReportId; newItem.BaseNumber = System.Web.HttpUtility.HtmlDecode(item.BaseNumber); 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.Rate = System.Web.HttpUtility.HtmlDecode(item.Rate); ArchitectureReportItemService.AddArchitectureReportItem(newItem); @@ -1265,7 +1270,7 @@ namespace FineUIPro.Web.ZHGL.Environmental PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); return; } - else if (code=="3") + else if (code == "3") { Alert.ShowInParent("集团当前季度数据已锁定，无法上传！", MessageBoxIcon.Error); } @@ -1284,26 +1289,26 @@ namespace FineUIPro.Web.ZHGL.Environmental protected void btnSave_Click(object sender, EventArgs e) { - /* 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; - }*/ + /* 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 From fb75ac665265e5b17de6def52c8e532d88166a40 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 22 Apr 2025 17:52:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/DropListService.cs | 10 +++++----- .../BiddingManagement/ActionPlanFormationService.cs | 4 ++-- .../PHTGL/BiddingManagement/ActionPlanFormation.aspx | 4 ++-- .../BiddingManagement/ActionPlanFormationEdit.aspx | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) 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 @@ - - - + - +