lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2024-03-28 10:14:38 +08:00
parent 1791d28bde
commit 7a938af201
82 changed files with 13644 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootNode.ToolTip = "";
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var inspectTerms = Funs.DB.PreRun_SubInspectTerm.Where(x => (x.Subcontractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Contractor == this.CurrUser.UserId && x.ContractorIsAllPass == 1) || (x.Supervision == this.CurrUser.UserId && x.SupervisionIsAllPass == 1) || (x.Owner == this.CurrUser.UserId && x.OwnerIsAllPass == 1)).ToList();
var inspectTerms = Funs.DB.PreRun_SubInspectTerm.Where(x => (x.Subcontractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Contractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Supervision == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Owner == this.CurrUser.UserId && x.InspectionIsAllPass == 1)).ToList();
if (inspectTerms.Count == 0) return;
var subSystemIds = inspectTerms.ConvertAll(x => x.SubSystemId);
var workPackIds = inspectTerms.ConvertAll(x => x.WorkPackId);
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx
+1
View File
@@ -169,6 +169,7 @@
var valid = true, modifiedData = grid1.getMergedData();
$.each(modifiedData, function (index, rowData) {
debugger;
if (rowData.status === 'deleted') {
return true; // continue
}
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs
+2 -2
View File
@@ -38,12 +38,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var termIds = new List<string>();
var tailTerms = Funs.DB.PreRun_InspectTailTerm.Where(x => x.HandleUser == this.CurrUser.UserId).ToList();
var tailTerms = Funs.DB.PreRun_InspectTailTerm.Where(x => x.HandleUser == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId).ToList();
if (tailTerms.Count > 0)
{
termIds = tailTerms.ConvertAll(x => x.TermItemId);
}
var userSubInspects = Funs.DB.PreRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId)).ToList();
var userSubInspects = Funs.DB.PreRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId) && x.ProjectId == this.CurrUser.LoginProjectId).ToList();
if (userSubInspects.Count == 0) return;
var subSystemIds = userSubInspects.ConvertAll(x => x.SubSystemId);
var workPackIds = userSubInspects.ConvertAll(x => x.WorkPackId);