From 9c0858bc68e0f21f74300afa19a07b64156ba590 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: Fri, 13 Mar 2026 16:59:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BE=9D=E6=8D=AE?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SK/SK002ShowPrint.js | 36 ++++---- .../CustomPages/SK/SK004ShowPrint.js | 60 ++++++------ .../CustomPages/SK/SK006ShowPrint.js | 12 +-- .../CustomPages/SK/SK010ShowPrint.js | 12 +-- .../CustomPages/SK/SK012ShowPrint.js | 12 +-- src/files/edit/SK004.js | 28 ++++-- src/files/edit/SK010.js | 92 +++++++++++++++++++ 7 files changed, 176 insertions(+), 76 deletions(-) diff --git a/src/components/CustomPages/SK/SK002ShowPrint.js b/src/components/CustomPages/SK/SK002ShowPrint.js index f13c3aa..d9e13ce 100644 --- a/src/components/CustomPages/SK/SK002ShowPrint.js +++ b/src/components/CustomPages/SK/SK002ShowPrint.js @@ -44,24 +44,24 @@ class SK002ShowPrint extends React.Component { dataIndex: "Nav_Contents.CHECKCONTENT", key: "Nav_Contents.CHECKCONTENT", }, - // { - // title: "检查依据", - // dataIndex: "Nav_DetailBasics", - // key: "Nav_DetailBasics", - // render: (text, record) => - // { - // return - // } - // }, - // { - // title: "判定标准", - // dataIndex: "CHECK_STANDARD", - // key: "CHECK_STANDARD", - // }, + { + title: "检查依据", + dataIndex: "Nav_DetailBasics", + key: "Nav_DetailBasics", + render: (text, record) => + { + return + } + }, + { + title: "判定标准", + dataIndex: "CHECK_STANDARD", + key: "CHECK_STANDARD", + }, { title: '操作', dataIndex: '', diff --git a/src/components/CustomPages/SK/SK004ShowPrint.js b/src/components/CustomPages/SK/SK004ShowPrint.js index 0422557..22cada7 100644 --- a/src/components/CustomPages/SK/SK004ShowPrint.js +++ b/src/components/CustomPages/SK/SK004ShowPrint.js @@ -46,24 +46,24 @@ class SK004ShowPrint extends React.Component { dataIndex: "Nav_Contents.CHECKCONTENT", key: "Nav_Contents.CHECKCONTENT", }, - // { - // title: "检查依据", - // dataIndex: "Nav_DetailBasics", - // key: "Nav_DetailBasics", - // render: (text, record) => - // { - // return - // } - // }, - // { - // title: "判定标准", - // dataIndex: "CHECK_STANDARD", - // key: "CHECK_STANDARD", - // }, + { + title: "检查依据", + dataIndex: "Nav_DetailBasics", + key: "Nav_DetailBasics", + render: (text, record) => + { + return + } + }, + { + title: "判定标准", + dataIndex: "CHECK_STANDARD", + key: "CHECK_STANDARD", + }, { title: '操作', dataIndex: '', @@ -87,18 +87,18 @@ class SK004ShowPrint extends React.Component { dataIndex: "Nav_Department.NAME", key: "Nav_Department.NAME", }, - { - title: "检查岗位", - dataIndex: "Nav_DetailPosts", - key: "Nav_DetailPosts", - render: (text, record) => { - return - } - }, + // { + // title: "检查岗位", + // dataIndex: "Nav_DetailPosts", + // key: "Nav_DetailPosts", + // render: (text, record) => { + // return + // } + // }, { title: "检查类型", dataIndex: "Nav_CheckType.NAME", diff --git a/src/components/CustomPages/SK/SK006ShowPrint.js b/src/components/CustomPages/SK/SK006ShowPrint.js index 800dc48..5761f1f 100644 --- a/src/components/CustomPages/SK/SK006ShowPrint.js +++ b/src/components/CustomPages/SK/SK006ShowPrint.js @@ -177,8 +177,8 @@ class SK006ShowPrint extends React.Component { 序号 检查区域 检查内容 - {/* 检查依据 - 判定标准 */} + 检查依据 + 判定标准 检查人员 { @@ -197,7 +197,7 @@ class SK006ShowPrint extends React.Component { item.Nav_Contents?.CHECKCONTENT } - {/* + { item?.Nav_CheckNoticeDetailBasics && item?.Nav_CheckNoticeDetailBasics.map((item2, i) => { @@ -206,12 +206,12 @@ class SK006ShowPrint extends React.Component { // return }) } - */} - {/* + + { item.CHECKSTANDARD } - */} + { item?.Nav_CheckNoticeDetailUsers && item?.Nav_CheckNoticeDetailUsers.map((item2, i) => { diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js index 4e2c7b1..397a080 100644 --- a/src/components/CustomPages/SK/SK010ShowPrint.js +++ b/src/components/CustomPages/SK/SK010ShowPrint.js @@ -152,8 +152,8 @@ class SK010ShowPrint extends React.Component { 序号 检查区域 检查内容 - {/* 检查依据 - 判定标准 */} + 检查依据 + 判定标准 检查人员 检查情况 隐患描述 @@ -179,7 +179,7 @@ class SK010ShowPrint extends React.Component { item.Nav_Contents?.CHECKCONTENT } - {/* + { item?.Nav_CheckRecordDetailBasics && item?.Nav_CheckRecordDetailBasics.map((item2, i) => { @@ -188,12 +188,12 @@ class SK010ShowPrint extends React.Component { // return }) } - */} - {/* + + { item.CHECKSTANDARD } - */} + { item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => { diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js index 755f8ae..f861514 100644 --- a/src/components/CustomPages/SK/SK012ShowPrint.js +++ b/src/components/CustomPages/SK/SK012ShowPrint.js @@ -171,8 +171,8 @@ class SK012ShowPrint extends React.Component { 序号 检查区域 检查内容 - {/* 检查依据 - 判定标准 */} + 检查依据 + 判定标准 检查人员 检查情况 隐患描述 @@ -198,7 +198,7 @@ class SK012ShowPrint extends React.Component { item.Nav_Contents?.CHECKCONTENT } - {/* + { item?.Nav_CheckRecordDetailBasics && item?.Nav_CheckRecordDetailBasics.map((item2, i) => { @@ -207,12 +207,12 @@ class SK012ShowPrint extends React.Component { // return }) } - */} - {/* + + { item.CHECKSTANDARD } - */} + { item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => { diff --git a/src/files/edit/SK004.js b/src/files/edit/SK004.js index 3d619db..de20bf7 100644 --- a/src/files/edit/SK004.js +++ b/src/files/edit/SK004.js @@ -729,17 +729,25 @@ export default { check=re.Data.filter(t=>t.NAME=="巡回检查") checkCycle = 0 } - let temp={ - ID: guid(), - NUM:x.NUM, - CHECK_TYPE :x.DEPARTMENT_TYPE, - DEPARTMENT_ID:x.DEPARTMENT_ID, - Nav_Department:x.Nav_Department, - CHECK_TYPE_ID:check[0].ID, - Nav_CheckType:check[0], - CHECK_CYCLE:checkCycle + if(check && check.length>0) + { + let temp={ + ID: guid(), + NUM:x.NUM, + CHECK_TYPE :x.DEPARTMENT_TYPE, + DEPARTMENT_ID:x.DEPARTMENT_ID, + Nav_Department:x.Nav_Department, + CHECK_TYPE_ID:check[0].ID, + Nav_CheckType:check[0], + CHECK_CYCLE:checkCycle + } + temps.push(temp) + } + else + { + message.error("当前生产单元未找到对应检查类型，请到系统管理维护"); + return; } - temps.push(temp) }) } else diff --git a/src/files/edit/SK010.js b/src/files/edit/SK010.js index 0a9f5b6..c462bd8 100644 --- a/src/files/edit/SK010.js +++ b/src/files/edit/SK010.js @@ -135,4 +135,96 @@ export default { close(); } }, + btnSubImport: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => { + + if(login.tempContents && login.tempContents.length>0) + { + let tmpDatas=[] + login.tempContents.map((item,i)=>{ + let basics=[] + item.Nav_ContentsBasics && item.Nav_ContentsBasics.map((y,i)=>{ + let basic={ + ID: guid(), + LAW_ID:y.LAW_ID, + Nav_Law:y.Nav_Law + } + basics.push(basic) + }) + let tmpData = { + ID: guid(), + CHECK_CONTENTS_ID:item.ID, + Nav_Contents:item, + Nav_CheckRecordDetailBasics:basics, + CHECKCONTENT:item.CHECKCONTENT, + CHECKSTANDARD:item.CHECK_STANDARD, + // NUM:i+1 + } + tmpDatas.push(tmpData); + }); + if (tmpDatas && tmpDatas.length > 0) { + //更新行数据 + if(stateData.Nav_CheckRecordDetails && stateData.Nav_CheckRecordDetails.length>0) + { + for (let j = 0; j < tmpDatas.length; j++) + { + stateData.Nav_CheckRecordDetails.push(tmpDatas[j]) + } + } + else + { + stateData.Nav_CheckRecordDetails = tmpDatas; + } + saveRowRecord({ record: stateData, editCode: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL" }) + } + login.tempContents =[]; + close(); + } + +}, +btnSumImport: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => { + + if(login.tempContents && login.tempContents.length>0) + { + let tmpDatas=[] + login.tempContents.map((item,i)=>{ + let basics=[] + item.Nav_ContentsBasics && item.Nav_ContentsBasics.map((y,i)=>{ + let basic={ + ID: guid(), + LAW_ID:y.LAW_ID, + Nav_Law:y.Nav_Law + } + basics.push(basic) + }) + let tmpData = { + ID: guid(), + CHECK_CONTENTS_ID:item.ID, + Nav_Contents:item, + Nav_CheckRecordDetailBasics:basics, + CHECKCONTENT:item.CHECKCONTENT, + CHECKSTANDARD:item.CHECK_STANDARD, + // NUM:i+1 + } + tmpDatas.push(tmpData); + }); + if (tmpDatas && tmpDatas.length > 0) { + //更新行数据 + if(stateData.Nav_CheckRecordDetails && stateData.Nav_CheckRecordDetails.length>0) + { + for (let j = 0; j < tmpDatas.length; j++) + { + stateData.Nav_CheckRecordDetails.push(tmpDatas[j]) + } + } + else + { + stateData.Nav_CheckRecordDetails = tmpDatas; + } + saveRowRecord({ record: stateData, editCode: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL" }) + } + login.tempContents =[]; + close(); + } + +}, } From f56efa71e5cd98752fd909ccb43ba976a144e58a 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: Fri, 13 Mar 2026 17:20:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/files/edit/SK006.js | 38 +++++++++++++++++++++++++++++++++++++- src/files/edit/SK010.js | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/src/files/edit/SK006.js b/src/files/edit/SK006.js index 84a4ab7..9af8941 100644 --- a/src/files/edit/SK006.js +++ b/src/files/edit/SK006.js @@ -37,7 +37,7 @@ export default { } }, - onSubChange: ({ row, setDataState, pageCode, record, colInfo, dispatch, stateData, props }) => { + onSubChange: ({ row, setDataState, pageCode, record,saveRowRecord, colInfo, dispatch, stateData, props }) => { if (colInfo.FIELD_NAME == "Nav_CheckNoticeDetailUsers") { @@ -59,6 +59,42 @@ export default { setDataState({ ...stateData }); } + if (colInfo.FIELD_NAME == 'Nav_Contents.CHECKCONTENT') { + let trainId = getDataFieldValue(record, 'CHECK_CONTENTS_ID'); + if (trainId) { + const json = initFilter(); + extendRule(json, 'ID', 1, trainId); + extendInclude(json, 'Nav_ContentsBasics.Nav_Law') + dispatch({ + type: 'app/getDataByPost', + url: 'SK/SKCheckContents/SKOrderPaged', + payload: json, + onComplete: (ret) => { + if (ret) { + //record["Nav_Posts"] = []; + let copyRecord={...record}; + if (ret && ret.length > 0) { + let identifyings= ret[0].Nav_ContentsBasics.map(item => { + return { + CHECK_CONTENTS_ID: record.ID, + ID: guid(), + LAW_ID: item.LAW_ID, + Nav_Law: item.Nav_Law, + ORG_ID: record.ORG_ID, + }; + }); + copyRecord["Nav_CheckNoticeDetailBasics"]=[...identifyings] + } + console.log(copyRecord) + saveRowRecord(copyRecord) + } + } + }) + } else { + record.Nav_CheckNoticeDetailBasics = []; + saveRowRecord(record) + } + } }, updateCheckUser: ({ row, pageCode, record, colInfo, resetFields, stateData, saveHeadRecord, saveRowRecord, getSelectedRecords, setState, emptyEditSelectedKeys }) => { //,state const temps = state['editTableSelectedKeysT_BS_SAFE_CHECK_DETAIL'];// + editCode + (parentId ? parentId : '') diff --git a/src/files/edit/SK010.js b/src/files/edit/SK010.js index c462bd8..e30d158 100644 --- a/src/files/edit/SK010.js +++ b/src/files/edit/SK010.js @@ -62,7 +62,7 @@ export default { }) } }, - onSubChange: ({ row, setDataState, pageCode, record, colInfo, dispatch, stateData, props }) => { + onSubChange: ({ row, setDataState, saveRowRecord,pageCode, record, colInfo, dispatch, stateData, props }) => { if (colInfo.FIELD_NAME == "Nav_CheckRecordDetailUsers") { @@ -84,6 +84,42 @@ export default { setDataState({ ...stateData }); } + if (colInfo.FIELD_NAME == 'Nav_Contents.CHECKCONTENT') { + let trainId = getDataFieldValue(record, 'CHECK_CONTENTS_ID'); + if (trainId) { + const json = initFilter(); + extendRule(json, 'ID', 1, trainId); + extendInclude(json, 'Nav_ContentsBasics.Nav_Law') + dispatch({ + type: 'app/getDataByPost', + url: 'SK/SKCheckContents/SKOrderPaged', + payload: json, + onComplete: (ret) => { + if (ret) { + //record["Nav_Posts"] = []; + let copyRecord={...record}; + if (ret && ret.length > 0) { + let identifyings= ret[0].Nav_ContentsBasics.map(item => { + return { + CHECK_CONTENTS_ID: record.ID, + ID: guid(), + LAW_ID: item.LAW_ID, + Nav_Law: item.Nav_Law, + ORG_ID: record.ORG_ID, + }; + }); + copyRecord["Nav_CheckRecordDetailBasics"]=[...identifyings] + } + console.log(copyRecord) + saveRowRecord(copyRecord) + } + } + }) + } else { + record.Nav_CheckRecordDetailBasics = []; + saveRowRecord(record) + } + } }, btnSubAdd: ({ record,data, parentRecord, stateData,setState, close, loadData, login, btn, dispatch }) => {