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

Compare commits

base: wyw:44190267644351c2f03fc4a0e27d91a8b3d9dd9a
Branches Tags
wyw:master
..
compare: wyw:d93bacc9045bb961e5a23ee13070593940485ad4
Branches Tags
wyw:master

No commits in common. "44190267644351c2f03fc4a0e27d91a8b3d9dd9a" and "d93bacc9045bb961e5a23ee13070593940485ad4" have entirely different histories.
4419026764 ... d93bacc904

23 changed files with 22 additions and 53 deletions
Show Stats Expand all files Collapse all files

3
src/components/CustomPages/SE/SE001EditPage.js
View File

@ -99,7 +99,6 @@ class SE001EditPage extends React.Component {
if (this.props.data.id == "") if (this.props.data.id == "")
return; return;
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
extendInclude(json, 'Nav_Posts'); extendInclude(json, 'Nav_Posts');
extendInclude(json, 'Nav_Posts.Nav_Post'); extendInclude(json, 'Nav_Posts.Nav_Post');
@ -288,7 +287,7 @@ class SE001EditPage extends React.Component {
onComplete: (ret) => { onComplete: (ret) => {
if (ret) { if (ret) {
message.success('保存成功！'); message.success('保存成功！');
if (this.state.data.CREATE_TIME == undefined) { if (this.state.data.CREATE_TIME==undefined) {
this.state.data = {}; this.state.data = {};
this.state.TYPE = null; this.state.TYPE = null;
this.state.NAME = ""; this.state.NAME = "";

2
src/components/CustomPages/SE/SE005ReportEdit.js
View File

@ -44,7 +44,6 @@ class SE005ReportEdit extends React.Component {
} }
loadList = () => { loadList = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.OrgType = 2; json.OrgType = 2;
this.setState({ loading: true }) this.setState({ loading: true })
this.props.dispatch({ this.props.dispatch({
@ -75,7 +74,6 @@ class SE005ReportEdit extends React.Component {
} }
loadData = () => { loadData = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.OrgType = 2; json.OrgType = 2;
json.Parameter3 = this.state.type; json.Parameter3 = this.state.type;
if (this.state.ALL) { if (this.state.ALL) {

3
src/components/CustomPages/SE/SE005ShowPrint.js
View File

@ -37,7 +37,6 @@ class SE005ShowPrint extends React.Component {
if (this.props.data.id == "") if (this.props.data.id == "")
return; return;
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.OrgType = 2; json.OrgType = 2;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
extendInclude(json, 'Nav_LaunchDepartment'); extendInclude(json, 'Nav_LaunchDepartment');
@ -92,7 +91,7 @@ class SE005ShowPrint extends React.Component {
<Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button> <Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
</div> </div>
<div ref={el => (this.componentRef = el)} id={'tableId' + this.props.data.id} style={{ padding: '20px' }}> <div ref={el => (this.componentRef = el)} id={'tableId' + this.props.data.id} style={{ padding: '20px' }}>
<h1 style={{ textAlign: 'center' }}>安全意识调查问卷</h1> <h1 style={{ textAlign: 'center'}}>安全意识调查问卷</h1>
<table style={{ width: '100%', textAlign: 'center', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}> <table style={{ width: '100%', textAlign: 'center', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
<tbody> <tbody>
<tr> <tr>

5
src/components/CustomPages/SE/SE007AllView.js
View File

@ -15,7 +15,7 @@ class SE007AllView extends React.Component {
data: null, data: null,
total: 0, total: 0,
reportCount: 0, reportCount: 0,
year: new Date().getFullYear(), year:new Date().getFullYear(),
}; };
}; };
@ -28,7 +28,6 @@ class SE007AllView extends React.Component {
} }
loadData = () => { loadData = () => {
let json = initFilter(this.props.login.OrgId, '', null, null); let json = initFilter(this.props.login.OrgId, '', null, null);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.PageIndex = 1; json.PageIndex = 1;
json.Limit = 100; json.Limit = 100;
json.Start = 0; json.Start = 0;
@ -130,7 +129,7 @@ class SE007AllView extends React.Component {
content={() => this.componentRef} content={() => this.componentRef}
/> />
<Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button> <Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Input style={{ width: '100px', marginLeft: '8px' }} onChange={(evt) => this.onChange(evt.target.value)} placeholder="统计年份" value={this.state.year} /> <Input style={{width:'100px',marginLeft:'8px'}} onChange={(evt) => this.onChange(evt.target.value)} placeholder="统计年份" value={this.state.year}/>
<Button type={'primary'} style={{ marginLeft: '8px' }} onClick={() => this.loadData()} >查询</Button> <Button type={'primary'} style={{ marginLeft: '8px' }} onClick={() => this.loadData()} >查询</Button>
</div> </div>

3
src/components/CustomPages/SE/SE007ShowPrint.js
View File

@ -53,7 +53,6 @@ class SE007ShowPrint extends React.Component {
if (this.props.data.id == "") if (this.props.data.id == "")
return; return;
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
extendSelectField(json, 'NAME'); extendSelectField(json, 'NAME');
extendSelectField(json, 'LAUNCH_TIME'); extendSelectField(json, 'LAUNCH_TIME');
@ -68,7 +67,7 @@ class SE007ShowPrint extends React.Component {
extendSelectField(json, 'Nav_Demands.OK'); extendSelectField(json, 'Nav_Demands.OK');
extendSelectField(json, 'Nav_Demands.OTHER'); extendSelectField(json, 'Nav_Demands.OTHER');
extendSelectField(json, 'Nav_Demands.Nav_User.NAME'); extendSelectField(json, 'Nav_Demands.Nav_User.NAME');
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
payload: json, payload: json,

34
src/components/CustomPages/SE/SE009ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index"; import { message } from "antd/lib/index";
import { Button, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; import { Button, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react'; import React from 'react';
import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, extendOrder } from "../../../utils/common"; import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter,extendOrder } 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';
@ -38,7 +38,6 @@ class SE009ShowPrint extends React.Component {
return; return;
} }
let json = initFilter(this.props.login.OrgId, data.ID); let json = initFilter(this.props.login.OrgId, data.ID);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Parameter1 = ok ? '1' : '0' json.Parameter1 = ok ? '1' : '0'
json.OrgType = 2; json.OrgType = 2;
this.props.dispatch({ this.props.dispatch({
@ -60,7 +59,6 @@ class SE009ShowPrint extends React.Component {
} }
loadData = () => { loadData = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
extendInclude(json, 'Nav_LaunchDepartment'); extendInclude(json, 'Nav_LaunchDepartment');
extendInclude(json, 'Nav_LaunchUser'); extendInclude(json, 'Nav_LaunchUser');
@ -76,7 +74,7 @@ class SE009ShowPrint extends React.Component {
url: 'SE/DepTrainPlan/Get', url: 'SE/DepTrainPlan/Get',
onComplete: (ret) => { onComplete: (ret) => {
if (ret) { if (ret) {
ret.Nav_DepTrainPlanDetail.sort((a, b) => { return a.MOON - b.MOON }); ret.Nav_DepTrainPlanDetail.sort((a,b)=>{return a.MOON-b.MOON});
this.onClickApprove(false); this.onClickApprove(false);
this.setState({ data: ret }) this.setState({ data: ret })
} }
@ -108,22 +106,22 @@ class SE009ShowPrint extends React.Component {
tmpData: newtmpData, tmpData: newtmpData,
}); });
} }
returnModel(level) { returnModel(level){
let str = ''; let str='';
if (level == undefined) { if(level==undefined){
return str; return str;
} }
if (level.indexOf('1') >= 0) { if(level.indexOf('1')>=0){
str += '讲授法 '; str+='讲授法 ';
} }
if (level.indexOf('2') >= 0) { if(level.indexOf('2')>=0){
str += '视听法 '; str+='视听法 ';
} }
if (level.indexOf('3') >= 0) { if(level.indexOf('3')>=0){
str += '研讨法 '; str+='研讨法 ';
} }
if (level.indexOf('4') >= 0) { if(level.indexOf('4')>=0){
str += '演示法 '; str+='演示法 ';
} }
return str; return str;
} }
@ -148,14 +146,14 @@ class SE009ShowPrint extends React.Component {
{/* 部门培训计划 */} {/* 部门培训计划 */}
<div ref={el => (this.componentRef = el)} id={'tableId' + this.props.data.id} style={{ padding: '20px' }}> <div ref={el => (this.componentRef = el)} id={'tableId' + this.props.data.id} style={{padding: '20px' }}>
<h1 style={{ textAlign: 'center' }}>部门培训计划</h1> <h1 style={{ textAlign: 'center' }}>部门培训计划</h1>
{ {
data ? data ?
<div> <div>
<table style={{ width: '100%', textAlign: 'center', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}> <table style={{ width: '100%', textAlign: 'center', borderTop: '1px solid #333', borderLeft: '1px solid #333'}} className={styles.PrintForm}>
<tbody> <tbody>
<tr style={{ margin: '0 0 20px 0' }}> <tr style={{margin: '0 0 20px 0' }}>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>计划年度</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>计划年度</td>
<td colSpan={3} rowSpan={1} >{data.PLAN_YEAR}</td> <td colSpan={3} rowSpan={1} >{data.PLAN_YEAR}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>起止时间</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>起止时间</td>

1
src/components/CustomPages/SE/SE011ShowPrint.js
View File

@ -32,7 +32,6 @@ class SE011ShowPrint extends React.Component {
} }
loadData = () => { loadData = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
extendInclude(json, 'Nav_LaunchDepartment'); extendInclude(json, 'Nav_LaunchDepartment');
extendInclude(json, 'Nav_LaunchUser'); extendInclude(json, 'Nav_LaunchUser');

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

@ -40,7 +40,7 @@ class SE013ShowPrint extends React.Component {
} }
loadData = () => { loadData = () => {
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;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
extendInclude(json, 'Nav_LaunchDepartment'); extendInclude(json, 'Nav_LaunchDepartment');
extendInclude(json, 'Nav_LaunchUser'); extendInclude(json, 'Nav_LaunchUser');

3
src/components/CustomPages/SE/SE015ShowPrint.js
View File

@ -57,7 +57,6 @@ class SE015ShowPrint extends React.Component {
loadData = (dataId) => { loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId); extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_LaunchDepartment'); extendInclude(json, 'Nav_LaunchDepartment');
extendInclude(json, 'Nav_LaunchUser'); extendInclude(json, 'Nav_LaunchUser');
@ -105,7 +104,6 @@ class SE015ShowPrint extends React.Component {
onTableBtnApprove = () => { onTableBtnApprove = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Parameter1 = this.props.data.id; json.Parameter1 = this.props.data.id;
json.Parameter2 = this.props.data.TaskID; json.Parameter2 = this.props.data.TaskID;
this.props.dispatch({ this.props.dispatch({
@ -125,7 +123,6 @@ class SE015ShowPrint extends React.Component {
} }
personalApprove = () => { personalApprove = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Parameter1 = this.props.data.id; json.Parameter1 = this.props.data.id;
json.Parameter2 = this.props.data.TaskID; json.Parameter2 = this.props.data.TaskID;
this.props.dispatch({ this.props.dispatch({

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

@ -51,7 +51,6 @@ class SE018EditPage extends React.Component {
} }
loadData = (dataId) => { loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId, '', null, null, null); let json = initFilter(this.props.login.OrgId, '', null, null, null);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId); extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_Notify'); extendInclude(json, 'Nav_Notify');
extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point');
@ -114,7 +113,6 @@ class SE018EditPage extends React.Component {
} }
onApprove = () => { onApprove = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Keyword = this.props.data.id; json.Keyword = this.props.data.id;
json.Parameter1 = this.props.data.TaskID; json.Parameter1 = this.props.data.TaskID;
this.props.dispatch({ this.props.dispatch({
@ -139,7 +137,6 @@ class SE018EditPage extends React.Component {
} }
this.state.isClisk = true; this.state.isClisk = true;
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Keyword = this.props.data.id; json.Keyword = this.props.data.id;
json.Parameter1 = this.props.data.TaskID; json.Parameter1 = this.props.data.TaskID;
this.props.dispatch({ this.props.dispatch({

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

@ -60,7 +60,6 @@ class SE018PaperPage extends React.Component {
} }
getUsers = () => { getUsers = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
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);
extendInclude(json, 'Nav_User'); extendInclude(json, 'Nav_User');
@ -109,7 +108,6 @@ 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.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, 'USER_ID', 1, SelUsrID); extendRule(json, 'USER_ID', 1, SelUsrID);

1
src/components/CustomPages/SE/SE019ShowPrint.js
View File

@ -59,7 +59,6 @@ class SE019ShowPrint extends React.Component {
if (this.props.data.id == "") if (this.props.data.id == "")
return; return;
let json = initFilter(this.props.login.OrgId, '', null, null, null); let json = initFilter(this.props.login.OrgId, '', null, null, null);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
json.OrgType = 2; json.OrgType = 2;
extendInclude(json, 'Nav_OpinionList'); extendInclude(json, 'Nav_OpinionList');

1
src/components/CustomPages/SE/SE021ShowPrint.js
View File

@ -31,7 +31,6 @@ class SE021ShowPrint extends React.Component {
if (this.props.data.id == "") if (this.props.data.id == "")
return; return;
let json = initFilter(this.props.login.OrgId, '', null, null, null); let json = initFilter(this.props.login.OrgId, '', null, null, null);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id); extendRule(json, 'ID', 1, this.props.data.id);
json.OrgType = 2; json.OrgType = 2;
extendInclude(json, 'Nav_User'); extendInclude(json, 'Nav_User');

1
src/components/CustomPages/SE/SE049ShowPrint.js
View File

@ -34,7 +34,6 @@ class SE049ShowPrint extends React.Component {
} }
loadData = () => { loadData = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Parameter1 = this.props.data.id; json.Parameter1 = this.props.data.id;
json.IgnoreDataRule = true; json.IgnoreDataRule = true;
this.props.dispatch({ this.props.dispatch({

1
src/components/CustomPages/SE/SE051ShowPrint.js
View File

@ -152,7 +152,6 @@ class SE051ShowPrint extends React.Component {
let startTime = this.state.selectStartTime.format("YYYY-MM-DD"); let startTime = this.state.selectStartTime.format("YYYY-MM-DD");
let endTime = this.state.selectEndTime.format("YYYY-MM-DD"); let endTime = this.state.selectEndTime.format("YYYY-MM-DD");
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, "START_TIME", 6, startTime); extendRule(json, "START_TIME", 6, startTime);
extendRule(json, "START_TIME", 4, endTime); extendRule(json, "START_TIME", 4, endTime);
json.Parameter1 = this.props.data.parentRecord.CODE; json.Parameter1 = this.props.data.parentRecord.CODE;

1
src/components/CustomPages/SE/SE061ShowPrint.js
View File

@ -98,7 +98,6 @@ class SE061ShowPrint extends React.Component {
loadData = (id) => { loadData = (id) => {
var orgId = this.props.login ? this.props.login.OrgId : ''; var orgId = this.props.login ? this.props.login.OrgId : '';
let json = initFilter(orgId); let json = initFilter(orgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, id); extendRule(json, 'ID', 1, id);
extendInclude(json, 'Nav_Department') extendInclude(json, 'Nav_Department')
extendInclude(json, 'Nav_User') extendInclude(json, 'Nav_User')

2
src/components/CustomPages/SE/SE062ShowPrint.js
View File

@ -42,7 +42,6 @@ class SE062ShowPrint extends React.Component {
if (dataId == "") if (dataId == "")
return; return;
let json = initFilter(this.props.login.OrgId, '', null, null, null); let json = initFilter(this.props.login.OrgId, '', null, null, null);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId); extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_NewUser.Nav_Department'); extendInclude(json, 'Nav_NewUser.Nav_Department');
extendInclude(json, 'Nav_NewUser.Nav_User'); extendInclude(json, 'Nav_NewUser.Nav_User');
@ -103,7 +102,6 @@ class SE062ShowPrint extends React.Component {
} }
onTableBtnSignin() { onTableBtnSignin() {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Parameter1 = this.props.data.id; json.Parameter1 = this.props.data.id;
json.Parameter2 = this.props.data.TaskID; json.Parameter2 = this.props.data.TaskID;
json.Parameter3 = this.state.data.EDU_CARD_ID; json.Parameter3 = this.state.data.EDU_CARD_ID;

1
src/components/CustomPages/SE/SE063ShowPrint.js
View File

@ -58,7 +58,6 @@ class SE063ShowPrint extends React.Component {
loadData = (dataId) => { loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
let userID = this.props.data.parentRecord.USER_ID; let userID = this.props.data.parentRecord.USER_ID;
extendRule(json, 'USERID', 1, userID); extendRule(json, 'USERID', 1, userID);
json.IgnoreDataRule = true; json.IgnoreDataRule = true;

1
src/components/CustomPages/SE/SE071ShowPrint.js
View File

@ -56,7 +56,6 @@ class SE071ShowPrint extends React.Component {
var isCheck = (this.props.data.tableKey != undefined && this.props.data.tableKey == '1') ? true : false var isCheck = (this.props.data.tableKey != undefined && this.props.data.tableKey == '1') ? true : false
var orgId = this.props.login ? this.props.login.OrgId : ''; var orgId = this.props.login ? this.props.login.OrgId : '';
let json = initFilter(orgId); let json = initFilter(orgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, id); extendRule(json, 'ID', 1, id);
extendInclude(json, 'Nav_Department') extendInclude(json, 'Nav_Department')
extendInclude(json, 'Nav_User') extendInclude(json, 'Nav_User')

1
src/components/CustomPages/SE/SEConfigPage.js
View File

@ -44,7 +44,6 @@ class SEConfigPage extends React.Component {
} }
loadData = () => { loadData = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
payload: json, payload: json,

2
src/components/CustomPages/SE/SESafeSurveyTest.js
View File

@ -57,7 +57,6 @@ class SESafeSurveyTest extends React.Component {
} }
getUsers = () => { getUsers = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.OrgType = 2; json.OrgType = 2;
extendRule(json, 'SAFE_ID', 1, this.props.data.id); extendRule(json, 'SAFE_ID', 1, this.props.data.id);
extendInclude(json, 'Nav_User'); extendInclude(json, 'Nav_User');
@ -102,7 +101,6 @@ class SESafeSurveyTest extends React.Component {
return; return;
} }
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.OrgType = 2; json.OrgType = 2;
extendRule(json, 'SAFE_ID', 1, this.props.data.id); extendRule(json, 'SAFE_ID', 1, this.props.data.id);
extendRule(json, 'USER_ID', 1, SelUsrID); extendRule(json, 'USER_ID', 1, SelUsrID);

1
src/components/CustomPages/SK/SK002CheckList.js
View File

@ -119,7 +119,6 @@ class SK002CheckList extends React.Component {
loadData = () => { loadData = () => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendInclude(json, 'Nav_Details'); extendInclude(json, 'Nav_Details');
extendInclude(json, 'Nav_ProductionUnit'); extendInclude(json, 'Nav_ProductionUnit');
extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Contents'); extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Contents');

1
src/components/CustomPages/SK/SK002ShowPrint.js
View File

@ -116,7 +116,6 @@ class SK002ShowPrint extends React.Component {
loadData = (dataId) => { loadData = (dataId) => {
let that=this; let that=this;
let json = initFilter(that.props.login.OrgId); let json = initFilter(that.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId); extendRule(json, 'ID', 1, dataId);
// extendInclude(json, 'Nav_Type'); // extendInclude(json, 'Nav_Type');
// extendInclude(json, 'Nav_Details'); // extendInclude(json, 'Nav_Details');