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

src/components/CustomPages/SE/SE001EditPage.js

@@ -376,7 +376,7 @@ class SE001EditPage extends React.Component {
                     }}>事故事件
                     </Checkbox>
                 </Form.Item>
-                <Form.Item label={'适用岗位'} {...formItemLayout}>
+                <Form.Item style={{ display: 'none' }} label={'适用岗位'} {...formItemLayout}>
                     <Select disabled={this.state.readonly} value={this.state.SELECT_POSTS} mode="multiple" style={{ width: '100%' }}
                         onChange={(value) => {
                             this.setState({

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_Approve.Nav_ApproveDetails.Nav_ApproveUser");
         this.props.dispatch({
             type: 'app/getDataByPost',
             payload: json,
@@ -158,6 +159,17 @@ class SE071ShowPrint extends React.Component {
 
                                     </tr>
                                 })}
+
+
+                                <tr>
+                                    <td>审批详情</td> {/* 审核意见 如果已经审批 显示审批信息 */}
+                                    <td colSpan={9} style={{ textAlign: "left" }}>
+                                        {
+                                            showApprove(data.Nav_Approve?.Nav_ApproveDetails, enums.NodeApproveStatus.enums, config.picServerHost, 200)
+                                        }
+                                    </td>
+                                </tr>
+
                             </tbody>
                         </table>
                         : null