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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

Browse Source
This commit is contained in:
wyw 2026-03-16 16:12:38 +08:00
commit 6283dec74d
8 changed files with 250 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/components/CustomPages/SK/SK002ShowPrint.js
View File

@ -44,24 +44,24 @@ class SK002ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT", dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT", key: "Nav_Contents.CHECKCONTENT",
}, },
// { {
// title: "检查依据", title: "检查依据",
// dataIndex: "Nav_DetailBasics", dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics", key: "Nav_DetailBasics",
// render: (text, record) => render: (text, record) =>
// { {
// return <label>{ return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => { record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' ' return item?.Nav_Law?.NAME+' '
// }) })
// }</label> }</label>
// } }
// }, },
// { {
// title: "判定标准", title: "判定标准",
// dataIndex: "CHECK_STANDARD", dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD", key: "CHECK_STANDARD",
// }, },
{ {
title: '操作', title: '操作',
dataIndex: '', dataIndex: '',

60
src/components/CustomPages/SK/SK004ShowPrint.js
View File

@ -46,24 +46,24 @@ class SK004ShowPrint extends React.Component {
dataIndex: "Nav_Contents.CHECKCONTENT", dataIndex: "Nav_Contents.CHECKCONTENT",
key: "Nav_Contents.CHECKCONTENT", key: "Nav_Contents.CHECKCONTENT",
}, },
// { {
// title: "检查依据", title: "检查依据",
// dataIndex: "Nav_DetailBasics", dataIndex: "Nav_DetailBasics",
// key: "Nav_DetailBasics", key: "Nav_DetailBasics",
// render: (text, record) => render: (text, record) =>
// { {
// return <label>{ return <label>{
// record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => { record.Nav_DetailBasics && record.Nav_DetailBasics.map((item, i) => {
// return item?.Nav_Law?.NAME+' ' return item?.Nav_Law?.NAME+' '
// }) })
// }</label> }</label>
// } }
// }, },
// { {
// title: "判定标准", title: "判定标准",
// dataIndex: "CHECK_STANDARD", dataIndex: "CHECK_STANDARD",
// key: "CHECK_STANDARD", key: "CHECK_STANDARD",
// }, },
{ {
title: '操作', title: '操作',
dataIndex: '', dataIndex: '',
@ -87,18 +87,18 @@ class SK004ShowPrint extends React.Component {
dataIndex: "Nav_Department.NAME", dataIndex: "Nav_Department.NAME",
key: "Nav_Department.NAME", key: "Nav_Department.NAME",
}, },
{ // {
title: "检查岗位", // title: "检查岗位",
dataIndex: "Nav_DetailPosts", // dataIndex: "Nav_DetailPosts",
key: "Nav_DetailPosts", // key: "Nav_DetailPosts",
render: (text, record) => { // render: (text, record) => {
return <label>{ // return <label>{
record.Nav_DetailPosts && record.Nav_DetailPosts.map((item, i) => { // record.Nav_DetailPosts && record.Nav_DetailPosts.map((item, i) => {
return item.Nav_Post.NAME + ' ' // return item.Nav_Post.NAME + ' '
}) // })
}</label> // }</label>
} // }
}, // },
{ {
title: "检查类型", title: "检查类型",
dataIndex: "Nav_CheckType.NAME", dataIndex: "Nav_CheckType.NAME",

12
src/components/CustomPages/SK/SK006ShowPrint.js
View File

@ -177,8 +177,8 @@ class SK006ShowPrint extends React.Component {
<td style={{ width: "150px" }} className={stylesStep.fontBold}>序号</td> <td style={{ width: "150px" }} className={stylesStep.fontBold}>序号</td>
<td className={stylesStep.fontBold}>检查区域</td> <td className={stylesStep.fontBold}>检查区域</td>
<td className={stylesStep.fontBold}>检查内容</td> <td className={stylesStep.fontBold}>检查内容</td>
{/* <td width='10%' className={stylesStep.fontBold}>检查依据</td> <td width='10%' className={stylesStep.fontBold}>检查依据</td>
<td width='10%' className={stylesStep.fontBold}>判定标准</td> */} <td width='10%' className={stylesStep.fontBold}>判定标准</td>
<td className={stylesStep.fontBold}>检查人员</td> <td className={stylesStep.fontBold}>检查人员</td>
</tr> </tr>
{ {
@ -197,7 +197,7 @@ class SK006ShowPrint extends React.Component {
item.Nav_Contents?.CHECKCONTENT item.Nav_Contents?.CHECKCONTENT
} }
</td> </td>
{/* <td> <td>
{ {
item?.Nav_CheckNoticeDetailBasics && item?.Nav_CheckNoticeDetailBasics.map((item2, i) => { item?.Nav_CheckNoticeDetailBasics && item?.Nav_CheckNoticeDetailBasics.map((item2, i) => {
@ -206,12 +206,12 @@ class SK006ShowPrint extends React.Component {
// return <tr><label> {item2.Nav_User?.NAME}</label></tr> // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
}) })
} }
</td> */} </td>
{/* <td> <td>
{ {
item.CHECKSTANDARD item.CHECKSTANDARD
} }
</td> */} </td>
<td> <td>
{ {
item?.Nav_CheckNoticeDetailUsers && item?.Nav_CheckNoticeDetailUsers.map((item2, i) => { item?.Nav_CheckNoticeDetailUsers && item?.Nav_CheckNoticeDetailUsers.map((item2, i) => {

12
src/components/CustomPages/SK/SK010ShowPrint.js
View File

@ -152,8 +152,8 @@ class SK010ShowPrint extends React.Component {
<td style={{ width: "150px" }} className={stylesStep.fontBold}>序号</td> <td style={{ width: "150px" }} className={stylesStep.fontBold}>序号</td>
<td width='10%' className={stylesStep.fontBold}>检查区域</td> <td width='10%' className={stylesStep.fontBold}>检查区域</td>
<td className={stylesStep.fontBold}>检查内容</td> <td className={stylesStep.fontBold}>检查内容</td>
{/* <td width='10%' className={stylesStep.fontBold}>检查依据</td> <td width='10%' className={stylesStep.fontBold}>检查依据</td>
<td width='10%' className={stylesStep.fontBold}>判定标准</td> */} <td width='10%' className={stylesStep.fontBold}>判定标准</td>
<td className={stylesStep.fontBold}>检查人员</td> <td className={stylesStep.fontBold}>检查人员</td>
<td width='10%' className={stylesStep.fontBold}>检查情况</td> <td width='10%' className={stylesStep.fontBold}>检查情况</td>
<td className={stylesStep.fontBold}>隐患描述</td> <td className={stylesStep.fontBold}>隐患描述</td>
@ -179,7 +179,7 @@ class SK010ShowPrint extends React.Component {
item.Nav_Contents?.CHECKCONTENT item.Nav_Contents?.CHECKCONTENT
} }
</td> </td>
{/* <td> <td>
{ {
item?.Nav_CheckRecordDetailBasics && item?.Nav_CheckRecordDetailBasics.map((item2, i) => { item?.Nav_CheckRecordDetailBasics && item?.Nav_CheckRecordDetailBasics.map((item2, i) => {
@ -188,12 +188,12 @@ class SK010ShowPrint extends React.Component {
// return <tr><label> {item2.Nav_User?.NAME}</label></tr> // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
}) })
} }
</td> */} </td>
{/* <td> <td>
{ {
item.CHECKSTANDARD item.CHECKSTANDARD
} }
</td> */} </td>
<td> <td>
{ {
item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => { item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => {

12
src/components/CustomPages/SK/SK012ShowPrint.js
View File

@ -171,8 +171,8 @@ class SK012ShowPrint extends React.Component {
<td style={{ width: "150px" }} className={stylesStep.fontBold}>序号</td> <td style={{ width: "150px" }} className={stylesStep.fontBold}>序号</td>
<td width='10%' className={stylesStep.fontBold}>检查区域</td> <td width='10%' className={stylesStep.fontBold}>检查区域</td>
<td className={stylesStep.fontBold}>检查内容</td> <td className={stylesStep.fontBold}>检查内容</td>
{/* <td width='10%' className={stylesStep.fontBold}>检查依据</td> <td width='10%' className={stylesStep.fontBold}>检查依据</td>
<td width='10%' className={stylesStep.fontBold}>判定标准</td> */} <td width='10%' className={stylesStep.fontBold}>判定标准</td>
<td className={stylesStep.fontBold}>检查人员</td> <td className={stylesStep.fontBold}>检查人员</td>
<td width='10%' className={stylesStep.fontBold}>检查情况</td> <td width='10%' className={stylesStep.fontBold}>检查情况</td>
<td className={stylesStep.fontBold}>隐患描述</td> <td className={stylesStep.fontBold}>隐患描述</td>
@ -198,7 +198,7 @@ class SK012ShowPrint extends React.Component {
item.Nav_Contents?.CHECKCONTENT item.Nav_Contents?.CHECKCONTENT
} }
</td> </td>
{/* <td> <td>
{ {
item?.Nav_CheckRecordDetailBasics && item?.Nav_CheckRecordDetailBasics.map((item2, i) => { item?.Nav_CheckRecordDetailBasics && item?.Nav_CheckRecordDetailBasics.map((item2, i) => {
@ -207,12 +207,12 @@ class SK012ShowPrint extends React.Component {
// return <tr><label> {item2.Nav_User?.NAME}</label></tr> // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
}) })
} }
</td> */} </td>
{/* <td> <td>
{ {
item.CHECKSTANDARD item.CHECKSTANDARD
} }
</td> */} </td>
<td> <td>
{ {
item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => { item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => {

28
src/files/edit/SK004.js
View File

@ -729,17 +729,25 @@ export default {
check=re.Data.filter(t=>t.NAME=="巡回检查") check=re.Data.filter(t=>t.NAME=="巡回检查")
checkCycle = 0 checkCycle = 0
} }
let temp={ if(check && check.length>0)
ID: guid(), {
NUM:x.NUM, let temp={
CHECK_TYPE :x.DEPARTMENT_TYPE, ID: guid(),
DEPARTMENT_ID:x.DEPARTMENT_ID, NUM:x.NUM,
Nav_Department:x.Nav_Department, CHECK_TYPE :x.DEPARTMENT_TYPE,
CHECK_TYPE_ID:check[0].ID, DEPARTMENT_ID:x.DEPARTMENT_ID,
Nav_CheckType:check[0], Nav_Department:x.Nav_Department,
CHECK_CYCLE:checkCycle CHECK_TYPE_ID:check[0].ID,
Nav_CheckType:check[0],
CHECK_CYCLE:checkCycle
}
temps.push(temp)
}
else
{
message.error("当前生产单元未找到对应检查类型，请到系统管理维护");
return;
} }
temps.push(temp)
}) })
} }
else else

38
src/files/edit/SK006.js
View File

@ -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") { if (colInfo.FIELD_NAME == "Nav_CheckNoticeDetailUsers") {
@ -59,6 +59,42 @@ export default {
setDataState({ ...stateData }); 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 }) => { updateCheckUser: ({ row, pageCode, record, colInfo, resetFields, stateData, saveHeadRecord, saveRowRecord, getSelectedRecords, setState, emptyEditSelectedKeys }) => {
//,state const temps = state['editTableSelectedKeysT_BS_SAFE_CHECK_DETAIL'];// + editCode + (parentId ? parentId : '') //,state const temps = state['editTableSelectedKeysT_BS_SAFE_CHECK_DETAIL'];// + editCode + (parentId ? parentId : '')

130
src/files/edit/SK010.js
View File

@ -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") { if (colInfo.FIELD_NAME == "Nav_CheckRecordDetailUsers") {
@ -84,6 +84,42 @@ export default {
setDataState({ ...stateData }); 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 }) => { btnSubAdd: ({ record,data, parentRecord, stateData,setState, close, loadData, login, btn, dispatch }) => {
@ -135,4 +171,96 @@ export default {
close(); 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();
}
},
} }