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

同步代码

Browse Source
This commit is contained in:
wjn 2024-05-08 16:57:31 +08:00
parent d7c66b0cc5
commit 8798d40cad
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,10 +104,6 @@ class SE005ReportEdit extends React.Component {
} }
onApprove = ()=>{ onApprove = ()=>{
const { ALL,data } = this.state; 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 = { let json = {
Parameter1: data.SURVEY[0].ID, Parameter1: data.SURVEY[0].ID,
Parameter2: this.props.data.TaskID, 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 count = data && data.ROWS && data.ROWS.length > 0 && data.ROWS[0].length || 1;
const SPAN = Math.floor(24 / count) || 1; const SPAN = Math.floor(24 / count) || 1;
const TITLE_SPAN = Math.max(24 - count * SPAN,0) + SPAN; 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> return <div>
<div style={{ padding: '10px' }}> <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> <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> <Button onClick={() => this.onTableBtnApprove()} type={'primary'} icon="check" >已阅</Button>
: null : 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); this.state.missUsers = data.Nav_Users.filter(item => item.STATUS == 2);
data.Nav_Users = data.Nav_Users.filter(item => item.STATUS == 0); 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; isApprove = true;
} }
this.setState({ this.setState({