diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js index 7aed6e3..1a684c4 100644 --- a/src/components/CustomPages/SE/SE018EditPage.js +++ b/src/components/CustomPages/SE/SE018EditPage.js @@ -61,8 +61,8 @@ class SE018EditPage extends React.Component { extendInclude(json, 'Nav_Notify.Nav_ListCour.Nav_Cour'); // extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); extendInclude(json, 'Nav_Users.Nav_User'); + extendInclude(json, 'Nav_Users.Nav_Files.Nav_ImgFile'); extendInclude(json, 'Nav_Files.Nav_ImgFile'); - extendInclude(json, 'Nav_Users.Nav_User'); extendInclude(json, 'Nav_Papers'); json.IgnoreDataRule = true; this.props.dispatch({ @@ -79,7 +79,7 @@ class SE018EditPage extends React.Component { updateData(data) { let isApprove = false; // if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") { - if (data.Nav_Notify.CHECKTYPE == 51) { + if (data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) { this.state.isExam = true; this.state.isShow = "table-cell"; } @@ -362,9 +362,9 @@ class SE018EditPage extends React.Component { 工号 姓名 岗位 - 电子签名 {this.state.isExam && 分数} - 查看试卷 + 查看试卷 + 电子签名 { this.state.isView && data && data.Nav_Users && data.Nav_Users.filter(it => it.OK).map((it, idx) => { @@ -374,14 +374,23 @@ class SE018EditPage extends React.Component { {it.Nav_User.CODE} {it.Nav_User.NAME} {it.POST_NAME} - + {/* {this.state.isExam && {this.state.data.Nav_Papers.find(item => item.USER_ID == it.USER_ID)?.SCORE}} */} + {this.state.isExam && {it?.SCORE}} + + {/* 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)}>
+ } + { showUserSign(it.Nav_User, config.picServerHost) } - {/* {this.state.isExam && {this.state.data.Nav_Papers.find(item => item.USER_ID == it.USER_ID)?.SCORE}} */} - {this.state.isExam && {it?.SCORE}} -
this.showDetailModal(it.RECORD_ID, it.USER_ID)}>
}) } diff --git a/src/files/edit/SE018.js b/src/files/edit/SE018.js new file mode 100644 index 0000000..eab9674 --- /dev/null +++ b/src/files/edit/SE018.js @@ -0,0 +1,24 @@ +import { message } from "antd/lib/index"; +import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, empty } from "../../utils/common"; +import { connect } from 'dva'; +/** + * @return {string} + */ +// 编辑 +export default { + onBeforeSaveHandleRecord(params) { + params.record.TaskID = params.data.TaskID //TaskID传递消息表ID + params.record.PUBLISH = params.customParams; + }, + + onBeforeEdit: ({ isNew, stateData, setFieldVisible, setFieldValue, setRowFieldVisible, setFieldEditable, setRowFieldDisable, setHeadPanelShowType }) => { + if (stateData.Nav_Notify.CHECKTYPE && (stateData.Nav_Notify.CHECKTYPE == '56' || stateData.Nav_Notify.CHECKTYPE == '81')) { + //线下考核 委外 + setRowFieldVisible("T_SE_TRAIN_RECORD_USER", { "EXAMINATION_RESULTS": true, "SCORE": true, "Nav_Files": true }) + //考核结果 EXAMINATION_RESULTS 必填 setFieldRequired + + } else { + setRowFieldVisible("T_SE_TRAIN_RECORD_USER", { "EXAMINATION_RESULTS": false, "SCORE": false, "Nav_Files": false }) + } + } +} diff --git a/src/utils/customConfig.js b/src/utils/customConfig.js index 7be96ca..0a32162 100644 --- a/src/utils/customConfig.js +++ b/src/utils/customConfig.js @@ -7,7 +7,7 @@ const LoadingComponent = ({ isLoading, error }) => { return
组件加载失败
; } if (isLoading) { - return
加载�?..
; + return
加载中..
; } return null; }; diff --git a/src/utils/customConfig1.js b/src/utils/customConfig1.js index 65af4fc..a5593c4 100644 --- a/src/utils/customConfig1.js +++ b/src/utils/customConfig1.js @@ -7,7 +7,7 @@ const LoadingComponent = ({ isLoading, error }) => { return
组件加载失败
} if (isLoading) { - return
加载�?..
+ return
加载中..
} return null }