From d2b731306a86d0b0f6898065597048fc4988a938 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 17 Jul 2026 09:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=BC=80=E5=A7=8B=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=20=20=E8=AE=B0=E5=BD=95=E4=BA=BA=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CustomPages/SE/SE013ShowPrint.js | 20 +++++++++++++++----
.../CustomPages/SE/SE018EditPage.js | 15 +++++++++++---
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/components/CustomPages/SE/SE013ShowPrint.js b/src/components/CustomPages/SE/SE013ShowPrint.js
index c2c279a..d47596e 100644
--- a/src/components/CustomPages/SE/SE013ShowPrint.js
+++ b/src/components/CustomPages/SE/SE013ShowPrint.js
@@ -19,6 +19,7 @@ class SE013ShowPrint extends React.Component {
data: null,
canSign: false,
overTimeSign: false,
+ LEAVE0_SHOW: '未处理',
trainData: {
value: 1,
reason: ''
@@ -62,12 +63,21 @@ class SE013ShowPrint extends React.Component {
if (ret) {
let canSign = this.props.data.tableKey == "1" && ret.Nav_TrainUserList.find(it => it.USER_ID == this.props.login.user.ID) ? true : false
let overTimeSign = ret.STATUS == 3 && ret.Nav_TrainUserList.find(it => it.USER_ID == this.props.login.user.ID && it.IS_LEAVE === 0) && this.props.data.tableKey == "1" ? true : false
+ var leavel0_Show = ''
+ debugger
+ if (ret.STATUS >= 2) {
+ leavel0_Show = '超期未处理'
+ } else if ((new Date(ret.TRAIN_START_TIME)).getTime() >= (new Date()).getTime()) {
+ leavel0_Show = '未处理'
+ } else {
+ leavel0_Show = '超期未处理'
+ }
this.setState({
data: ret,
+ LEAVE0_SHOW: leavel0_Show,
canSign: canSign,
overTimeSign: overTimeSign
})
-
}
}
});
@@ -148,7 +158,7 @@ class SE013ShowPrint extends React.Component {
return str;
}
render() {
- const { data } = this.state;
+ const { data, LEAVE0_SHOW } = this.state;
const onChangeReason = (e) => {
this.state.trainData.reason = e.target.value;
}
@@ -231,7 +241,9 @@ class SE013ShowPrint extends React.Component {
| 是否需要培训效果评估 |
{enums.SETrainNeedSuvey.enums[data.NEED_EVALUATION]} |
是否触发培训记录 |
- {data.CREATE_NOTIFY_RECORD == true ? '是' : '否'} |
+ {data.CREATE_NOTIFY_RECORD == true ? '是' : '否'} |
+ 签到开始时间 |
+ {data.DT_START_SIGN} |
| 培训内容 |
@@ -284,7 +296,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 : LEAVE0_SHOW)} |
})
}
diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js
index 6e40bf1..c477fff 100644
--- a/src/components/CustomPages/SE/SE018EditPage.js
+++ b/src/components/CustomPages/SE/SE018EditPage.js
@@ -58,6 +58,7 @@ class SE018EditPage extends React.Component {
extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point');
extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment');
extendInclude(json, 'Nav_Notify.Nav_LaunchUser');
+ extendInclude(json, 'Nav_Notify.Nav_RecordUser');
extendInclude(json, 'Nav_Notify.Nav_TrainType');
extendInclude(json, 'Nav_Notify.Nav_ListCour.Nav_Cour');
// extendInclude(json, 'Nav_Notify.Nav_TrainCheckType');
@@ -292,19 +293,27 @@ class SE018EditPage extends React.Component {
| 培训时间 |
{data && data.Nav_Notify ? `${data.Nav_Notify.TRAIN_START_TIME} - ${data.Nav_Notify.TRAIN_END_TIME}` : null} |
+ 签到时间 |
+ {data && data.Nav_Notify ? data.Nav_Notify.DT_START_SIGN : null} |
培训地点 |
{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_ADDR : null} |
- 培训学时 |
- {data && data.Nav_Notify ? data.Nav_Notify.HOURS : null} |
+ | 培训学时 |
+ {data && data.Nav_Notify ? data.Nav_Notify.HOURS : null} |
培训老师 |
{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_TEACHER : null} |
培训形式 |
{data && data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]} |
- 考核方式 |
+ {/* 考核方式 |
+ {data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]} | */}
{/* {data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null} | */}
+
+
+ | 考核方式 |
{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]} |
+ 记录人 |
+ {data && data.Nav_Notify && data.Nav_Notify.Nav_RecordUser ? data.Nav_Notify.Nav_RecordUser.NAME : null} |
| 培训内容 |