From 6ecf6e13ef98af7d1297351e408303012f3f78a8 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Sun, 30 Nov 2025 00:27:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=95=99=E8=82=B2=E6=9F=A5=E7=9C=8B=E8=AF=95=E5=8D=B7=20bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SE/SE061PaperPage.js | 230 +++++++++--------- 1 file changed, 119 insertions(+), 111 deletions(-) diff --git a/src/components/CustomPages/SE/SE061PaperPage.js b/src/components/CustomPages/SE/SE061PaperPage.js index c5fce05..880da0b 100644 --- a/src/components/CustomPages/SE/SE061PaperPage.js +++ b/src/components/CustomPages/SE/SE061PaperPage.js @@ -54,10 +54,12 @@ class SE061PaperPage extends React.Component { if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function') this.props.data.onCancel(); } - getUsers = () => { + getUsers = (dataid) => { + debugger let json = initFilter(this.props.login.OrgId); json.OrgType = 2; - extendRule(json, 'RECORD_ID', 1, this.props.data.id); + // extendRule(json, 'RECORD_ID', 1, this.props.data.id); + extendRule(json, 'RECORD_ID', 1, dataid); extendInclude(json, 'Nav_User'); this.state.loading = true; this.props.dispatch({ @@ -88,6 +90,12 @@ class SE061PaperPage extends React.Component { message.warn("当前用户没有问卷"); } } + } else { + this.setState({ + SelUsrID: '', + papers: [] + }) + } } }); @@ -142,10 +150,10 @@ class SE061PaperPage extends React.Component { } }); } - loadData = () => { + loadData = (dataid) => { if (this.props.data.id == "") return; - this.getUsers(); + this.getUsers(dataid); } onSave = () => { if (this.state.readonly) { @@ -355,127 +363,127 @@ class SE061PaperPage extends React.Component {
(this.componentRef = el)} id={'tableId' + this.props.data.id}>

培训在线答题

- - - - - - - - - - - - - - { - papers.map((it, idx) => { - return ( - - + + + } + +
工号{SelUsr && SelUsr.CODE}答卷人{SelUsr && SelUsr.NAME}成绩{this.CalcScore()}
问卷
- - - - - - +
- {idx + 1}. - {it.Nav_Test.NAME} - {this.getType(it.Nav_Test.TYPE)} -
+ + + + + + + + + + + + + { + papers.map((it, idx) => { + return ( + + - - ) - }) - } - -
工号{SelUsr && SelUsr.CODE}答卷人{SelUsr && SelUsr.NAME}成绩{this.CalcScore()}
问卷
+ + + + + + + { + it.Nav_Test.TYPE === 0 ? + + : + + } + + + { + it.Nav_Test.TYPE === 0 ? + + : + + } + { - it.Nav_Test.TYPE === 0 ? - - : - + + } - - { - it.Nav_Test.TYPE === 0 ? - - : - + + } - - { - it.Nav_Test.TYPE !== 0 && - - - - } - { - it.Nav_Test.TYPE !== 0 && it.Nav_Test.OPTION_D != "" && it.Nav_Test.OPTION_D != undefined && - - - - } - { - it.Nav_Test.TYPE !== 0 && it.Nav_Test.OPTION_E != "" && it.Nav_Test.OPTION_E != undefined && - - - - } - -
+ {idx + 1}. + {it.Nav_Test.NAME} + {this.getType(it.Nav_Test.TYPE)} +
+ this.doOptionChange(it, idx, 1, evt)} /> + 正确 + + { + it.Nav_Test.TYPE === 1 ? + this.doOptionChange(it, idx, 1, evt)} /> + : + this.doOptionChange(it, idx, 1, evt)} /> + } + A. + {it.Nav_Test.OPTION_A} +
+ this.doOptionChange(it, idx, 2, evt)} /> + 错误 + + { + it.Nav_Test.TYPE === 1 ? + this.doOptionChange(it, idx, 2, evt)} /> + : + this.doOptionChange(it, idx, 2, evt)} /> + } + B. + {it.Nav_Test.OPTION_B} +
- this.doOptionChange(it, idx, 1, evt)} /> - 正确 - + it.Nav_Test.TYPE !== 0 && +
{ it.Nav_Test.TYPE === 1 ? - this.doOptionChange(it, idx, 1, evt)} /> + this.doOptionChange(it, idx, 4, evt)} /> : - this.doOptionChange(it, idx, 1, evt)} /> + this.doOptionChange(it, idx, 4, evt)} /> } - A. - {it.Nav_Test.OPTION_A} + C. + {it.Nav_Test.OPTION_C}
- this.doOptionChange(it, idx, 2, evt)} /> - 错误 - + it.Nav_Test.TYPE !== 0 && it.Nav_Test.OPTION_D != "" && it.Nav_Test.OPTION_D != undefined && +
{ it.Nav_Test.TYPE === 1 ? - this.doOptionChange(it, idx, 2, evt)} /> + this.doOptionChange(it, idx, 8, evt)} /> : - this.doOptionChange(it, idx, 2, evt)} /> + this.doOptionChange(it, idx, 8, evt)} /> } - B. - {it.Nav_Test.OPTION_B} + D. + {it.Nav_Test.OPTION_D}
- { - it.Nav_Test.TYPE === 1 ? - this.doOptionChange(it, idx, 4, evt)} /> - : - this.doOptionChange(it, idx, 4, evt)} /> - } - C. - {it.Nav_Test.OPTION_C} -
- { - it.Nav_Test.TYPE === 1 ? - this.doOptionChange(it, idx, 8, evt)} /> - : - this.doOptionChange(it, idx, 8, evt)} /> - } - D. - {it.Nav_Test.OPTION_D} -
- { - it.Nav_Test.TYPE === 1 ? - this.doOptionChange(it, idx, 16, evt)} /> - : - this.doOptionChange(it, idx, 16, evt)} /> - } - E. - {it.Nav_Test.OPTION_E} -
-
+ { + it.Nav_Test.TYPE !== 0 && it.Nav_Test.OPTION_E != "" && it.Nav_Test.OPTION_E != undefined && +
+ { + it.Nav_Test.TYPE === 1 ? + this.doOptionChange(it, idx, 16, evt)} /> + : + this.doOptionChange(it, idx, 16, evt)} /> + } + E. + {it.Nav_Test.OPTION_E} +
+ + + ) + }) + } + +
From d0c5f0131586fcf5083f0660c5671cc827918040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Sun, 30 Nov 2025 02:16:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E6=82=A3=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E3=80=81=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/files/edit/HM041.js | 59 +++++++++++++++++++++++++++++++++++++ src/files/edit/SK014.js | 65 +++++++++++++---------------------------- 2 files changed, 79 insertions(+), 45 deletions(-) create mode 100644 src/files/edit/HM041.js diff --git a/src/files/edit/HM041.js b/src/files/edit/HM041.js new file mode 100644 index 0000000..0a775e2 --- /dev/null +++ b/src/files/edit/HM041.js @@ -0,0 +1,59 @@ +import { message } from "antd/lib/index"; +import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, empty,extendOrder, guid } from "../../utils/common"; +import { connect } from 'dva'; +/** + * @return {string} + */ +// 编辑 +export default { + onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => { + if (!(colInfo.FIELD_NAME == 'Nav_OperationStep.NAME')) + return; + + let code = getFieldValue('OPERATION_STEP_ID') + if(code && code!==null && code!==undefined) + { + let json = initFilter(login.OrgId); + extendRule(json, 'ID', 1, code); + extendInclude(json, 'Nav_SafeConfirms'); + extendInclude(json, 'Nav_SafeMeasures'); + extendInclude(json, 'Nav_DealMeasures'); + dispatch({ + type: 'app/getDataByPost', + url: 'HM/OperationStep/Get', + payload: json, + onlyData: false, + onComplete: (re) => { + if (re && re.IsSuccessful && re.Data) { + let temps = []; + let detailConfirms=re.Data.Nav_SafeConfirms?.map((item,i)=>{ + item['ROW_NO'] = item.NUM; + item['NUM'] = item.NUM; + item['NAME']=item.NAME; + return item; + }); + let detailMeasures=re.Data.Nav_SafeMeasures?.map((item,i)=>{ + item['ROW_NO'] = item.NUM; + item['NUM'] = item.NUM; + item['NAME']=item.NAME; + return item; + }); + let detailDeal=re.Data.Nav_DealMeasures?.map((item,i)=>{ + item['ROW_NO'] = item.NUM; + item['NUM'] = item.NUM; + item['NAME']=item.NAME; + return item; + }); + temps.push({ field: 'Nav_SafeConfirms', value: detailConfirms.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) }) + temps.push({ field: 'Nav_SafeMeasures', value: detailMeasures.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) }) + temps.push({ field: 'Nav_DealMeasures', value: detailDeal.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) }) + // temps.push({ field: 'SafeMeasuresStr', value: re.Data.SafeMeasuresStr}) + setFieldValueByBatch(temps); + //updateSubTableData(params.pageCode,detail,true) + } + } + }) + } + + }, +} diff --git a/src/files/edit/SK014.js b/src/files/edit/SK014.js index 997dcb7..45dac9e 100644 --- a/src/files/edit/SK014.js +++ b/src/files/edit/SK014.js @@ -30,55 +30,30 @@ export default { } }, - updateCheckUser: ({ row, pageCode, record, colInfo, resetFields, stateData, saveHeadRecord, saveRowRecord, getSelectedRecords, setState, emptyEditSelectedKeys }) => { - //,state const temps = state['editTableSelectedKeysT_BS_SAFE_CHECK_DETAIL'];// + editCode + (parentId ? parentId : '') - let DetailCheck = getSelectedRecords(); - if (DetailCheck && DetailCheck.length > 1) { - let ListCheckUserFirst = DetailCheck[0].Nav_RecitifyUser; - if (ListCheckUserFirst == null || ListCheckUserFirst.length < 1) { - message.error("请选择需要同步的检查人员!") - return - } - var isNeedEmpty = false; - //更新行数据 - for (let i = 1; i < DetailCheck.length; i++) { - //组装数据 - if (ListCheckUserFirst != undefined && ListCheckUserFirst) { - - let iRow = { ...DetailCheck[i] }; - iRow.Nav_RecitifyUser = ListCheckUserFirst; - saveRowRecord({ record: iRow, editCode: "T_SK_HIDDEN_DANGER_REPORT_DETAIL" }) + //向下同步培训组织 单选 + updateCheckUser: ({ stateData, saveRowRecord }) => { + var totalCount = stateData.Nav_ReportDetails.length + if (totalCount < 2) { + return + } - for (var x = 0; x < stateData.Nav_ReportDetails.length; x++) { - if (iRow.ID == stateData.Nav_ReportDetails[x].ID) { - stateData.Nav_ReportDetails[x].Nav_RecitifyUser = ListCheckUserFirst; - } - } - } else { - //人员删除 - let iRow = { ...DetailCheck[i] }; - iRow.Nav_RecitifyUser.IS_DELETED = true - saveRowRecord({ record: iRow, editCode: "T_SK_HIDDEN_DANGER_REPORT_DETAIL" }) - } - isNeedEmpty = true - //更新选中人员 - for (var x = 0; x < stateData.Nav_ReportDetails.length; x++) { - let users = stateData.Nav_ReportDetails[x].Nav_RecitifyUser - if (users && !users.IS_DELETED) { - stateData.CheckUsers = users - } - } - setState({ data: stateData }); + var user = {} + for (var i = 1; i < totalCount; i++) { + //本行数据 如果为空 取上一行的 RECITIFY_USER_ID Nav_RecitifyUser + if ((stateData.Nav_ReportDetails[i].RECITIFY_USER_ID == null || stateData.Nav_ReportDetails[i].RECITIFY_USER_ID == undefined) && stateData.Nav_ReportDetails[i - 1].RECITIFY_USER_ID) { + user = { + ID: stateData.Nav_ReportDetails[i - 1].RECITIFY_USER_ID, + NAME: stateData.Nav_ReportDetails[i - 1].Nav_RecitifyUser.NAME } - if (isNeedEmpty) { - emptyEditSelectedKeys() + if (user.ID != null && user.ID != undefined) { + let iRow = { ...stateData.Nav_ReportDetails[i] }; + iRow.RECITIFY_USER_ID = user.ID + iRow.Nav_RecitifyUser = user + saveRowRecord({ record: iRow, editCode: "T_SK_HIDDEN_DANGER_REPORT_DETAIL" }) } - }else - { - message.error("请选择需要同步的整改责任人!") - return } - }, + } +}, btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => { let DetailCheck = getSelectedRecords(); if(login.tempContents && login.tempContents.length>0)