Ver Fonte

fixbugs

ting.yin há 6 anos atrás
pai
commit
384b2995f0

+ 8 - 9
stmms-web/src/main/webapp/static/mark-new/js/mark-control.js

@@ -497,6 +497,14 @@ MarkControl.prototype.submitTask = function(submitUrl) {
     var submitUrl = submitUrl != undefined && submitUrl.length > 0 ? submitUrl : this.option.submitUrl;
 
     if (task != undefined && this.context.submitting != true) {
+    	
+        //开启强制标记
+        if(this.option.forceSpecialTag===true){
+        	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
+        		return;
+        	}
+        }
+        
         task.markStepList = undefined;
         task.pictureUrls = undefined;
         task.pictureConfig = undefined;
@@ -510,15 +518,6 @@ MarkControl.prototype.submitTask = function(submitUrl) {
 
         this.trigger('task.submit.before');
         
-        //开启强制标记
-        if(this.option.forceSpecialTag==="true"){
-        	alert(this.option.forceSpecialTag);
-        	console.log(this.option.forceSpecialTag);
-        	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
-        		return;
-        	}
-        }
-        
         if (this.taskControl != undefined) {
             //已定义任务引擎
             this.taskControl.submit(task, function(status) {

+ 8 - 0
stmms-web/src/main/webapp/static/mark-track/js/mark-control.js

@@ -496,6 +496,14 @@ MarkControl.prototype.submitTask = function(submitUrl) {
     var submitUrl = submitUrl != undefined && submitUrl.length > 0 ? submitUrl : this.option.submitUrl;
 
     if (task != undefined && this.context.submitting != true) {
+    	
+        //开启强制标记
+        if(this.option.forceSpecialTag===true){
+        	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
+        		return;
+        	}
+        }
+        
         task.markStepList = undefined;
         task.pictureUrls = undefined;
         task.sheetUrls = undefined;