|
|
|
@ -801,6 +801,8 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr |
|
|
|
|
{ |
|
|
|
|
var input = new DefaultGhre_ExamInput(); |
|
|
|
|
|
|
|
|
|
var companyCode = await QueryCompanyCode(); |
|
|
|
|
|
|
|
|
|
#region baseColumns |
|
|
|
|
var baseColumns = new List<DefaultGhre_ExamColumn> |
|
|
|
|
{ |
|
|
|
@ -959,7 +961,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr |
|
|
|
|
label = "学习完成规则", |
|
|
|
|
field = "StudyFinishedRule", |
|
|
|
|
elementType = "ApiSelect", |
|
|
|
|
required = true, |
|
|
|
|
required= companyCode == "Viavi"?false: true, |
|
|
|
|
multipleSelect = false, |
|
|
|
|
editable = true, |
|
|
|
|
dataSource = "TBParaDetail_Train_TrainStudyFinishedRule" |
|
|
|
@ -993,7 +995,6 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
var companyCode = await QueryCompanyCode(); |
|
|
|
|
if (companyCode == "Viavi") |
|
|
|
|
baseColumns = baseColumns.Where(x => x.field != "ExamMode1").ToList(); |
|
|
|
|
#endregion |
|
|
|
@ -1071,6 +1072,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr |
|
|
|
|
var staffTableData = await QueryStaff1(Id); |
|
|
|
|
pageData.staffTableData = staffTableData.Data; |
|
|
|
|
} |
|
|
|
|
else input.pageData.ScoreRule = "Highest"; |
|
|
|
|
#endregion |
|
|
|
|
|
|
|
|
|
input.baseColumns = baseColumns; |
|
|
|
|