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

Compare commits

base: wyw:8dd014e583ad5bb66f1b4c1c0d5425f34471965d
Branches Tags
wyw:master
wyw:dev_csw1
..
compare: wyw:a1dcf8b53d37a683c466b7534579e77a307db23b
Branches Tags
wyw:master
wyw:dev_csw1

No commits in common. "8dd014e583ad5bb66f1b4c1c0d5425f34471965d" and "a1dcf8b53d37a683c466b7534579e77a307db23b" have entirely different histories.
8dd014e583 ... a1dcf8b53d

4 changed files with 23 additions and 52 deletions
Show Stats Expand all files Collapse all files

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

@ -79,8 +79,7 @@ class SE018EditPage extends React.Component {
updateData(data) { updateData(data) {
let isApprove = false; let isApprove = false;
// if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") { // if (data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") {
if ((data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) && data.STATUS > 1) { if (data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) {
//data.STATUS > 1 签到的时候 看到分数为0 怪怪的
this.state.isExam = true; this.state.isExam = true;
this.state.isShow = "table-cell"; this.state.isShow = "table-cell";
} }
@ -89,11 +88,8 @@ class SE018EditPage extends React.Component {
data.Nav_Users = data.Nav_Users.filter(item => item.STATUS == 0); data.Nav_Users = data.Nav_Users.filter(item => item.STATUS == 0);
var passRateThis = 0 var passRateThis = 0
// var userAll = data.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null) var userAll = data.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null)
// var userPass = data.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null && e.EXAMINATION_RESULTS == 1) var userPass = data.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null && e.EXAMINATION_RESULTS == 1)
var userAll = data.Nav_Users.filter(e => e.OK)
var userPass = data.Nav_Users.filter(e => e.OK && e.EXAMINATION_RESULTS == 1)
if (userAll && userAll.length > 0 && userPass && userPass.length > 0) { if (userAll && userAll.length > 0 && userPass && userPass.length > 0) {
passRateThis = (userPass.length / userAll.length).toFixed(4) * 100; passRateThis = (userPass.length / userAll.length).toFixed(4) * 100;
} }
@ -230,7 +226,7 @@ class SE018EditPage extends React.Component {
{ {
this.state.isView && <> this.state.isView && <>
<ReactToPrint <ReactToPrint
trigger={() => <Button type={'primary'} style={{ marginLeft: '8px' }} icon={'printer'} >打印</Button>} trigger={() => <Button type={'primary'} icon={'printer'} >打印</Button>}
content={() => this.componentRef} content={() => this.componentRef}
/> />
<Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button> <Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
@ -389,8 +385,8 @@ class SE018EditPage extends React.Component {
{ {
!signable && ( !signable && (
this.state.isShow && data.Nav_Notify.CHECKTYPE ? ( this.state.isShow && data.Nav_Notify.CHECKTYPE ? (
data.Nav_Notify.CHECKTYPE == 51 ? <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }} ><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td> data.Nav_Notify.CHECKTYPE == 51 ? <td colSpan={4} rowSpan={1} ><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
: <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }} > {showFiles(it?.Nav_Files, config.picServerHost, this, false)}</td> : <td colSpan={4} rowSpan={1} > {showFiles(it?.Nav_Files, config.picServerHost, this, false)}</td>
) )
: <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }}><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td> : <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }}><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
)} )}

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

@ -218,11 +218,7 @@ class SE018PaperPage extends React.Component {
hasAnswered = false hasAnswered = false
else else
hasAnswered = true hasAnswered = true
if (!hasAnswered) {
if (this.props.data.tableKey == null || this.props.data.tableKey == '2') {
hasAnswered = true
}
}
var perPaper = [] var perPaper = []
if (isCourEdit == false) if (isCourEdit == false)
perPaper = papers //提供显示 perPaper = papers //提供显示
@ -645,10 +641,16 @@ class SE018PaperPage extends React.Component {
}, () => { }, () => {
this.getPapers(); this.getPapers();
}) })
}} }}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0} > filterOption={(input, option) =>
option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
}
>
{ {
this.state.UserList.map(usr => <Option key={usr.ID} value={usr.ID}>{usr.NAME}</Option>) this.state.UserList.map(usr =>
<Option key={usr.ID} value={usr.ID}>{usr.NAME}</Option>
)
} }
</Select> </Select>
} }

11
src/files/edit/SE014.js
View File

@ -17,12 +17,11 @@ export default {
let minutes = (Date.parse(stateData.TRAIN_END_TIME) - Date.parse(stateData.TRAIN_START_TIME)) / 1000 / 60 / 45; let minutes = (Date.parse(stateData.TRAIN_END_TIME) - Date.parse(stateData.TRAIN_START_TIME)) / 1000 / 60 / 45;
temps.push({ field: 'HOURS', value: minutes.toFixed(1) }) // setFieldValue("HOURS", minutes.toFixed(1)); temps.push({ field: 'HOURS', value: minutes.toFixed(1) }) // setFieldValue("HOURS", minutes.toFixed(1));
} }
if (colInfo.FIELD_NAME == 'TRAIN_START_TIME' && stateData.TRAIN_START_TIME) { // if (colInfo.FIELD_NAME == 'TRAIN_START_TIME' && stateData.TRAIN_START_TIME) {
//默认自动处理 开始培训前5分钟开始签到 // //默认自动处理 开始培训前5分钟开始签到
var TRAIN_END_TIME = new Date(stateData.TRAIN_START_TIME); // var TRAIN_END_TIME = new Date(stateData.TRAIN_START_TIME);
stateData.DT_START_SIGN = new Date(TRAIN_END_TIME.setMinutes(TRAIN_END_TIME.getMinutes() - 5)) // temps.push({ field: 'DT_START_SIGN', value: new Date(TRAIN_END_TIME.setMinutes(TRAIN_END_TIME.getMinutes() - 5)) })
temps.push({ field: 'DT_START_SIGN', value: stateData.DT_START_SIGN.Format('yyyy-MM-dd HH:mm:ss') }) // }
}
if (temps && temps.length > 0) if (temps && temps.length > 0)
setFieldValueByBatch(temps); setFieldValueByBatch(temps);
} }

32
src/files/edit/SE018.js
View File

@ -1,5 +1,5 @@
import { message } from "antd/lib/index"; import { message } from "antd/lib/index";
import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, initFilterGroup, extendGroupRule, extendFilterGroup, empty } from "../../utils/common"; import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, empty } from "../../utils/common";
import { connect } from 'dva'; import { connect } from 'dva';
/** /**
* @return {string} * @return {string}
@ -23,35 +23,9 @@ export default {
if (stateData.Nav_Users && stateData.Nav_Users.length > 0) { if (stateData.Nav_Users && stateData.Nav_Users.length > 0) {
stateData.Nav_Users.forEach(e => { stateData.Nav_Users.forEach(e => {
if (e.STATUS == 0 && e.EXAMINATION_RESULTS == undefined && e.DT_SIGN != null && stateData.Nav_Notify && stateData.Nav_Notify.CHECKTYPE == 56) { if (e.STATUS == 0 && e.EXAMINATION_RESULTS == undefined)
e.EXAMINATION_RESULTS = 1 //默认合格 不考试 Nav_Notify.CHECKTYPE 56 e.EXAMINATION_RESULTS = 1
}
}) })
} }
},
btnRefresh: (params) => {//params
let json = initFilter(params.login.OrgId);
extendRule(json, 'RECORD_ID', 1, params.stateData.ID);
params.dispatch({
type: 'app/getDataByPost',
url: 'SE/TrainRecordUser/Entities',
payload: json,
onComplete: (ret) => {
if (ret && ret.length > 0) {
params.stateData.Nav_Users.forEach(e => {
let r = ret.find(x => x.ID == e.ID)
if (e.DT_SIGN != r.DT_SIGN) {
e.DT_SIGN = r.DT_SIGN
e.OK = r.OK
e.EXAMINATION_RESULTS = r.EXAMINATION_RESULTS
if (e.DT_SIGN != null && e.EXAMINATION_RESULTS == null && params.stateData.Nav_Notify && params.stateData.Nav_Notify.CHECKTYPE == 56) {
e.EXAMINATION_RESULTS = 1 //有签到 默认 考核通过 不考试 Nav_Notify.CHECKTYPE 56
}
}
})
params.setState({ data: params.stateData });
}
}
});
} }
} }