diff --git a/src/components/CustomPages/PF/FormConfigSqlPage.js b/src/components/CustomPages/PF/FormConfigSqlPage.js
index 3d32e33..9d6ebb6 100644
--- a/src/components/CustomPages/PF/FormConfigSqlPage.js
+++ b/src/components/CustomPages/PF/FormConfigSqlPage.js
@@ -250,6 +250,7 @@ class FormConfigSqlPage extends React.Component {
+
diff --git a/src/components/CustomPages/SE/SE005ReportEdit.js b/src/components/CustomPages/SE/SE005ReportEdit.js
index 1cd9347..ad346f2 100644
--- a/src/components/CustomPages/SE/SE005ReportEdit.js
+++ b/src/components/CustomPages/SE/SE005ReportEdit.js
@@ -104,10 +104,6 @@ class SE005ReportEdit extends React.Component {
}
onApprove = ()=>{
const { ALL,data } = this.state;
- const canApprove = !ALL && data && data.SURVEY && data.SURVEY.length == 1 && data.SURVEY[0].STATUS == 3 && data.SURVEY[0].LAUNCH_USER_ID == this.props.login.user.ID
- if (!canApprove){
- return;
- }
let json = {
Parameter1: data.SURVEY[0].ID,
Parameter2: this.props.data.TaskID,
@@ -153,7 +149,7 @@ class SE005ReportEdit extends React.Component {
const count = data && data.ROWS && data.ROWS.length > 0 && data.ROWS[0].length || 1;
const SPAN = Math.floor(24 / count) || 1;
const TITLE_SPAN = Math.max(24 - count * SPAN,0) + SPAN;
- const canApprove = !ALL && data && data.SURVEY && data.SURVEY.length == 1 && data.SURVEY[0].STATUS == 3 && data.SURVEY[0].LAUNCH_USER_ID == this.props.login.user.ID
+ const canApprove = this.props.data.tableKey == "1"
return
diff --git a/src/components/CustomPages/SE/SE015ShowPrint.js b/src/components/CustomPages/SE/SE015ShowPrint.js
index eb1209b..a1d9613 100644
--- a/src/components/CustomPages/SE/SE015ShowPrint.js
+++ b/src/components/CustomPages/SE/SE015ShowPrint.js
@@ -194,7 +194,7 @@ class SE015ShowPrint extends React.Component {
/>
{
- (data && data.STATUS === EduCardStatus['审阅中']) && this.props.data.tableKey != undefined && this.props.data.tableKey == "1" ?
+ (data && data.STATUS >= EduCardStatus['审阅中']) && this.props.data.tableKey != undefined && this.props.data.tableKey == "1" ?
: null
}
diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js
index 7c7d778..61cf03e 100644
--- a/src/components/CustomPages/SE/SE018EditPage.js
+++ b/src/components/CustomPages/SE/SE018EditPage.js
@@ -68,7 +68,7 @@ class SE018EditPage extends React.Component {
this.state.missUsers = data.Nav_Users.filter(item => item.STATUS == 2);
data.Nav_Users = data.Nav_Users.filter(item => item.STATUS == 0);
//安环部负责人审阅中
- if (data.STATUS == 2 && this.props.formCode != "SE050_SHOWPRINT" && this.props.data.tableKey != undefined) {
+ if (this.props.formCode != "SE050_SHOWPRINT" && this.props.data.tableKey != undefined) {
isApprove = true;
}
this.setState({
diff --git a/src/config.js b/src/config.js
index 730edc7..b6938e8 100644
--- a/src/config.js
+++ b/src/config.js
@@ -24,11 +24,11 @@ const config = {
flowServiceHost: "http://120.25.146.51:7188/",
hmiUrl: "http://localhost:8060/",
webSocketHost: 'ws://localhost:7140/',
- picServerHost: 'http://47.122.43.22:3199',
+ picServerHost: 'http://47.122.43.22:7199',
dataVUrl: "http://localhost:8062/home",
- version:version,
- guideSeverHost:"http://47.122.43.22/apk/",
- guideH5Host:"http://47.122.43.22:9100/",
+ version: version,
+ guideSeverHost: "http://47.122.43.22/apk/",
+ guideH5Host: "http://47.122.43.22:9100/",
},
cloud: {
serviceHost: api => {
@@ -39,11 +39,11 @@ const config = {
cookieDomain: "",
hmiUrl: "http://120.25.146.51:8098/",
webSocketHost: 'ws://120.25.146.51:7140/',
- picServerHost: 'http://120.25.146.51:3199',
+ picServerHost: 'http://120.25.146.51:7199',
dataVUrl: "http://120.25.146.51:7167/home",
- version:version,
- guideSeverHost:"http://www.xmmhe.com/apk/",
- guideH5Host:"http://www.xmmhe.com:9100/",
+ version: version,
+ guideSeverHost: "http://www.xmmhe.com/apk/",
+ guideH5Host: "http://www.xmmhe.com:9100/",
},
test: {
serviceHost: api => {
@@ -54,19 +54,16 @@ const config = {
cookieDomain: "",
hmiUrl: "http://47.122.43.22:8098/",
webSocketHost: 'ws://47.122.43.22:7140/',
- picServerHost: 'http://47.122.43.22:3199',
+ picServerHost: 'http://47.122.43.22:7199',
dataVUrl: "http://47.122.43.22:7167/home",
- version:version,
- guideSeverHost:"http://47.122.43.22/apk/",
- guideH5Host:"http://47.122.43.22:9100/",
+ version: version,
+ guideSeverHost: "http://47.122.43.22/apk/",
+ guideH5Host: "http://47.122.43.22:9100/",
},
}
let env = ""
switch (window.location.host) {
- case "120.25.146.51":
- env = "cloud"
- break
case "120.25.146.51:7001":
env = "cloud"
break
@@ -79,6 +76,9 @@ switch (window.location.host) {
case "47.122.43.22:7001":
env = "test"
break
+ case "47.122.43.22:7999":
+ env = "test"
+ break
default:
env = "local"
break