wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

Browse Source
This commit is contained in:
何美荣 2026-07-14 19:45:27 +08:00
commit a354675bef
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ class SE013ShowPrint extends React.Component {
<td colSpan={4} rowSpan={1}>{item.Nav_User.CODE}</td> <td colSpan={4} rowSpan={1}>{item.Nav_User.CODE}</td>
<td colSpan={4} rowSpan={1}>{item.Nav_User.NAME}</td> <td colSpan={4} rowSpan={1}>{item.Nav_User.NAME}</td>
<td colSpan={4} rowSpan={1}>{item.POST_NAME}</td> <td colSpan={4} rowSpan={1}>{item.POST_NAME}</td>
<td colSpan={4} rowSpan={1}>{item.IS_LEAVE == 1 ? '参加' : (item.IS_LEAVE == 2 ? '请假' + "-" + item.LEAVE_REASON : '未完成')}</td> <td colSpan={4} rowSpan={1}>{item.IS_LEAVE == 1 ? '参加' : (item.IS_LEAVE == 2 ? '请假' + "-" + item.LEAVE_REASON : '超期未处理')}</td>
</tr> </tr>
}) })
} }

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

@ -16,6 +16,7 @@ class SE018EditPage extends React.Component {
this.state = { this.state = {
data: null, data: null,
AllUsersRecord: [],
missUsers: [], missUsers: [],
leaveUsers: [], leaveUsers: [],
isView: props.formCode === 'SE017_SHOWPRINT' || props.formCode === 'SE050_SHOWPRINT', isView: props.formCode === 'SE017_SHOWPRINT' || props.formCode === 'SE050_SHOWPRINT',
@ -79,6 +80,7 @@ class SE018EditPage extends React.Component {
} }
updateData(data) { updateData(data) {
let isApprove = false; let isApprove = false;
var AllUsersRecord = data.Nav_Users
// if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") { // 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) { if ((data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) && data.STATUS > 1) {
//data.STATUS > 1 签到的时候 看到分数为0 怪怪的 //data.STATUS > 1 签到的时候 看到分数为0 怪怪的
@ -122,7 +124,8 @@ class SE018EditPage extends React.Component {
this.setState({ this.setState({
data, data,
isApprove, isApprove,
passRate: passRateThis passRate: passRateThis,
AllUsersRecord: AllUsersRecord
}) })
} }
onApprove = () => { onApprove = () => {
@ -143,10 +146,21 @@ class SE018EditPage extends React.Component {
}) })
} }
onSignIn = () => { onSignIn = () => {
var ud = null
if (!this.state.data || (this.state.data.STATUS !== 1) || !this.state.data.Nav_Users) { 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) { if (!ud) {
return; return;
} }
@ -223,9 +237,12 @@ class SE018EditPage extends React.Component {
}); });
}; };
render() { 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 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 <div> return <div>
<div> <div>
{ {

12
src/files/edit/SE014.js
View File

@ -17,12 +17,12 @@ export default {
let minutes = (Date.parse(stateData.TRAIN_END_TIME) - Date.parse(stateData.TRAIN_START_TIME)) / 1000 / 60 / 45; 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)); temps.push({ field: 'HOURS', value: minutes.toFixed(1) }) // setFieldValue("HOURS", minutes.toFixed(1));
} }
if (colInfo.FIELD_NAME == 'TRAIN_START_TIME' && stateData.TRAIN_START_TIME) { // if (colInfo.FIELD_NAME == 'TRAIN_START_TIME' && stateData.TRAIN_START_TIME) {
//默认自动处理 开始培训前5分钟开始签到 // //默认自动处理 开始培训前5分钟开始签到
var TRAIN_END_TIME = new Date(stateData.TRAIN_START_TIME); // 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)) // 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') }) // temps.push({ field: 'DT_START_SIGN', value: stateData.DT_START_SIGN.Format('yyyy-MM-dd HH:mm:ss') })
} // }
if (temps && temps.length > 0) if (temps && temps.length > 0)
setFieldValueByBatch(temps); setFieldValueByBatch(temps);
} }