diff --git a/src/files/edit/SK004.js b/src/files/edit/SK004.js index 707a4b5..e9661a3 100644 --- a/src/files/edit/SK004.js +++ b/src/files/edit/SK004.js @@ -48,7 +48,7 @@ export default { if(stateData) { - if(!stateData.MineType) + if(!stateData.PRODUCTION_UNIT_ID || stateData.PRODUCTION_UNIT_ID === null) { message.error("请先选择生产单元!"); return; @@ -58,7 +58,7 @@ export default { message.error("请先选择辨识区域!"); return; } - if(!stateData.RISK_NAME || stateData.RISK_NAME === null) + if(!stateData.RISK_NAME || stateData.RISK_NAME === null || stateData.RISK_NAME === '') { message.error("请先填写风险名称!"); return; @@ -69,13 +69,14 @@ export default { // return; // } - if (stateData.AREA_ID && stateData.AREA_ID !== null && stateData.RISK_NAME && stateData.RISK_NAME !== null && stateData.MineType) + if (stateData.AREA_ID && stateData.AREA_ID !== null && stateData.RISK_NAME && stateData.RISK_NAME !== null&& stateData.RISK_NAME !== '' && stateData.PRODUCTION_UNIT_ID&& stateData.PRODUCTION_UNIT_ID!== null) { let json = initFilter(login.OrgId); // extendRule(json, 'TYPE_ID', 1, stateData.TYPE_ID); extendRule(json, 'AREA_ID', 1, stateData.AREA_ID); extendRule(json, 'RISK_NAME', 1, stateData.RISK_NAME); - extendRule(json, 'MineType', 1, stateData.MineType); + extendRule(json, 'PRODUCTION_UNIT_ID', 1, stateData.PRODUCTION_UNIT_ID); + extendInclude(json, 'Nav_ProductionUnit'); extendInclude(json, 'Nav_Posts'); extendInclude(json, 'Nav_Posts.Nav_PostDetails.Nav_Post'); extendInclude(json, 'Nav_Departs');