zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交集团数据穿透修改

Browse Source
This commit is contained in:
高飞
2023-06-19 09:04:34 +08:00
parent efed3c7f6f
commit 1e709abb1a
184 changed files with 10777 additions and 3631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
+5 -2
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
GetButtonPower();
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
if (CurrUser.UnitId == null || CurrUser.UnitId == Const.sysglyId)
if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_CD)
{
this.drpUnitId.Enabled = true;
}
@@ -77,6 +77,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtTestCycle.Text = inspectionMachine.TestCycle;
this.rblIsVerification.SelectedValue = inspectionMachine.IsVerification.HasValue && inspectionMachine.IsVerification == true ? "true" : "false";
this.rblIsCheckOK.SelectedValue = inspectionMachine.IsCheckOK.HasValue && inspectionMachine.IsCheckOK == true ? "true" : "false";
if (inspectionMachine.InspectionDate != null)
{
this.txtInspectionDate.Text = string.Format("{0:yyyy-MM-dd}", inspectionMachine.InspectionDate);
@@ -97,7 +98,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var currApprove = InspectionMachineApproveService.GetCurrentApprove(inspectionMachine.InspectionMachineId);
if (currApprove != null)
{ //重新编制 编制人 可以 显示 提交 保存按钮
this.drpAudit.SelectedValue = currApprove.ApproveMan;
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionMachine.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
@@ -209,6 +210,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
@@ -288,6 +290,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);