Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web
This commit is contained in:
commit
f45d92a394
@ -270,7 +270,7 @@ class SE018EditPage extends React.Component {
|
|||||||
<td colSpan={4} rowSpan={1} >{data && this.returnModel(data.Nav_Notify.TRAIN_MODEL)}</td>
|
<td colSpan={4} rowSpan={1} >{data && this.returnModel(data.Nav_Notify.TRAIN_MODEL)}</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.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null}</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.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td>
|
<td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && this.props.app.enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>
|
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>
|
||||||
|
|||||||
@ -399,7 +399,7 @@ class SE018PaperPage extends React.Component {
|
|||||||
<td colSpan={4} rowSpan={1} >{notify ? this.returnModel(notify.TRAIN_MODEL) : null}</td>
|
<td colSpan={4} rowSpan={1} >{notify ? this.returnModel(notify.TRAIN_MODEL) : 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} >{notify && notify.Nav_TrainCheckType ? notify.Nav_TrainCheckType.NAME : null}</td> */}
|
{/* <td colSpan={4} rowSpan={1} >{notify && notify.Nav_TrainCheckType ? notify.Nav_TrainCheckType.NAME : null}</td> */}
|
||||||
<td colSpan={4} rowSpan={1} >{notify && notify.CHECKTYPE && enums.PlanCheckType.enums[notify.CHECKTYPE]}</td>
|
<td colSpan={4} rowSpan={1} >{notify && notify.CHECKTYPE && this.props.app.enums.PlanCheckType.enums[notify.CHECKTYPE]}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>
|
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user