diff --git a/src/components/CustomPages/SE/SE063ShowPrint.js b/src/components/CustomPages/SE/SE063ShowPrint.js
index 787d686..bcca1f8 100644
--- a/src/components/CustomPages/SE/SE063ShowPrint.js
+++ b/src/components/CustomPages/SE/SE063ShowPrint.js
@@ -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
@@ -162,9 +173,9 @@ class SE063ShowPrint extends React.Component {
| 开始时间 |
- {moment(it.Nav_NewUser.START_TIME).format('YYYY-MM-DD')} |
+ {it.Nav_NewUser.START_TIME == null ? '' : moment(it.Nav_NewUser.START_TIME).format('YYYY-MM-DD HH:mm')} |
结束时间 |
- {moment(it.Nav_NewUser.END_TIME).format('YYYY-MM-DD')} |
+ {it.Nav_NewUser.END_TIME == null ? '' : moment(it.Nav_NewUser.END_TIME).format('YYYY-MM-DD HH:mm')} |
培训地点 |
{it.Nav_NewUser.TAINNING_ADDR} |
组织部门 |
@@ -177,10 +188,12 @@ class SE063ShowPrint extends React.Component {
{it.Nav_NewUser.TRAINNING_TIME} |
培训老师 |
- {it.Nav_NewUser.TEACHER} |
+ {getArryPropShow(it.Nav_NewUser.Nav_Teachers, "Nav_User.NAME")} |
+ {/* {it.Nav_NewUser.TEACHER} | */}
培训形式 |
- {this.returnModel(it.Nav_NewUser.TRAIN_MODEL)} |
+ {enums.TrainType.enums[it.Nav_NewUser?.TRAINTYPE]} |
+ {/* {this.returnModel(it.Nav_NewUser.TRAIN_MODEL)} | */}
考核结果 |
{this.fmtEnum('SEExaminationResultsEnum', it.EXAMINATION_RESULTS)} |
@@ -197,7 +210,10 @@ class SE063ShowPrint extends React.Component {
签名 |
{
- it.Nav_User && it.Nav_User.FILE_PATH && it.Nav_User.FILE_PATH.length > 0 && it.STATUS == 1 ? :
+ it.ISSIGN && it.ISSIGN !== 0 ?
+ (it.Nav_User && it.Nav_User.FILE_PATH && it.Nav_User.FILE_PATH.length > 0 && it.STATUS == 1 ? : )
+ : ()
+ // 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 ? :
}
|
diff --git a/src/files/edit/SE061.js b/src/files/edit/SE061.js
index f27884e..d07400f 100644
--- a/src/files/edit/SE061.js
+++ b/src/files/edit/SE061.js
@@ -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) {