diff --git a/src/components/CustomPages/SE/SE061ShowPrint.js b/src/components/CustomPages/SE/SE061ShowPrint.js index 69d61ac..5daf395 100644 --- a/src/components/CustomPages/SE/SE061ShowPrint.js +++ b/src/components/CustomPages/SE/SE061ShowPrint.js @@ -1,6 +1,6 @@ import { Button, Descriptions, Modal, Popconfirm, Row, Col, Form, Input, Select, Table, Icon } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, GetFileModel, showFiles } from '../../../utils/common'; +import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, GetFileModel, showFiles, getArryPropShow } from '../../../utils/common'; import ReactToPrint from 'react-to-print'; import { ExportToExcel } from '@woowalker/feui' import XLSX from 'xlsx'; @@ -103,6 +103,7 @@ class SE061ShowPrint extends React.Component { extendInclude(json, 'Nav_Department') extendInclude(json, 'Nav_User') extendInclude(json, 'Nav_Content') + extendInclude(json, 'Nav_Teachers.Nav_User') extendInclude(json, 'Nav_Files.Nav_ImgFile') extendInclude(json, 'Nav_NewUserDetail.Nav_User') extendInclude(json, 'Nav_NewUserDetail.Nav_Department') @@ -140,7 +141,7 @@ class SE061ShowPrint extends React.Component {
(this.componentRef = el)} style={{ padding: '20px', paddingTop: '20px' }} id={'tableId' + this.props.data.id}>

三级安全教育记录

{ - data ?
+ data ?
{data.Nav_Department.NAME} {data.Nav_User.NAME} @@ -149,8 +150,8 @@ class SE061ShowPrint extends React.Component { {data.END_TIME} {data.TRAINNING_TIME} {data.TAINNING_ADDR} - {data.TEACHER} - {data ? this.returnModel(data.TRAIN_MODEL) : null} + {getArryPropShow(data.Nav_Teachers, "Nav_User.NAME")} + {enums.TrainType.enums[data.TRAINTYPE]} {data.Nav_Content.NAME} {showFiles(data.Nav_Files, config.picServerHost, this)} {data.IS_CREATETEST ? "是" : "否"} diff --git a/src/files/edit/PF155.js b/src/files/edit/PF155.js index 5242924..11c90e8 100644 --- a/src/files/edit/PF155.js +++ b/src/files/edit/PF155.js @@ -38,7 +38,12 @@ export default { onBlur={(editorState) => { const htmlContent = editorState.toHTML(); if (params.record.TITLE != htmlContent) { - params.setFieldValue('TITLE', htmlContent); + var plainText = htmlContent.replace(/<[^>]+>/g, ''); + const temps = []; + temps.push({ field: 'TITLE', value: htmlContent }) + temps.push({ field: 'TITLE_SHOW', value: plainText }) + params.setFieldValueByBatch(temps); + // params.setFieldValue('TITLE', htmlContent); } }} placeholder={placeholder}