生产单元
This commit is contained in:
parent
ea905b83c4
commit
758cc02b37
@ -48,7 +48,7 @@ export default {
|
|||||||
|
|
||||||
if(stateData)
|
if(stateData)
|
||||||
{
|
{
|
||||||
if(!stateData.MineType)
|
if(!stateData.PRODUCTION_UNIT_ID || stateData.PRODUCTION_UNIT_ID === null)
|
||||||
{
|
{
|
||||||
message.error("请先选择生产单元!");
|
message.error("请先选择生产单元!");
|
||||||
return;
|
return;
|
||||||
@ -58,7 +58,7 @@ export default {
|
|||||||
message.error("请先选择辨识区域!");
|
message.error("请先选择辨识区域!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(!stateData.RISK_NAME || stateData.RISK_NAME === null)
|
if(!stateData.RISK_NAME || stateData.RISK_NAME === null || stateData.RISK_NAME === '')
|
||||||
{
|
{
|
||||||
message.error("请先填写风险名称!");
|
message.error("请先填写风险名称!");
|
||||||
return;
|
return;
|
||||||
@ -69,13 +69,14 @@ export default {
|
|||||||
// return;
|
// 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);
|
let json = initFilter(login.OrgId);
|
||||||
// extendRule(json, 'TYPE_ID', 1, stateData.TYPE_ID);
|
// extendRule(json, 'TYPE_ID', 1, stateData.TYPE_ID);
|
||||||
extendRule(json, 'AREA_ID', 1, stateData.AREA_ID);
|
extendRule(json, 'AREA_ID', 1, stateData.AREA_ID);
|
||||||
extendRule(json, 'RISK_NAME', 1, stateData.RISK_NAME);
|
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');
|
||||||
extendInclude(json, 'Nav_Posts.Nav_PostDetails.Nav_Post');
|
extendInclude(json, 'Nav_Posts.Nav_PostDetails.Nav_Post');
|
||||||
extendInclude(json, 'Nav_Departs');
|
extendInclude(json, 'Nav_Departs');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user