From 8798d40cade20007aa86a2910c0e3798a27e5e35 Mon Sep 17 00:00:00 2001 From: wjn Date: Wed, 8 May 2024 16:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/SE/SE005ReportEdit.js | 6 +----- src/components/CustomPages/SE/SE015ShowPrint.js | 2 +- src/components/CustomPages/SE/SE018EditPage.js | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) 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({