diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js index 695a213..ee3b436 100644 --- a/src/components/CustomPages/SE/SE018EditPage.js +++ b/src/components/CustomPages/SE/SE018EditPage.js @@ -1,7 +1,7 @@ import { message } from "antd/lib/index"; import { Button, Popconfirm, Row, Col, Checkbox, Radio, Form, Input, Select, Table, Upload, Icon, PageHeader, Modal } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude, showUserSign, showFiles, GetFileModel } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude, showUserSign, showFiles, GetFileModel, getArryPropShow } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import styles from '../../CustomPages/HI/StepForm.css'; import XLSX from 'xlsx'; @@ -58,6 +58,7 @@ class SE018EditPage extends React.Component { extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment'); extendInclude(json, 'Nav_Notify.Nav_LaunchUser'); extendInclude(json, 'Nav_Notify.Nav_TrainType'); + extendInclude(json, 'Nav_Notify.Nav_ListCour.Nav_Cour'); // extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); extendInclude(json, 'Nav_Users.Nav_User'); extendInclude(json, 'Nav_Files.Nav_ImgFile'); @@ -283,6 +284,12 @@ class SE018EditPage extends React.Component { }).join('、') } + + 培训课件 + { + getArryPropShow(data?.Nav_Notify?.Nav_ListCour, "Nav_Cour.NAME") + } + 请假人员 diff --git a/src/components/CustomPages/SE/SE018PaperPage.js b/src/components/CustomPages/SE/SE018PaperPage.js index c800fd6..e89bce2 100644 --- a/src/components/CustomPages/SE/SE018PaperPage.js +++ b/src/components/CustomPages/SE/SE018PaperPage.js @@ -62,7 +62,8 @@ class SE018PaperPage extends React.Component { let json = initFilter(this.props.login.OrgId); json.Parameter22 = this.props.data.ORG_ID_HV; json.OrgType = 2; - extendRule(json, 'RECORD_ID', 1, this.props.data.id); + // extendRule(json, 'RECORD_ID', 1, this.props.data.id); + extendRule(json, 'TEXT_ID', 1, this.props.data.id); extendInclude(json, 'Nav_User'); this.state.loading = true; this.props.dispatch({ @@ -111,7 +112,8 @@ class SE018PaperPage extends React.Component { let json = initFilter(this.props.login.OrgId, '', 'Nav_Test.TYPE', 1); json.Parameter22 = this.props.data.ORG_ID_HV; json.OrgType = 2; - extendRule(json, 'RECORD_ID', 1, this.props.data.id); + // extendRule(json, 'RECORD_ID', 1, this.props.data.id); + extendRule(json, 'TEXT_ID', 1, this.props.data.id); extendRule(json, 'USER_ID', 1, SelUsrID); extendInclude(json, 'Nav_Record'); extendInclude(json, 'Nav_Record.Nav_Notify'); @@ -440,8 +442,9 @@ class SE018PaperPage extends React.Component { { it.Nav_Test.TYPE === 0 ? - this.doOptionChange(it, idx, 1, evt)} /> - 正确 + this.doOptionChange(it, idx, 1, evt)} >正确 + {/* this.doOptionChange(it, idx, 1, evt)} /> + 正确 */} : @@ -460,8 +463,9 @@ class SE018PaperPage extends React.Component { { it.Nav_Test.TYPE === 0 ? - this.doOptionChange(it, idx, 2, evt)} /> - 错误 + this.doOptionChange(it, idx, 2, evt)} >错误 + {/* this.doOptionChange(it, idx, 2, evt)} /> + 错误 */} :