From 4472e4108593c72371d5f15bb2c1bbd6f74dab2e Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 18 Dec 2023 15:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E7=BF=BB=E9=A1=B5=E4=BF=9D=E5=AD=98=E5=92=8C=E4=B8=AA?=
=?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=B8=8B=E8=BD=BD=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E6=89=8B=E5=86=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/Common/Const.cs | 4 ++
.../JDGL/Check/CompleteInput.aspx.cs | 5 ++-
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs | 6 ++-
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx | 4 +-
.../Personal/PersonalInfo.aspx.cs | 37 +++++++++++++++++++
.../Personal/PersonalInfo.aspx.designer.cs | 9 +++++
6 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 1ae05411..6e6f23c2 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3366,6 +3366,10 @@ namespace BLL
///
public const string PDMSPipelineTemplateUrl = "File\\Excel\\DataIn\\PDMS输出(设计)数据模板.xlsx";
///
+ /// 赛鼎施工管理信息平台操作手册
+ ///
+ public const string HelpUrl = "Doc\\赛鼎施工管理信息平台操作手册.docx";
+ ///
/// 施工计划模板
///
public const string ConstructionPlanTemplateUrl = "File\\Word\\ZHGL\\施工计划模板.doc";
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
index 8f8769f5..99d31806 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
@@ -139,6 +139,7 @@ namespace FineUIPro.Web.JDGL.Check
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
+ Save();
BindGrid();
}
@@ -204,10 +205,11 @@ namespace FineUIPro.Web.JDGL.Check
string[] ids = this.hdId.Text.Split(',');
if (ids.Length > 0)
{
+ int i = 0;
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value("values");
- int i = mergedRow.Value("index");
+ //int i = mergedRow.Value("index");
if (this.Grid1.Rows[i].DataKeys[2] != null && ids.Contains(this.Grid1.Rows[i].DataKeys[2].ToString()))
{
Model.WBS_WorkPackage WorkPackage = oldViewInfos.FirstOrDefault(x => x.WorkPackageId == this.Grid1.Rows[i].DataKeys[2].ToString());
@@ -325,6 +327,7 @@ namespace FineUIPro.Web.JDGL.Check
}
}
}
+ i++;
}
}
}
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
index 9fb0e14a..96945ffc 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
@@ -71,6 +71,7 @@ namespace FineUIPro.Web.JDGL.Check
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
+ Save();
BindGrid();
}
@@ -107,10 +108,12 @@ namespace FineUIPro.Web.JDGL.Check
string[] ids = this.hdId.Text.Split(',');
if (ids.Length > 0)
{
+ int i = 0;
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value("values");
- int i = mergedRow.Value("index");
+ //int i = mergedRow.Value("index");
+ string name = values.Value("Name");
if (this.Grid1.Rows[i].DataKeys[2] != null && ids.Contains(this.Grid1.Rows[i].DataKeys[2].ToString()))
{
Model.WBS_WorkPackage workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == this.Grid1.Rows[i].DataKeys[2].ToString());
@@ -191,6 +194,7 @@ namespace FineUIPro.Web.JDGL.Check
db.SubmitChanges();
}
}
+ i++;
}
}
}
diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
index 3b99c659..49d7c6ff 100644
--- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
+++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
@@ -22,7 +22,7 @@