yuanzhi_kuang 5 bulan lalu
induk
melakukan
7bec644151
1 mengubah file dengan 26 tambahan dan 25 penghapusan
  1. 26 25
      备份/perfGoalsFillNew.js

+ 26 - 25
备份/perfGoalsFillNew.js

@@ -261,13 +261,13 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
         $('.tabwrap').each(function(index,tab){
             $('#tab'+index).jqGrid('editStop');
         })
-        if(_noPassVerifyArr.length > 0){
-            shr.showWarning({
-                message: _noPassVerifyArr[0].showName+':'+_noPassVerifyArr[0].errortext,
-                hideAfter: 5
-            });
-            return false;
-        }
+        // if(_noPassVerifyArr.length > 0){
+        //     shr.showWarning({
+        //         message: _noPassVerifyArr[0].showName+':'+_noPassVerifyArr[0].errortext,
+        //         hideAfter: 5
+        //     });
+        //     return false;
+        // }
         this.saveTargetClick(action);
     },
     // 列表模式删除指标
@@ -2563,9 +2563,9 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
                     // }else{
                     //     that.doSaveTarget(_targetStatus);
                     // }
-                    if(it.checkRequiredField()){
+                    // if(it.checkRequiredField()){
                         that.doSaveTarget(_targetStatus,action);
-                    }
+                    // }
                 }
             }
         });
@@ -2638,7 +2638,8 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
             $('#tab'+index).jqGrid('editStop');
         })
         //组装数据
-        var flag = that.assembleTargetData();
+        var flag =  that.assembleTargetData();
+         
         if(!flag){
             shr.showError({message : jsBizMultLan.perfweb_perfGoalsFillNew_26551296_i18n_75,hideAfter : 5});
             return false;
@@ -2828,7 +2829,7 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
     },
 
     // 列表模式组装数据+校验
-    assembleTargetDataListModel: function(){
+    assembleTargetDataListModel: function(optionType){
         var len = $('.tabwrap').length;
         var flag = true;
         var errMsg,_grid,FID,cellname,colvalue,td;
@@ -2866,7 +2867,7 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
                         colvalue = colvalue ? moment(colvalue).format('YYYY-MM-DD HH:mm:ss') : '';
                     }
                     // 校验必填
-                    if(classes && classes.indexOf('required') > -1 && !colvalue && colAttr.editable && !td.hasClass('not-editable-cell')){
+                    if(classes && classes.indexOf('required') > -1 && !colvalue && colAttr.editable && !td.hasClass('not-editable-cell') && optionType == "submit"){
                         errMsg = shr.formatMsg(jsBizMultLan.perfweb_perfgoalsfill_20221201_i18n_01, [showName]);
                         flag = false;
                         break;
@@ -2913,7 +2914,7 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
                     }
                     
                 }
-                if(!flag){
+                if(!flag &&  optionType == "submit"){
                     break;
                 }
                 indicatorListObj.indicatorList = [];
@@ -2928,7 +2929,7 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
                     recordFieldArr = indNameArr;
                 }
             }
-            if(!flag){
+            if(!flag  && optionType == "submit" ){
                 break;
             }
             targetParam.push({
@@ -2943,7 +2944,7 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
 
         // console.log(targetParam)
 
-        if(!flag){
+        if(!flag  && optionType == "submit"){
             $('.errorval').removeClass("errorval");
             shr.showWarning({
                 message: errMsg,
@@ -2954,9 +2955,9 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
         return flag;
     },
 
-    assembleTargetData : function(){
+    assembleTargetData : function(optionType){
         if(viewType == 'list'){ // 列表模式
-            return this.assembleTargetDataListModel();
+             return  this.assembleTargetDataListModel(optionType);
         }
         //组装要保存的指标数据
         var jsonObj = new Object();
@@ -5122,7 +5123,7 @@ shr.defineClass("shr.perfweb.perfGoalsFillNew", shr.framework.Edit, {
                     return false;
                     }
                     $('.scoreMenuList li').click();
-                    if(!canSaveVerify()){
+                    if(!canSaveVerify("submit")){
                         return false;
                     }else{
                         doSumbit();
@@ -7208,13 +7209,13 @@ function verifyIndicatorType(){
     }
 }
 
-function canSaveVerify(){
-    var flag = that.assembleTargetData();
-    if(!flag){
-        // shr.showError({message : '数据校验不通过,请检查!',hideAfter : 5});
-        shr.showError({message : jsBizMultLan.perfweb_perfGoalsFillNew_i18n_b10_15626131368_8,hideAfter : 5});
-        return false;
-    }
+function canSaveVerify(optionType){
+    var flag = that.assembleTargetData(optionType);
+    // if(!flag){
+    //     // shr.showError({message : '数据校验不通过,请检查!',hideAfter : 5});
+    //     shr.showError({message : jsBizMultLan.perfweb_perfGoalsFillNew_i18n_b10_15626131368_8,hideAfter : 5});
+    //     return false;
+    // }
     return flag;
 
     // golbalVerify(); //全局字段合法性校验