ccy/mh-sms-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web

Browse Source
This commit is contained in:
yunkexin 2024-05-09 10:55:30 +08:00
commit 83c81c9864
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/CustomPages/PF/FormConfigSqlPage.js
View File

@ -250,6 +250,7 @@ class FormConfigSqlPage extends React.Component {
<Option value="8f1cf418-8bf3-ea3f-7a6d-fc5d61247008">龙岩稀土</Option>
<Option value="3EFD5276-632B-E379-9FF3-7A7546591FCA">广西博白</Option>
<Option value="A3DCE14A-13D9-D879-D9AB-821D4A3F1F93">SMS</Option>
<Option value="11111111-1111-1111-1111-111111111111">连江锰业</Option>
</Select>
</Form.Item>
</Col>

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

@ -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 <div>
<div style={{ padding: '10px' }}>

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

@ -194,7 +194,7 @@ class SE015ShowPrint extends React.Component {
/>
<Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
{
(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" ?
<Button onClick={() => this.onTableBtnApprove()} type={'primary'} icon="check" >已阅</Button>
: null
}

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

@ -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({

12
src/config.js
View File

@ -24,7 +24,7 @@ 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/",
@ -39,7 +39,7 @@ 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/",
@ -54,7 +54,7 @@ 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/",
@ -64,9 +64,6 @@ const config = {
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