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

Compare commits

base: wyw:2ea153e9478a583d5ddd419aff6b1b59ccf805d6
Branches Tags
wyw:master
..
compare: wyw:9aefffb9edfcf345605a161f5576ba225d39068d
Branches Tags
wyw:master

No commits in common. "2ea153e9478a583d5ddd419aff6b1b59ccf805d6" and "9aefffb9edfcf345605a161f5576ba225d39068d" have entirely different histories.
2ea153e947 ... 9aefffb9ed

3 changed files with 7 additions and 11 deletions
Show Stats Expand all files Collapse all files

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

@ -45,7 +45,7 @@ class SE013ShowPrint extends React.Component {
extendInclude(json, 'Nav_LaunchUser');
extendInclude(json, 'Nav_TrainType');
extendInclude(json, 'Nav_RecordUser');
// extendInclude(json, 'Nav_TrainCheckType');
extendInclude(json, 'Nav_TrainCheckType');
extendInclude(json, 'Nav_TrainContentList');
extendInclude(json, 'Nav_TrainContentList.Nav_Point');
extendInclude(json, 'Nav_TrainUserList');
@ -218,8 +218,7 @@ class SE013ShowPrint extends React.Component {
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</td>
<td colSpan={4} rowSpan={1} >{this.returnModel(data.TRAIN_MODEL)}</td>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>考核方式</td>
<td colSpan={4} rowSpan={1} >{data.CHECKTYPE && enums.PlanCheckType.enums[data.CHECKTYPE]}</td>
{/* <td colSpan={4} rowSpan={1} >{data.Nav_TrainCheckType ? data.Nav_TrainCheckType.NAME : ''}</td> */}
<td colSpan={4} rowSpan={1} >{data.Nav_TrainCheckType ? data.Nav_TrainCheckType.NAME : ''}</td>
</tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>是否需要培训效果评估</td>

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

@ -57,7 +57,7 @@ class SE018EditPage extends React.Component {
extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment');
extendInclude(json, 'Nav_Notify.Nav_LaunchUser');
extendInclude(json, 'Nav_Notify.Nav_TrainType');
// extendInclude(json, 'Nav_Notify.Nav_TrainCheckType');
extendInclude(json, 'Nav_Notify.Nav_TrainCheckType');
extendInclude(json, 'Nav_Users.Nav_User');
extendInclude(json, 'Nav_Files.Nav_ImgFile');
extendInclude(json, 'Nav_Users.Nav_User');
@ -76,8 +76,7 @@ class SE018EditPage extends React.Component {
}
updateData(data) {
let isApprove = false;
// if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") {
if (data.Nav_Notify.CHECKTYPE == 51) {
if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") {
this.state.isExam = true;
this.state.isShow = "table-cell";
}
@ -269,8 +268,7 @@ class SE018EditPage extends React.Component {
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</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} >{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.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null}</td>
</tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>

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

@ -117,7 +117,7 @@ class SE018PaperPage extends React.Component {
extendInclude(json, 'Nav_Record.Nav_Notify.Nav_LaunchUser');
extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainContentList');
extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainType');
extendInclude(json, 'Nav_Record.Nav_Notify');
extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainCheckType');
extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainContentList.Nav_Point');
@ -398,8 +398,7 @@ class SE018PaperPage extends React.Component {
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</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} >{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.Nav_TrainCheckType ? notify.Nav_TrainCheckType.NAME : null}</td>
</tr>
<tr>
<td colSpan={4} rowSpan={1} className={styles.fontBold}>培训内容</td>