Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

2、部门培训计划 添加 触发日期 培训角色

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 {
                         <table className={styles.PrintFormLight}>
                             <tbody>
                                 <tr>
-                                    <td colSpan={10} className={styles.showPrintHead2}>年度培训计划详情</td>
+                                    <td colSpan={11} className={styles.showPrintHead2}>年度培训计划详情</td>
                                 </tr>
                                 <tr className={styles.PrintFormLightTh}>
                                     <td>月份</td>
+                                    <td>触发日期</td>
                                     <td>培训性质</td>
                                     <td>培训类型</td>
                                     <td>培训名称</td>
@@ -133,6 +135,7 @@ class SE071ShowPrint extends React.Component {
                                     <td>考核方式</td>
                                     <td>培训学时</td>
                                     <td>培训组织</td>
+                                    <td>培训角色</td>
                                     {/* <td>培训老师</td> */}
                                     {
                                         data.TYPE != 5 ?
@@ -143,6 +146,7 @@ class SE071ShowPrint extends React.Component {
                                 {data?.Nav_ListPlanDetail?.map((item, i) => {
                                     return <tr>
                                         <td>{item.MONTH} </td>
+                                        <td>{item.DATE_TRAIN?.split(' ')[0]} </td>
                                         <td>{enums.TrainInOut.enums[item.IN_OUT]} </td>
                                         <td>{item.Nav_TrainTypeEnum.NAME} </td>
                                         <td>{item.NAME} </td>
@@ -151,6 +155,7 @@ class SE071ShowPrint extends React.Component {
                                         <td>{enums.PlanCheckType.enums[item.CHECKTYPE]} </td>
                                         <td>{item.CLASSHOUR} </td>
                                         <td>{item.Nav_Department.NAME} </td>
+                                        <td>{item.Nav_ApproveRole?.NAME} </td>
                                         {
                                             data.TYPE != 5 ?
                                                 <td>{item.Nav_ListDetailDepartment?.map((itemtype, j) => { return (j > 0 ? '，' : '') + itemtype.Nav_Department.NAME })}</td>
@@ -163,7 +168,7 @@ class SE071ShowPrint extends React.Component {
 
                                 <tr>
                                     <td>审批详情</td> {/* 审核意见 如果已经审批 显示审批信息 */}
-                                    <td colSpan={9} style={{ textAlign: "left" }}>
+                                    <td colSpan={11} style={{ textAlign: "left" }}>
                                         {
                                             showApprove(data.Nav_Approve?.Nav_ApproveDetails, enums.NodeApproveStatus.enums, config.picServerHost, 200)
                                         }

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';