diff --git a/src/components/CustomPages/SE/SE013ShowPrint.js b/src/components/CustomPages/SE/SE013ShowPrint.js index 3897a01..ec75573 100644 --- a/src/components/CustomPages/SE/SE013ShowPrint.js +++ b/src/components/CustomPages/SE/SE013ShowPrint.js @@ -45,7 +45,7 @@ class SE013ShowPrint extends React.Component { extendInclude(json, 'Nav_LaunchUser'); extendInclude(json, 'Nav_TrainType'); extendInclude(json, 'Nav_RecordUser'); - extendInclude(json, 'Nav_TrainCheckType'); + // extendInclude(json, 'Nav_TrainCheckType'); extendInclude(json, 'Nav_TrainContentList'); extendInclude(json, 'Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_TrainUserList'); @@ -218,7 +218,8 @@ class SE013ShowPrint extends React.Component { 培训形式 {this.returnModel(data.TRAIN_MODEL)} 考核方式 - {data.Nav_TrainCheckType ? data.Nav_TrainCheckType.NAME : ''} + {data.CHECKTYPE && enums.PlanCheckType.enums[data.CHECKTYPE]} + {/* {data.Nav_TrainCheckType ? data.Nav_TrainCheckType.NAME : ''} */} 是否需要培训效果评估 diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js index 5c4c022..ecc576d 100644 --- a/src/components/CustomPages/SE/SE018EditPage.js +++ b/src/components/CustomPages/SE/SE018EditPage.js @@ -57,7 +57,7 @@ class SE018EditPage extends React.Component { extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment'); extendInclude(json, 'Nav_Notify.Nav_LaunchUser'); extendInclude(json, 'Nav_Notify.Nav_TrainType'); - extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); + // extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); extendInclude(json, 'Nav_Users.Nav_User'); extendInclude(json, 'Nav_Files.Nav_ImgFile'); extendInclude(json, 'Nav_Users.Nav_User'); @@ -76,7 +76,8 @@ class SE018EditPage extends React.Component { } updateData(data) { let isApprove = false; - if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") { + // if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") { + if (data.Nav_Notify.CHECKTYPE == 51) { this.state.isExam = true; this.state.isShow = "table-cell"; } @@ -268,7 +269,8 @@ class SE018EditPage extends React.Component { 培训形式 {data && this.returnModel(data.Nav_Notify.TRAIN_MODEL)} 考核方式 - {data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null} + {/* {data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null} */} + {data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]} 培训内容 diff --git a/src/components/CustomPages/SE/SE018PaperPage.js b/src/components/CustomPages/SE/SE018PaperPage.js index 27c6a17..a97a044 100644 --- a/src/components/CustomPages/SE/SE018PaperPage.js +++ b/src/components/CustomPages/SE/SE018PaperPage.js @@ -117,7 +117,7 @@ class SE018PaperPage extends React.Component { extendInclude(json, 'Nav_Record.Nav_Notify.Nav_LaunchUser'); extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainContentList'); extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainType'); - extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainCheckType'); + extendInclude(json, 'Nav_Record.Nav_Notify'); extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainContentList.Nav_Point'); @@ -398,7 +398,8 @@ class SE018PaperPage extends React.Component { 培训形式 {notify ? this.returnModel(notify.TRAIN_MODEL) : null} 考核方式 - {notify && notify.Nav_TrainCheckType ? notify.Nav_TrainCheckType.NAME : null} + {/* {notify && notify.Nav_TrainCheckType ? notify.Nav_TrainCheckType.NAME : null} */} + {notify && notify.CHECKTYPE && enums.PlanCheckType.enums[notify.CHECKTYPE]} 培训内容