diff --git a/src/components/CustomPages/SE/SE018EditPage.js b/src/components/CustomPages/SE/SE018EditPage.js index 122f786..7aed6e3 100644 --- a/src/components/CustomPages/SE/SE018EditPage.js +++ b/src/components/CustomPages/SE/SE018EditPage.js @@ -86,6 +86,14 @@ class SE018EditPage extends React.Component { this.state.leaveUsers = data.Nav_Users.filter(item => item.STATUS == 1); this.state.missUsers = data.Nav_Users.filter(item => item.STATUS == 2); data.Nav_Users = data.Nav_Users.filter(item => item.STATUS == 0); + + var passRateThis = 0 + 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) + if (userAll && userAll.length > 0 && userPass && userPass.length > 0) { + passRateThis = (userPass.length / userAll.length).toFixed(4) * 100; + } + let uniqueUsers = data.Nav_Papers.reduce((acc, user) => { // 如果累积数组中还没有这个 user_id,则添加 if (!acc.some(item => item.USER_ID === user.USER_ID)) { @@ -93,16 +101,15 @@ class SE018EditPage extends React.Component { } return acc; }, []); - let temp = 0; - uniqueUsers.forEach(item => { - if (item.SCORE >= 80) { - temp++; - } - }) - var passRateThis = 0 - if (uniqueUsers && uniqueUsers.length > 0) { - passRateThis = (temp / uniqueUsers.length).toFixed(4) * 100; - } + // let temp = 0; + // uniqueUsers.forEach(item => { + // if (item.SCORE >= 80) { + // temp++; + // } + // }) + // if (uniqueUsers && uniqueUsers.length > 0) { + // passRateThis = (temp / uniqueUsers.length).toFixed(4) * 100; + // } //安环部负责人审阅中 if (data.STATUS >= 2 && this.props.formCode != "SE050_SHOWPRINT" && this.props.data.tableKey != undefined) { isApprove = true; diff --git a/src/files/edit/TL037.js b/src/files/edit/TL037.js index 2a57b64..148cf3c 100644 --- a/src/files/edit/TL037.js +++ b/src/files/edit/TL037.js @@ -75,6 +75,28 @@ export default { setFieldValueByBatch(temps); } }) + } else if (stateData.Nav_ListDetail == null || stateData.Nav_ListDetail.length < 1) { + let json = initFilter(stateData.ORG_ID, stateData.TAILING_ID); + dispatch({ + type: 'app/getDataByPost', + url: 'TL/TLWatchDayly/GetItemsByTailingID', + payload: json, + onlyData: false, + onComplete: (ret) => { + const temps = []; + if (ret.IsSuccessful) { + ret.Data.forEach(element => { + if (element.ITEM_VALUE == 0) + element.ITEM_VALUE = '' + }); + temps.push({ field: 'Nav_ListDetail', value: ret.Data }) + } else { + temps.push({ field: 'Nav_ListDetail', value: [] }) + } + temps.push({ field: 'DATETIME', value: stateData.DATE }) + setFieldValueByBatch(temps); + } + }) } }, onChange: (params) => {