From 6b1271387cba09090f1d57d5cd47e7736413a91b Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Tue, 30 May 2023 17:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CQMS/DataBase/ConstructionStandardListProject.aspx.cs | 6 ++++-- .../DataBase/ConstructionStandardListProjectEdit.aspx.cs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx.cs index 90647079..80ea8277 100644 --- a/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx.cs @@ -181,7 +181,8 @@ namespace FineUIPro.Web.CQMS.DataBase } for (int i = 0; i < Grid1.Rows.Count; i++) { - var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == Grid1.Rows[i].RowID + this.CurrUser.LoginProjectId); + //var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == Grid1.Rows[i].RowID + this.CurrUser.LoginProjectId); + var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == Grid1.Rows[i].RowID); if (attachFile != null && !string.IsNullOrEmpty(attachFile.AttachUrl)) { Grid1.Rows[i].CellCssClasses[18] = "green"; @@ -272,7 +273,8 @@ namespace FineUIPro.Web.CQMS.DataBase string id = Grid1.DataKeys[e.RowIndex][0].ToString(); if (e.CommandName == "AttachUrl") { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/DataBase/ConstructionStandardProject&menuId={1}", id + this.CurrUser.LoginProjectId, BLL.Const.CQMSConstructionStandardListProjectMenuId))); + //PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/DataBase/ConstructionStandardProject&menuId={1}", id + this.CurrUser.LoginProjectId, BLL.Const.CQMSConstructionStandardListProjectMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/DataBase/ConstructionStandardProject&menuId={1}", id, BLL.Const.CQMSConstructionStandardListProjectMenuId))); } } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProjectEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProjectEdit.aspx.cs index 6c5cbdad..c66b8247 100644 --- a/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProjectEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProjectEdit.aspx.cs @@ -63,7 +63,8 @@ namespace FineUIPro.Web.CQMS.DataBase this.cbIsSelected6.Checked = true; } this.txtRemark.Text = standard.Memo; - this.hdStandardCode.Text = standard.StandardCode + this.CurrUser.LoginProjectId; + //this.hdStandardCode.Text = standard.StandardCode + this.CurrUser.LoginProjectId; + this.hdStandardCode.Text = standard.StandardCode.ToString(); } } } @@ -85,7 +86,8 @@ namespace FineUIPro.Web.CQMS.DataBase { maxStandardCode = BLL.ConstructionStandardListProjectService.GetMaxStandardCode(this.CurrUser.LoginProjectId); } - this.hdStandardCode.Text = (maxStandardCode + 1).ToString() + this.CurrUser.LoginProjectId; + //this.hdStandardCode.Text = (maxStandardCode + 1).ToString() + this.CurrUser.LoginProjectId; + this.hdStandardCode.Text = (maxStandardCode + 1).ToString(); } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/DataBase/ConstructionStandardProject&menuId={1}", this.hdStandardCode.Text, BLL.Const.CQMSConstructionStandardListProjectMenuId))); }