|
@@ -111,7 +111,15 @@ $(".conditionHintTips").on('click','.calculate',function(e){
|
|
|
}
|
|
|
}
|
|
|
for(var s = 0;s < paramsJson.content.details.length;s++){
|
|
|
- if(paramsJson.content.details[s].controlType == 2 && paramsJson.content.details[s].value == ''){
|
|
|
+ var hasSelect = false
|
|
|
+ if(paramsJson.content.details[s].controlType == 0) {
|
|
|
+ for(let i = 0; i < paramsJson.content.details[s].details.length; i++) {
|
|
|
+ if(paramsJson.content.details[s].details[i].state == '1') {
|
|
|
+ hasSelect = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(paramsJson.content.details[s].controlType == 2 && paramsJson.content.details[s].value == ''||paramsJson.content.details[s].controlType == 0 && !hasSelect){
|
|
|
that.parent().find(".calculateError").css("display","block");
|
|
|
that.parent().find(".calculateResult").html('');
|
|
|
return;
|