diff --git a/src/components/CustomPages/SC/SC022Import.js b/src/components/CustomPages/SC/SC022Import.js index 4f31a11..707ffcc 100644 --- a/src/components/CustomPages/SC/SC022Import.js +++ b/src/components/CustomPages/SC/SC022Import.js @@ -139,17 +139,20 @@ class SC022Import extends React.Component { + + + { isMsgShow ? ( isOk ? - + {Msg} : - + {Msg} diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js index 06101d3..7b41595 100644 --- a/src/components/CustomPages/SE/SE018EditPage.js +++ b/src/components/CustomPages/SE/SE018EditPage.js @@ -279,7 +279,7 @@ class SE018EditPage extends React.Component { 培训老师 {data && data.Nav_Notify ? data.Nav_Notify.TRAIN_TEACHER : null} 培训形式 - {data&& data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]} + {data && data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]} 考核方式 {/* {data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null} */} {data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]} @@ -364,7 +364,7 @@ class SE018EditPage extends React.Component { 姓名 岗位 {this.state.isExam && 分数} - 查看试卷 + {!signable && 查看试卷} 电子签名 { @@ -381,12 +381,13 @@ class SE018EditPage extends React.Component { {/* if (data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) { */} {/* 线上考核 51 看试卷 56 81 看附件 */} { - this.state.isShow && data.Nav_Notify.CHECKTYPE ? ( - data.Nav_Notify.CHECKTYPE == 51 ?
this.showDetailModal(it.RECORD_ID, it.USER_ID)}>
- : {showFiles(it?.Nav_Files, config.picServerHost, this, false)} - ) - :
this.showDetailModal(it.RECORD_ID, it.USER_ID)}>
- } + !signable && ( + this.state.isShow && data.Nav_Notify.CHECKTYPE ? ( + data.Nav_Notify.CHECKTYPE == 51 ?
this.showDetailModal(it.RECORD_ID, it.USER_ID)}>
+ : {showFiles(it?.Nav_Files, config.picServerHost, this, false)} + ) + :
this.showDetailModal(it.RECORD_ID, it.USER_ID)}>
+ )} { showUserSign(it.Nav_User, config.picServerHost) diff --git a/src/components/CustomPages/SE/SE018PaperPage.js b/src/components/CustomPages/SE/SE018PaperPage.js index 5a57569..3da5afa 100644 --- a/src/components/CustomPages/SE/SE018PaperPage.js +++ b/src/components/CustomPages/SE/SE018PaperPage.js @@ -333,15 +333,15 @@ class SE018PaperPage extends React.Component { } } - if (this.state.filepath.indexOf('/VIDEO/') > -1) { + if (this.state.filepath && this.state.filepath.length > 0 && this.state.filepath.indexOf('/VIDEO/') > -1) { this.state.isViedo = true this.state.filepath = configc.videoServerHost + this.state.filepath this.state.filepathf = [] if (ISEND && VIEWSEC == 0) { ISEND = false } - } else if (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath - .indexOf('.avi') > -1) { + } else if (this.state.filepath && this.state.filepath.length > 0 && (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath + .indexOf('.avi') > -1)) { //暂时不应该进来 this.state.isViedo = true if (ISEND) { @@ -354,7 +354,9 @@ class SE018PaperPage extends React.Component { this.state.isViedo = false // this.state.isVideoEnd = true this.state.filepath = this.state.filepath - this.state.filepathf = getFileShow(this.state.filepath) + if (this.state.filepath && this.state.filepath.length > 0) { + this.state.filepathf = getFileShow(this.state.filepath) + } } this.setState({ indexCour: this.state.indexCour, @@ -734,7 +736,7 @@ class SE018PaperPage extends React.Component { : null } { - isCourEdit && !isViedo ? + isCourEdit && !isViedo && filepathf && filepathf.length > 0 ? 课件附件 {