Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r26398 -r26465 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 26398) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 26465) @@ -613,7 +613,10 @@ break; } } - } + }else{ + currentRecord.set('urgentLevel',null); + currentRecord.set('urgentLevelId',null); + } } } } @@ -732,7 +735,10 @@ break; } } - } + }else{ + currentRecord.set('urgentLevel',null); + currentRecord.set('urgentLevelId',null); + } } } } @@ -899,12 +905,14 @@ }else{ if (handleUrgentAmount.handleUaAndCount(urgentAmount, count)){ record.set("urgentAmount", originalValue); + record.set("urgentLevel", null); } //一次性物品加急数量的校验 if(sstsConfig.enableUrgentFunction && isDiposableGoods == '是'){ if (handleUrgentAmount.handleUrgentAmountDiposableGoods(context)){ - record.set("urgentAmount", originalValue); + record.set("urgentAmount",null); + record.set("urgentLevel", null); } } @@ -2108,9 +2116,16 @@ return true; } if (!isValidDiposableAmount(minApplyAmount, checkCount)) { - showResult("该一次性物品最小申请数量为" + minApplyAmount + ",所填数量必须是" + minApplyAmount + "的倍数。"); - record.set("count", context.originalValue); - return true; + if(count != null && count != ""){ + showResult("该一次性物品最小申请数量为" + minApplyAmount + ",所填数量必须是" + minApplyAmount + "的倍数。"); + record.set("count", context.originalValue); + return true; + }else{ + showResult("申请数量不能为空!"); + record.set("urgentAmount",null); + record.set("urgentLevel",null); + return true; + } } if (!isUndefinedOrNullOrEmpty(maxApplyAmount) && maxApplyAmount < checkCount) { showResult("申请数量大于最大可申请数量" + maxApplyAmount);