This commit is contained in:
chi
2021-12-20 12:42:18 +09:00
parent 19525c71b6
commit 4cf24cedaf
31 changed files with 2585 additions and 565 deletions

View File

@@ -148,6 +148,28 @@ namespace FPJ0000.JobReport_
tbTag.Text = dr.tag;
if(dr.ot > 0)
{
if(dr.ot2 == 0)
{
lbOt2.Text = "관리자 연장/휴일 근무 승인이 완료되지 않았습니다";
lbOt2.ForeColor = Color.Blue;
lbotReason.Visible = false;
}
else
{
lbOt2.Text = $"승인시간:{dr.ot2}";
lbotReason.Text = $"사유:{dr.otReason}";
}
}
else
{
lbOt2.Visible = false;
lbotReason.Visible = false;
}
if (getKisulInput)
{
cmb_kisuldiv.Text = dr.kisuldiv;
@@ -210,6 +232,12 @@ namespace FPJ0000.JobReport_
this.Show();
Application.DoEvents();
if(dr.ot > 0 && dr.ot2 > 0)
{
tbOt.Enabled = false;
FCOMMON.Util.MsgE("휴일/연장 근무시간이 관리자에의해 확정되었으므로 초과시간을 변경할 수 없습니다");
}
//if (this.richTextBoxEx1.Text.Trim() != "")
//{
// this.richTextBoxEx1.Focus();