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

Compare commits

base: wyw:f8ff38a58b54fcb11af00408ca79012192dfadc4
Branches Tags
wyw:master
wyw:dev_csw1
..
compare: wyw:f8b92ffd6cb106e5e3f2e3b060223c8dd403c8e6
Branches Tags
wyw:master
wyw:dev_csw1

No commits in common. "f8ff38a58b54fcb11af00408ca79012192dfadc4" and "f8b92ffd6cb106e5e3f2e3b060223c8dd403c8e6" have entirely different histories.
f8ff38a58b ... f8b92ffd6c

2 changed files with 7 additions and 28 deletions
Show Stats Expand all files Collapse all files

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

@ -19,7 +19,6 @@ class SE013ShowPrint extends React.Component {
data: null, data: null,
canSign: false, canSign: false,
overTimeSign: false, overTimeSign: false,
LEAVE0_SHOW: '未处理',
trainData: { trainData: {
value: 1, value: 1,
reason: '' reason: ''
@ -63,21 +62,12 @@ class SE013ShowPrint extends React.Component {
if (ret) { 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 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 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({ this.setState({
data: ret, data: ret,
LEAVE0_SHOW: leavel0_Show,
canSign: canSign, canSign: canSign,
overTimeSign: overTimeSign overTimeSign: overTimeSign
}) })
} }
} }
}); });
@ -158,7 +148,7 @@ class SE013ShowPrint extends React.Component {
return str; return str;
} }
render() { render() {
const { data, LEAVE0_SHOW } = this.state; const { data } = this.state;
const onChangeReason = (e) => { const onChangeReason = (e) => {
this.state.trainData.reason = e.target.value; this.state.trainData.reason = e.target.value;
} }
@ -241,9 +231,7 @@ class SE013ShowPrint extends React.Component {
<td colSpan={4} rowSpan={1} className={styles.fontBold}>是否需要培训效果评估</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>是否需要培训效果评估</td>
<td colSpan={4} rowSpan={1} >{enums.SETrainNeedSuvey.enums[data.NEED_EVALUATION]}</td> <td colSpan={4} rowSpan={1} >{enums.SETrainNeedSuvey.enums[data.NEED_EVALUATION]}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>是否触发培训记录</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>是否触发培训记录</td>
<td colSpan={4} rowSpan={1} >{data.CREATE_NOTIFY_RECORD == true ? '是' : '否'}</td> <td colSpan={12} rowSpan={1} >{data.CREATE_NOTIFY_RECORD == true ? '是' : '否'}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>签到开始时间</td>
<td colSpan={4} rowSpan={1} >{data.DT_START_SIGN}</td>
</tr> </tr>
<tr> <tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>
@ -296,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 : LEAVE0_SHOW)}</td> <td colSpan={4} rowSpan={1}>{item.IS_LEAVE == 1 ? '参加' : (item.IS_LEAVE == 2 ? '请假' + "-" + item.LEAVE_REASON : '超期未处理')}</td>
</tr> </tr>
}) })
} }

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

@ -58,7 +58,6 @@ class SE018EditPage extends React.Component {
extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point');
extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment'); extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment');
extendInclude(json, 'Nav_Notify.Nav_LaunchUser'); extendInclude(json, 'Nav_Notify.Nav_LaunchUser');
extendInclude(json, 'Nav_Notify.Nav_RecordUser');
extendInclude(json, 'Nav_Notify.Nav_TrainType'); extendInclude(json, 'Nav_Notify.Nav_TrainType');
extendInclude(json, 'Nav_Notify.Nav_ListCour.Nav_Cour'); extendInclude(json, 'Nav_Notify.Nav_ListCour.Nav_Cour');
// extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); // extendInclude(json, 'Nav_Notify.Nav_TrainCheckType');
@ -293,27 +292,19 @@ class SE018EditPage extends React.Component {
<tr> <tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训时间</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训时间</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? `${data.Nav_Notify.TRAIN_START_TIME} - ${data.Nav_Notify.TRAIN_END_TIME}` : null}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? `${data.Nav_Notify.TRAIN_START_TIME} - ${data.Nav_Notify.TRAIN_END_TIME}` : null}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>签到时间</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.DT_START_SIGN : null}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训地点</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训地点</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_ADDR : null}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_ADDR : null}</td>
</tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训学时</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训学时</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.HOURS : null}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.HOURS : null}</td>
</tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训老师</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训老师</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_TEACHER : null}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_TEACHER : null}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]}</td>
{/* <td colSpan={4} rowSpan={1} className={styles.fontBold}>考核方式</td>
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td> */}
{/* <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null}</td> */}
</tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>考核方式</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>考核方式</td>
{/* <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null}</td> */}
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td> <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>记录人</td>
<td colSpan={12} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.Nav_RecordUser ? data.Nav_Notify.Nav_RecordUser.NAME : null}</td>
</tr> </tr>
<tr> <tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>