修改

js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/shr/perfweb/perfplanExecute/evaResultManagerListExEx.js

@@ -901,19 +901,20 @@ shr.defineClass("shr.custom.evaResultManagerListExEx", shr.custom.evaResultManag
                                 //shr.custom.evaResultManagerListExEx.superClass.auditAction.call(_self);
                                 _self.reloadGrid();
                             },
+
                             openCallback: function () {
                                 if (bindDepLen > 0) {
-                                    // $("#tips-title").html("上季度部门绩效等级结果");
-                                    // //第二次进入返回false，让其不需要加载dom，加载我的业务
-                                    // $("#tips-detail").prepend('<button class="shrbtn shrbtn-intermediate continue">继续</button>');
-                                    // $("#tips-detail .continue").css("width", "auto");
-                                    // $("#tips-detail .continue").css("height", "30px");
-                                    // $("#tips-detail .continue").css("margin", "15px 12px 0 0");
-                                    // $("#message-tips").find("p#tips-detail button.continue").click(function (event) {
-                                    //     //_self.reloadGrid();
-                                    //     $("#mask").remove();
-                                    //     _self.evaresultAuditBeforeResut(_self, data);
-                                    // });
+                                     $("#tips-title").html(msg2);
+                                     //第二次进入返回false，让其不需要加载dom，加载我的业务
+                                     $("#tips-detail").prepend('<button class="shrbtn shrbtn-intermediate continue">继续</button>');
+                                     $("#tips-detail .continue").css("width", "auto");
+                                     $("#tips-detail .continue").css("height", "30px");
+                                     $("#tips-detail .continue").css("margin", "15px 12px 0 0");
+                                     $("#message-tips").find("p#tips-detail button.continue").click(function (event) {
+                                         //_self.reloadGrid();
+                                         $("#mask").remove();
+                                         _self.evaresultAuditBeforeResut(_self, data);
+                                     });
                                     return false;
                                 } else {
                                     //第一次进入返回true，让其先加载dom

js/deploy/easweb.ear/shr_web.war/addon/perfweb/web/js/shr/perfweb/portal/perfscoreNew.js

@@ -3052,6 +3052,20 @@ shr.defineClass("shr.perfweb.perfscoreNew", shr.framework.List, {
                                 });
                                 return false;
                             }
+                            //判断整体评价等级是否必填，如果必填则进行必录校验（矩阵考核需要根据节点进行判断）
+                            var needScoreSize = _gneedScoreArr.length;
+                            for(var j=0; j<needScoreSize; j++){
+                                if(_gneedScoreArr[j].gradeTaskNode == scoreObj[i].gradeTaskNode
+                                    && _gneedScoreArr[j].indicatorComment == 1
+                                    && _gneedScoreArr[j].perfGradeEvaluate == 1){
+                                    if (scoreObj[i].wholeGrade == '' || scoreObj[i].wholeGrade == undefined) {
+                                        //shr.showWarning({message: '请填写当前节点整体评价等级！'});
+                                        shr.showWarning({message: jsBizMultLan.perf_perfscoreNew_1586255739735_i18n_38});
+                                        canSubmitFlag = false;
+                                        return false;
+                                    }
+                                }
+                            }
                             //判断整体评语是否必录，如果必录则进行必录校验
                             // BT-00580949 绩效管理--绩效工作台--考核目标填报、目标变更--编辑指标，评价标准填写数字，保存js会报错
                             if (scoreObj[i].wholeComment == '' || scoreObj[i].wholeComment == undefined || (scoreObj[i].wholeComment+'').trim().length < 1) {
@@ -3083,20 +3097,7 @@ shr.defineClass("shr.perfweb.perfscoreNew", shr.framework.List, {
                                 }
                             }
 
-                            //判断整体评价等级是否必填，如果必填则进行必录校验（矩阵考核需要根据节点进行判断）
-                            var needScoreSize = _gneedScoreArr.length;
-                            for(var j=0; j<needScoreSize; j++){
-                           	 if(_gneedScoreArr[j].gradeTaskNode == scoreObj[i].gradeTaskNode 
-                           			 && _gneedScoreArr[j].indicatorComment == 1
-                           			 && _gneedScoreArr[j].perfGradeEvaluate == 1){
-                           		 if (scoreObj[i].wholeGrade == '' || scoreObj[i].wholeGrade == undefined) {
-                                    //shr.showWarning({message: '请填写当前节点整体评价等级！'});
-				    shr.showWarning({message: jsBizMultLan.perf_perfscoreNew_1586255739735_i18n_38});
-                                     canSubmitFlag = false;
-                                    return false;
-                                 }
-                           	  }
-                            }
+
                         } else {
                             shr.showWarning({message: data.msg});
                             return;