From bd788825ba4e22b4169fdc302db0422e62a7a82d Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Tue, 14 Jul 2026 15:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E9=80=9A=E7=9F=A5=20?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=20=3D>=20=E8=B6=85=E6=9C=9F?= =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=20=E5=9F=B9=E8=AE=AD=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=AD=BE=E5=88=B0=20=E5=A4=84=E7=90=86=20=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E7=AD=BE=E5=88=B0=E4=B9=9F=E5=8F=AF=E4=BB=A5=20?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=20=E9=80=9A=E7=9F=A5=E5=B9=B6=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=20=E5=9F=B9=E8=AE=AD=E7=AD=BE=E5=88=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20=E9=BB=98=E8=AE=A4=20=E5=9F=B9=E8=AE=AD=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E5=89=8D=205=E5=88=86=E9=92=9F=20=20=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SE/SE013ShowPrint.js | 2 +- .../CustomPages/SE/SE018EditPage.js | 27 +++++++++++++++---- src/files/edit/SE014.js | 12 ++++----- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/components/CustomPages/SE/SE013ShowPrint.js b/src/components/CustomPages/SE/SE013ShowPrint.js index 11838d6..c2c279a 100644 --- a/src/components/CustomPages/SE/SE013ShowPrint.js +++ b/src/components/CustomPages/SE/SE013ShowPrint.js @@ -284,7 +284,7 @@ class SE013ShowPrint extends React.Component { {item.Nav_User.CODE} {item.Nav_User.NAME} {item.POST_NAME} - {item.IS_LEAVE == 1 ? '参加' : (item.IS_LEAVE == 2 ? '请假' + "-" + item.LEAVE_REASON : '未完成')} + {item.IS_LEAVE == 1 ? '参加' : (item.IS_LEAVE == 2 ? '请假' + "-" + item.LEAVE_REASON : '超期未处理')} }) } diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js index f0d19bb..4fdac61 100644 --- a/src/components/CustomPages/SE/SE018EditPage.js +++ b/src/components/CustomPages/SE/SE018EditPage.js @@ -16,6 +16,7 @@ class SE018EditPage extends React.Component { this.state = { data: null, + AllUsersRecord: [], missUsers: [], leaveUsers: [], isView: props.formCode === 'SE017_SHOWPRINT' || props.formCode === 'SE050_SHOWPRINT', @@ -79,6 +80,7 @@ class SE018EditPage extends React.Component { } updateData(data) { let isApprove = false; + var AllUsersRecord = data.Nav_Users // if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") { if ((data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) && data.STATUS > 1) { //data.STATUS > 1 签到的时候 看到分数为0 怪怪的 @@ -122,7 +124,8 @@ class SE018EditPage extends React.Component { this.setState({ data, isApprove, - passRate: passRateThis + passRate: passRateThis, + AllUsersRecord: AllUsersRecord }) } onApprove = () => { @@ -143,10 +146,21 @@ class SE018EditPage extends React.Component { }) } onSignIn = () => { + var ud = null if (!this.state.data || (this.state.data.STATUS !== 1) || !this.state.data.Nav_Users) { - return; + if (this.state.AllUsersRecord) { + var checkMore = this.state.AllUsersRecord.find(e => e.USER_ID == this.props.login.user.ID) + if (!checkMore.IS_RESEND) { + return; + } else { + ud = checkMore + } + } else { + return; + } } - var ud = this.state.data.Nav_Users.find(it => it.USER_ID === this.props.login.user.ID) + if (ud == null) + ud = this.state.data.Nav_Users.find(it => it.USER_ID === this.props.login.user.ID) if (!ud) { return; } @@ -223,9 +237,12 @@ class SE018EditPage extends React.Component { }); }; render() { - const { data, missUsers, leaveUsers } = this.state; + const { data, missUsers, leaveUsers, AllUsersRecord } = this.state; const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; - const signable = this.state.isView && data && data.STATUS == 1 && data.Nav_Users && data.Nav_Users.find(it => it.USER_ID === this.props.login.user.ID) && (this.props.data.tableKey == "1") + const signable = this.state.isView && (this.props.data.tableKey == "1") && ((data && data.STATUS == 1 && data.Nav_Users && data.Nav_Users.find(it => it.USER_ID === this.props.login.user.ID)) || (AllUsersRecord && AllUsersRecord.find(it => it.USER_ID === this.props.login.user.ID && it.IS_RESEND == true))) + + // const signable = data && this.state.isView && (data.STATUS == 1 || (AllUsersRecord && AllUsersRecord.find(it => it.USER_ID === this.props.login.user.ID && it.IS_RESEND == true))) && AllUsersRecord && AllUsersRecord.find(it => it.USER_ID === this.props.login.user.ID) && (this.props.data.tableKey == "1") + return
{ diff --git a/src/files/edit/SE014.js b/src/files/edit/SE014.js index 3800045..c1b3a9a 100644 --- a/src/files/edit/SE014.js +++ b/src/files/edit/SE014.js @@ -17,12 +17,12 @@ export default { let minutes = (Date.parse(stateData.TRAIN_END_TIME) - Date.parse(stateData.TRAIN_START_TIME)) / 1000 / 60 / 45; temps.push({ field: 'HOURS', value: minutes.toFixed(1) }) // setFieldValue("HOURS", minutes.toFixed(1)); } - if (colInfo.FIELD_NAME == 'TRAIN_START_TIME' && stateData.TRAIN_START_TIME) { - //默认自动处理 开始培训前5分钟开始签到 - var TRAIN_END_TIME = new Date(stateData.TRAIN_START_TIME); - stateData.DT_START_SIGN = new Date(TRAIN_END_TIME.setMinutes(TRAIN_END_TIME.getMinutes() - 5)) - temps.push({ field: 'DT_START_SIGN', value: stateData.DT_START_SIGN.Format('yyyy-MM-dd HH:mm:ss') }) - } + // if (colInfo.FIELD_NAME == 'TRAIN_START_TIME' && stateData.TRAIN_START_TIME) { + // //默认自动处理 开始培训前5分钟开始签到 + // var TRAIN_END_TIME = new Date(stateData.TRAIN_START_TIME); + // stateData.DT_START_SIGN = new Date(TRAIN_END_TIME.setMinutes(TRAIN_END_TIME.getMinutes() - 5)) + // temps.push({ field: 'DT_START_SIGN', value: stateData.DT_START_SIGN.Format('yyyy-MM-dd HH:mm:ss') }) + // } if (temps && temps.length > 0) setFieldValueByBatch(temps); }