wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:50dd70aa9c303b9fb54013b624b3b844bc32dcc2
Branches Tags
wyw:master
..
compare: wyw:6608655ed1c5ff43769cd762b7edc9d31eabbde4
Branches Tags
wyw:master

No commits in common. "50dd70aa9c303b9fb54013b624b3b844bc32dcc2" and "6608655ed1c5ff43769cd762b7edc9d31eabbde4" have entirely different histories.
50dd70aa9c ... 6608655ed1

3 changed files with 8 additions and 30 deletions
Show Stats Expand all files Collapse all files

13
src/components/CustomPages/SE/SE013ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index"; import { message } from "antd/lib/index";
import { Button, Modal, Row, Col, Form, Input, Select, Table } from 'antd'; import { Button, Modal, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react'; import React from 'react';
import { initFilter, extendRule, extendInclude, setDataFieldValue, getArryPropShow, showFiles, GetFileModel } from "../../../utils/common"; import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print"; import ReactToPrint from "react-to-print";
import styles from '../../CustomPages/HI/StepForm.css'; import styles from '../../CustomPages/HI/StepForm.css';
import XLSX from 'xlsx'; import XLSX from 'xlsx';
@ -52,7 +52,6 @@ class SE013ShowPrint extends React.Component {
extendInclude(json, 'Nav_TrainUserList'); extendInclude(json, 'Nav_TrainUserList');
extendInclude(json, 'Nav_TrainUserList.Nav_User'); extendInclude(json, 'Nav_TrainUserList.Nav_User');
extendInclude(json, 'Nav_Files.Nav_ImgFile'); extendInclude(json, 'Nav_Files.Nav_ImgFile');
extendInclude(json, 'Nav_ListCour.Nav_Cour');
json.IgnoreDataRule = true; json.IgnoreDataRule = true;
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
@ -239,16 +238,6 @@ class SE013ShowPrint extends React.Component {
} }
</td> </td>
</tr> </tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>课件</td>
<td colSpan={20} rowSpan={1}>{
getArryPropShow(data.Nav_ListCour, "Nav_Cour.NAME")
// data.Nav_ListCour ? data.Nav_ListCour.map(t => {
// return <li>{t.Nav_Cour.NAME}</li>
// }) : ''
}
</td>
</tr>
<tr> <tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训安排及要求</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训安排及要求</td>
<td colSpan={20} rowSpan={1} >{data.TRAIN_PLAN}</td> <td colSpan={20} rowSpan={1} >{data.TRAIN_PLAN}</td>

9
src/components/CustomPages/SE/SE018EditPage.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index"; import { message } from "antd/lib/index";
import { Button, Popconfirm, Row, Col, Checkbox, Radio, Form, Input, Select, Table, Upload, Icon, PageHeader, Modal } from 'antd'; import { Button, Popconfirm, Row, Col, Checkbox, Radio, Form, Input, Select, Table, Upload, Icon, PageHeader, Modal } from 'antd';
import React from 'react'; import React from 'react';
import { initFilter, extendRule, extendInclude, showUserSign, showFiles, GetFileModel, getArryPropShow } from "../../../utils/common"; import { initFilter, extendRule, extendInclude, showUserSign, showFiles, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print"; import ReactToPrint from "react-to-print";
import styles from '../../CustomPages/HI/StepForm.css'; import styles from '../../CustomPages/HI/StepForm.css';
import XLSX from 'xlsx'; import XLSX from 'xlsx';
@ -58,7 +58,6 @@ class SE018EditPage extends React.Component {
extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment'); extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment');
extendInclude(json, 'Nav_Notify.Nav_LaunchUser'); extendInclude(json, 'Nav_Notify.Nav_LaunchUser');
extendInclude(json, 'Nav_Notify.Nav_TrainType'); extendInclude(json, 'Nav_Notify.Nav_TrainType');
extendInclude(json, 'Nav_Notify.Nav_ListCour.Nav_Cour');
// extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); // extendInclude(json, 'Nav_Notify.Nav_TrainCheckType');
extendInclude(json, 'Nav_Users.Nav_User'); extendInclude(json, 'Nav_Users.Nav_User');
extendInclude(json, 'Nav_Files.Nav_ImgFile'); extendInclude(json, 'Nav_Files.Nav_ImgFile');
@ -284,12 +283,6 @@ class SE018EditPage extends React.Component {
}).join('、') }).join('、')
}</td> }</td>
</tr> </tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训课件</td>
<td colSpan={20} rowSpan={1} >{
getArryPropShow(data?.Nav_Notify?.Nav_ListCour, "Nav_Cour.NAME")
}</td>
</tr>
<tr> <tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>请假人员</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>请假人员</td>
<td colSpan={20} rowSpan={1} > <td colSpan={20} rowSpan={1} >

16
src/components/CustomPages/SE/SE018PaperPage.js
View File

@ -62,8 +62,7 @@ class SE018PaperPage extends React.Component {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV; json.Parameter22 = this.props.data.ORG_ID_HV;
json.OrgType = 2; 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'); extendInclude(json, 'Nav_User');
this.state.loading = true; this.state.loading = true;
this.props.dispatch({ this.props.dispatch({
@ -112,8 +111,7 @@ class SE018PaperPage extends React.Component {
let json = initFilter(this.props.login.OrgId, '', 'Nav_Test.TYPE', 1); let json = initFilter(this.props.login.OrgId, '', 'Nav_Test.TYPE', 1);
json.Parameter22 = this.props.data.ORG_ID_HV; json.Parameter22 = this.props.data.ORG_ID_HV;
json.OrgType = 2; 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); extendRule(json, 'USER_ID', 1, SelUsrID);
extendInclude(json, 'Nav_Record'); extendInclude(json, 'Nav_Record');
extendInclude(json, 'Nav_Record.Nav_Notify'); extendInclude(json, 'Nav_Record.Nav_Notify');
@ -442,9 +440,8 @@ class SE018PaperPage extends React.Component {
{ {
it.Nav_Test.TYPE === 0 ? it.Nav_Test.TYPE === 0 ?
<td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 1) != 0) ? styles.answer : null}> <td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 1) != 0) ? styles.answer : null}>
<Radio disabled={this.state.readonly} checked={(it.ANSWER & 1) != 0} onChange={evt => this.doOptionChange(it, idx, 1, evt)} >正确</Radio> <Radio disabled={this.state.readonly} checked={(it.ANSWER & 1) != 0} onChange={evt => this.doOptionChange(it, idx, 1, evt)} />
{/* <Radio disabled={this.state.readonly} checked={(it.ANSWER & 1) != 0} onChange={evt => this.doOptionChange(it, idx, 1, evt)} /> <span>正确</span>
<span>正确</span> */}
</td> </td>
: :
<td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 1) != 0) ? styles.answer : null}> <td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 1) != 0) ? styles.answer : null}>
@ -463,9 +460,8 @@ class SE018PaperPage extends React.Component {
{ {
it.Nav_Test.TYPE === 0 ? it.Nav_Test.TYPE === 0 ?
<td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 2) != 0) ? styles.answer : null}> <td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 2) != 0) ? styles.answer : null}>
<Radio disabled={this.state.readonly} checked={(it.ANSWER & 2) != 0} onChange={evt => this.doOptionChange(it, idx, 2, evt)} >错误</Radio> <Radio disabled={this.state.readonly} checked={(it.ANSWER & 2) != 0} onChange={evt => this.doOptionChange(it, idx, 2, evt)} />
{/* <Radio disabled={this.state.readonly} checked={(it.ANSWER & 2) != 0} onChange={evt => this.doOptionChange(it, idx, 2, evt)} /> <span>错误</span>
<span>错误</span> */}
</td> </td>
: :
<td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 2) != 0) ? styles.answer : null}> <td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 2) != 0) ? styles.answer : null}>