This commit is contained in:
@@ -530,7 +530,8 @@ $(function()
|
||||
requiredFields = requiredFields.split(',');
|
||||
$.each(requiredFields, function(_, requiredId)
|
||||
{
|
||||
var $required = $$('[name^=' + requiredId);
|
||||
if(requiredId === '') return true;
|
||||
var $required = $$('input[name="' + requiredId + '"]');
|
||||
var $authBlock = !$required.is('input') ? $required.find('input').last() : $required;
|
||||
if($authBlock.length)
|
||||
{
|
||||
@@ -538,7 +539,8 @@ $(function()
|
||||
if(val === undefined || val === null || val === '' || val === '0')
|
||||
{
|
||||
targetStatus.submitOK = false;
|
||||
if(!targetStatus.waitField) targetStatus.waitField = $required;
|
||||
if(task.nav.module == 'program' && task.nav.method == 'create' && requiredId === 'end' && $$('[name="longTime"]').val() == 'on') targetStatus.submitOK = true;
|
||||
if(!targetStatus.submitOK && !targetStatus.waitField) targetStatus.waitField = $required;
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -549,9 +551,10 @@ $(function()
|
||||
|
||||
var onFormSubmit = function(e)
|
||||
{
|
||||
var iWindow = getAppWindow();
|
||||
var iWindow = getAppWindow();
|
||||
var fieldSelector = getFieldSelector(task, iWindow);
|
||||
var status = checkFieldStatusReady(iWindow, fieldSelector);
|
||||
var status = checkFieldStatusReady(iWindow, fieldSelector);
|
||||
debugger;
|
||||
if(status.submitOK)
|
||||
{
|
||||
setTaskStatus(true, true, true, true);
|
||||
@@ -583,7 +586,7 @@ $(function()
|
||||
else if(requiredFields)
|
||||
{
|
||||
requiredFields = requiredFields.split(',');
|
||||
$.each(requiredFields, function(_, requiredId){ fieldSelector += ',' + '#' + requiredId;});
|
||||
$.each(requiredFields, function(_, requiredId){ fieldSelector += ',' + '[name="' + requiredId + '"]';});
|
||||
if(fieldSelector.length > 1) fieldSelector = fieldSelector.substring(1);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user