1、三级安全教育 考试成绩 是否合格 等 如果不考试 置空

2、三级安全教育卡 显示 细节优化 (没时间显示 错误英文  没签到也有签名 等等)
This commit is contained in:
wyw 2026-02-28 10:37:45 +08:00
parent 65f3bf3785
commit 9d732f0a9a
2 changed files with 30 additions and 7 deletions

View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button, Modal, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, GetFileModel, showFiles } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, getArryPropShow, guid, GetFileModel, showFiles } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../../CustomPages/HI/StepForm.css';
import XLSX from 'xlsx';
@ -60,7 +60,17 @@ class SE063ShowPrint extends React.Component {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
let userID = this.props.data.parentRecord.USER_ID;
extendRule(json, 'USERID', 1, userID);
extendRule(json, 'USER_ID', 1, userID);
extendInclude(json, 'Nav_NewUser.Nav_Department');
extendInclude(json, 'Nav_NewUser.Nav_Department');
extendInclude(json, 'Nav_NewUser.Nav_User');
extendInclude(json, 'Nav_NewUser.Nav_Content');
extendInclude(json, 'Nav_NewUser.Nav_Files.Nav_ImgFile');
extendInclude(json, 'Nav_NewUser.Nav_Teachers.Nav_User');
extendInclude(json, 'Nav_User');
extendInclude(json, 'Nav_Department');
extendInclude(json, 'Nav_Post');
extendInclude(json, 'Nav_Files.Nav_ImgFile');
json.IgnoreDataRule = true;
this.props.dispatch({
type: 'app/getDataByPost',
@ -120,6 +130,7 @@ class SE063ShowPrint extends React.Component {
}
render() {
const { data } = this.state;
const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
return <div>
<div style={{ padding: '10px' }}>
@ -162,9 +173,9 @@ class SE063ShowPrint extends React.Component {
</tr>
<tr>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>开始时间</td>
<td colSpan={2} rowSpan={1}>{moment(it.Nav_NewUser.START_TIME).format('YYYY-MM-DD')}</td>
<td colSpan={2} rowSpan={1}>{it.Nav_NewUser.START_TIME == null ? '' : moment(it.Nav_NewUser.START_TIME).format('YYYY-MM-DD HH:mm')}</td>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>结束时间</td>
<td colSpan={2} rowSpan={1}>{moment(it.Nav_NewUser.END_TIME).format('YYYY-MM-DD')}</td>
<td colSpan={2} rowSpan={1}>{it.Nav_NewUser.END_TIME == null ? '' : moment(it.Nav_NewUser.END_TIME).format('YYYY-MM-DD HH:mm')}</td>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>培训地点</td>
<td colSpan={2} rowSpan={1}>{it.Nav_NewUser.TAINNING_ADDR}</td>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>组织部门</td>
@ -177,10 +188,12 @@ class SE063ShowPrint extends React.Component {
<td colSpan={2} rowSpan={1}>{it.Nav_NewUser.TRAINNING_TIME}</td>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>培训老师</td>
<td colSpan={2} rowSpan={1}>{it.Nav_NewUser.TEACHER}</td>
<td colSpan={2} rowSpan={1}>{getArryPropShow(it.Nav_NewUser.Nav_Teachers, "Nav_User.NAME")}</td>
{/* <td colSpan={2} rowSpan={1}>{it.Nav_NewUser.TEACHER}</td> */}
<td colSpan={2} rowSpan={1} className={styles.fontBold}>培训形式</td>
<td colSpan={2} rowSpan={1}>{this.returnModel(it.Nav_NewUser.TRAIN_MODEL)}</td>
<td colSpan={2} rowSpan={1}>{enums.TrainType.enums[it.Nav_NewUser?.TRAINTYPE]}</td>
{/* <td colSpan={2} rowSpan={1}>{this.returnModel(it.Nav_NewUser.TRAIN_MODEL)}</td> */}
<td colSpan={2} rowSpan={1} className={styles.fontBold}>考核结果</td>
<td colSpan={2} rowSpan={1}>{this.fmtEnum('SEExaminationResultsEnum', it.EXAMINATION_RESULTS)}</td>
@ -197,7 +210,10 @@ class SE063ShowPrint extends React.Component {
<td colSpan={2} rowSpan={1} className={styles.fontBold}>签名</td>
<td colSpan={19} rowSpan={1} >
{
it.Nav_User && it.Nav_User.FILE_PATH && it.Nav_User.FILE_PATH.length > 0 && it.STATUS == 1 ? <img width={'150px'} alt={it.Nav_User.NAME} src={config.picServerHost + it.Nav_User?.FILE_PATH} /> : <img width={'150px'} alt={it.Nav_User.NAME} />
it.ISSIGN && it.ISSIGN !== 0 ?
(it.Nav_User && it.Nav_User.FILE_PATH && it.Nav_User.FILE_PATH.length > 0 && it.STATUS == 1 ? <img width={'150px'} alt={it.Nav_User.NAME} src={config.picServerHost + it.Nav_User?.FILE_PATH} /> : <img width={'150px'} alt={it.Nav_User.NAME} />)
: (<p />)
// it.Nav_NewUser.STATUS && it.Nav_NewUser.STATUS !== 0 && it.Nav_User && it.Nav_User.FILE_PATH && it.Nav_User.FILE_PATH.length > 0 && it.STATUS == 1 ? <img width={'150px'} alt={it.Nav_User.NAME} src={config.picServerHost + it.Nav_User?.FILE_PATH} /> : <img width={'150px'} alt={it.Nav_User.NAME} />
}
</td>
</tr>

View File

@ -1,6 +1,7 @@
import { message } from "antd/lib/index";
import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, empty } from "../../utils/common";
import { connect } from 'dva';
// import { forEach } from "core-js/core/array";
/**
* @return {string}
*/
@ -9,6 +10,12 @@ export default {
onBeforeSaveHandleRecord(params) {
params.record.TaskID = params.data.TaskID //TaskID传递消息表ID
params.record.PUBLISH = params.customParams;
if (params.record.IS_CREATETEST == 1) {
params.record.Nav_NewUserDetail.forEach(item => {
item.EXAMINATION_RESULTS = null
item.SCORE = null
})
}
},
onBeforeEdit: ({ isNew, stateData, setFieldVisible, setRowFieldLabel, setRowFieldVisible }) => {
if (stateData.IS_CREATETEST == 0) {