Merge branch 'version1.3.7' into test

src/js/qcScore.js

@@ -123,7 +123,6 @@ function getRecordDetail(){
 
 //填充患者信息
 function initPatientInfo(data){
-  console.log('global_check',global_check)
   const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age,checkState:global_check});
   $("#infoTmpl").tmpl(obj).appendTo("#patientInfo");
   $(".check").on("click", function(){
@@ -639,10 +638,10 @@ function formatFlawKeys(data){
       if(res.data.code==='0') {
         global_check = 1
         $(".check").text("重新核查")
-        $.alerModal({"message":`<div class="checkTipsBox"><img class="checkImg" src=${checkOk}><p class="checkTxt">核查成功</p></div>`,type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
+        $.alerModal({"message":`<div class="checkTipsBox"><img class="checkImg" src=${checkOk}><p class="checkTxt">核查成功</p></div>`,type:"tip",time:'1000',isFather: false});
        
       }else{
-        $.alerModal({"message":res.msg ||"核查失败",type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
+        $.alerModal({"message":res.data.msg ||"核查失败",type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
       }
     });
   }