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

Compare commits

base: wyw:5d4c895caa4c7dd76dd1b218d33b46ac6cb31e69
Branches Tags
wyw:master
wyw:dev_csw1
..
compare: wyw:095a8ee8f9a9d44a15cb3d3a841e6afb1853f83e
Branches Tags
wyw:master
wyw:dev_csw1

No commits in common. "5d4c895caa4c7dd76dd1b218d33b46ac6cb31e69" and "095a8ee8f9a9d44a15cb3d3a841e6afb1853f83e" have entirely different histories.
5d4c895caa ... 095a8ee8f9

1 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -64,6 +64,7 @@ class SE013ShowPrint extends React.Component {
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 = '' var leavel0_Show = ''
debugger
if (ret.STATUS >= 2) { if (ret.STATUS >= 2) {
leavel0_Show = '超期未处理' leavel0_Show = '超期未处理'
} else if ((new Date(ret.TRAIN_START_TIME)).getTime() >= (new Date()).getTime()) { } else if ((new Date(ret.TRAIN_START_TIME)).getTime() >= (new Date()).getTime()) {
@ -281,7 +282,7 @@ class SE013ShowPrint extends React.Component {
</tr> </tr>
<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} className={styles.fontBold}>组织名称</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>部门/车间</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>工号</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>工号</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>姓名</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>姓名</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>岗位</td> <td colSpan={4} rowSpan={1} className={styles.fontBold}>岗位</td>
@ -289,7 +290,7 @@ class SE013ShowPrint extends React.Component {
</tr> </tr>
{ {
data.Nav_TrainUserList.map((item, index) => { data.Nav_TrainUserList.map((item, index) => {
return <tr> return <tr >
<td colSpan={4} rowSpan={1}>{index + 1}</td> <td colSpan={4} rowSpan={1}>{index + 1}</td>
<td colSpan={4} rowSpan={1}>{item.DEPARTMENT_NAME}</td> <td colSpan={4} rowSpan={1}>{item.DEPARTMENT_NAME}</td>
<td colSpan={4} rowSpan={1}>{item.Nav_User.CODE}</td> <td colSpan={4} rowSpan={1}>{item.Nav_User.CODE}</td>