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

修改进度

This commit is contained in:
高飞 2023-07-24 19:40:26 +08:00
parent 967d95a27d
commit 08b7fd28c8
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05 /SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05
/SGGL/FineUIPro.Web/FileUpload/CQMS /SGGL/FineUIPro.Web/FileUpload/CQMS
/SGGL/FineUIPro.Web/FileUpload/LargerHazard/2023-06 /SGGL/FineUIPro.Web/FileUpload/LargerHazard/2023-06
/SGGLPackFile.rar

13
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
View File

@ -339,9 +339,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
Bookmark bookmarkInspectionCode = doc.Range.Bookmarks["inspectionCode"]; Bookmark bookmarkInspectionCode = doc.Range.Bookmarks["inspectionCode"];
if (bookmarkInspectionCode != null) if (bookmarkInspectionCode != null)
{ {
if (inspectionModel != null) if (inspectionModel != null && !string.IsNullOrEmpty(inspectionModel.NoticeCode))
{ {
bookmarkInspectionCode.Text = inspectionModel.InspectionCode; bookmarkInspectionCode.Text = inspectionModel.NoticeCode;
} }
} }
@ -462,7 +462,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{ {
builder.RowFormat.Height = 200 / ManagementDetaillList.Count; builder.RowFormat.Height = 200 / ManagementDetaillList.Count;
} }
else { else
{
builder.RowFormat.Height = 20; builder.RowFormat.Height = 20;
} }
builder.CellFormat.Borders.Left.LineWidth = 1; builder.CellFormat.Borders.Left.LineWidth = 1;
@ -487,7 +488,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{ {
builder.Write("■A "); builder.Write("■A ");
} }
else { else
{
builder.Write("□A "); builder.Write("□A ");
} }
if (ControlPointType.Contains("B")) if (ControlPointType.Contains("B"))
@ -730,7 +732,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
} }
} }
public class WorkBranchList { public class WorkBranchList
{
public string UnitWorkId { get; set; } public string UnitWorkId { get; set; }
public string Branch { get; set; } public string Branch { get; set; }
} }

2
SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
View File

@ -157,7 +157,7 @@ namespace FineUIPro.Web.JDGL.WBS
{ {
Save(); Save();
ShowNotify("保存成功！", MessageBoxIcon.Success); ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideReference()); //PageContext.RegisterStartupScript(ActiveWindow.GetHideReference());
} }
private void Save() private void Save()