diff --git a/src/components/CustomPages/SE/SE071ShowPrint.js b/src/components/CustomPages/SE/SE071ShowPrint.js index 32ee628..08b0775 100644 --- a/src/components/CustomPages/SE/SE071ShowPrint.js +++ b/src/components/CustomPages/SE/SE071ShowPrint.js @@ -64,6 +64,7 @@ class SE071ShowPrint extends React.Component { extendInclude(json, 'Nav_ListPlanDetail.Nav_Department') extendInclude(json, 'Nav_ListPlanDetail.Nav_ListDetailDepartment.Nav_Department') extendInclude(json, 'Nav_ListPlanDetail.Nav_TrainTypeEnum') + extendInclude(json, 'Nav_ListPlanDetail.Nav_ApproveRole') extendInclude(json, "Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser"); this.props.dispatch({ type: 'app/getDataByPost', @@ -121,10 +122,11 @@ class SE071ShowPrint extends React.Component { - + + @@ -133,6 +135,7 @@ class SE071ShowPrint extends React.Component { + {/* */} { data.TYPE != 5 ? @@ -143,6 +146,7 @@ class SE071ShowPrint extends React.Component { {data?.Nav_ListPlanDetail?.map((item, i) => { return + @@ -151,6 +155,7 @@ class SE071ShowPrint extends React.Component { + { data.TYPE != 5 ? @@ -163,7 +168,7 @@ class SE071ShowPrint extends React.Component { {/* 审核意见 如果已经审批 显示审批信息 */} -
年度培训计划详情年度培训计划详情
月份触发日期 培训性质 培训类型 培训名称考核方式 培训学时 培训组织培训角色培训老师
{item.MONTH} {item.DATE_TRAIN?.split(' ')[0]} {enums.TrainInOut.enums[item.IN_OUT]} {item.Nav_TrainTypeEnum.NAME} {item.NAME} {enums.PlanCheckType.enums[item.CHECKTYPE]} {item.CLASSHOUR} {item.Nav_Department.NAME} {item.Nav_ApproveRole?.NAME} {item.Nav_ListDetailDepartment?.map((itemtype, j) => { return (j > 0 ? ',' : '') + itemtype.Nav_Department.NAME })}
审批详情 + { showApprove(data.Nav_Approve?.Nav_ApproveDetails, enums.NodeApproveStatus.enums, config.picServerHost, 200) } diff --git a/src/components/CustomPages/SE/SEConfigPage.js b/src/components/CustomPages/SE/SEConfigPage.js index 308a3a2..c9a4b66 100644 --- a/src/components/CustomPages/SE/SEConfigPage.js +++ b/src/components/CustomPages/SE/SEConfigPage.js @@ -64,7 +64,6 @@ class SEConfigPage extends React.Component { } } }); - } loadData = () => { let json = initFilter(this.props.login.OrgId); @@ -117,26 +116,6 @@ class SEConfigPage extends React.Component { }); } - - onselectChange = (value) => { - debugger - let data = this.state.data; - data.APPROVAL_ROLE_ID = value; - this.setState(data) - } - - onBlur = () => { - console.log('blur'); - } - - onFocus = () => { - console.log('focus'); - } - - onSearch = (val) => { - console.log('search:', val); - } - render() { const { data } = this.state; const dateFormat = 'MM-DD';