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

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

@ -99,7 +99,6 @@ class SE001EditPage extends React.Component {
if (this.props.data.id == "")
return;
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id);
extendInclude(json, 'Nav_Posts');
extendInclude(json, 'Nav_Posts.Nav_Post');

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

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

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

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

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

@ -28,7 +28,6 @@ class SE007AllView extends React.Component {
}
loadData = () => {
let json = initFilter(this.props.login.OrgId, '', null, null);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.PageIndex = 1;
json.Limit = 100;
json.Start = 0;

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

@ -53,7 +53,6 @@ class SE007ShowPrint extends React.Component {
if (this.props.data.id == "")
return;
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id);
extendSelectField(json, 'NAME');
extendSelectField(json, 'LAUNCH_TIME');

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

@ -38,7 +38,6 @@ class SE009ShowPrint extends React.Component {
return;
}
let json = initFilter(this.props.login.OrgId, data.ID);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Parameter1 = ok ? '1' : '0'
json.OrgType = 2;
this.props.dispatch({
@ -60,7 +59,6 @@ class SE009ShowPrint extends React.Component {
}
loadData = () => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, this.props.data.id);
extendInclude(json, 'Nav_LaunchDepartment');
extendInclude(json, 'Nav_LaunchUser');

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

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

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

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

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

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

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

@ -60,7 +60,6 @@ class SE018PaperPage extends React.Component {
}
getUsers = () => {
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);
extendInclude(json, 'Nav_User');
@ -109,7 +108,6 @@ 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, '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 == "")
return;
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);
json.OrgType = 2;
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 == "")
return;
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);
json.OrgType = 2;
extendInclude(json, 'Nav_User');

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

@ -34,7 +34,6 @@ class SE049ShowPrint extends React.Component {
}
loadData = () => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
json.Parameter1 = this.props.data.id;
json.IgnoreDataRule = true;
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 endTime = this.state.selectEndTime.format("YYYY-MM-DD");
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", 4, endTime);
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) => {
var orgId = this.props.login ? this.props.login.OrgId : '';
let json = initFilter(orgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, id);
extendInclude(json, 'Nav_Department')
extendInclude(json, 'Nav_User')

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

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

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

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

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

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