合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -78,17 +78,13 @@ namespace FineUIPro.Web.HiddenInspection
this.txtUnitName.Text = registration.ResponsibilityUnitName;
this.txtWorkAreaName.Text = registration.WorkAreaName;
this.txtRegisterTypesName.Text = registration.RegisterTypesName;
if (registration.CheckCycle == "D")
if (!string.IsNullOrEmpty(registration.CheckCycle))
{
this.txtType.Text = "日检";
this.ckType.SelectedValue = registration.CheckCycle ?? "D";
}
else if (registration.CheckCycle == "W")
if (!string.IsNullOrEmpty(registration.Risk_Level))
{
this.txtType.Text = "周检";
}
else if (registration.CheckCycle == "M")
{
this.txtType.Text = "月检";
this.dpRiskLevel.SelectedValue = registration.Risk_Level ?? "1";
}
this.txtResponsibleManName.Text = registration.ResponsibilityManName;
if (registration.RectificationPeriod != null)
@@ -96,6 +92,7 @@ namespace FineUIPro.Web.HiddenInspection
this.txtRectificationPeriod.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", registration.RectificationPeriod);
}
this.txtRegisterDef.Text = registration.RegisterDef;
this.txtRequirements.Text = registration.Requirements;
this.txtCutPayment.Text = registration.CutPayment.ToString();
this.txtCheckManName.Text = registration.CheckManName;
if (registration.CheckTime != null)