Merge remote-tracking branch 'origin/qc_zn' into test

src/html/qcScore.html

@@ -2700,8 +2700,8 @@
                 <!--<p>确定要删除该评分记录吗？</p>-->
             </div>
             <div class="modal-footer">
-                <a class="confirm" href="javascript:void(0);">确定</a>
-                <a class="close cancel" href="javascript:void(0);">取消</a>
+                <a class="confirm" href="javascript:void(0);">保存</a>
+                <!--<a class="close cancel" href="javascript:void(0);">取消</a>-->
             </div>
         </div>
     </div>

src/js/qcScore.js

@@ -232,6 +232,7 @@ function showModal(flag,code,i){
   const info = flawsList[global_activeTab][i];
   if(flag==='0'){   //修改
     $("#delModal .title").text("修改");
+    $("#delModal .confirm").text("保存");
     $("#editTmpl").tmpl(info).appendTo("#delModal .modal-body");
     //分数输入验证
     $("#qcScore").on("input",function(){
@@ -262,6 +263,7 @@ function showModal(flag,code,i){
     });
   }else{
     $("#delModal .title").text("删除评分");
+    $("#delModal .confirm").text("确定");
     $("#delModal .modal-body").html('<p>确定要删除该评分记录吗？</p>');
     $("#delModal .confirm").click(function(){
       delScore(code,info);