Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

src/css/qcList.less

@@ -115,6 +115,7 @@ table{
     left: 1008px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListDept.less

@@ -113,6 +113,7 @@ table{
     left: 1008px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListDocteam.less

@@ -112,6 +112,7 @@ table{
     left: 788px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListPerson.less

@@ -118,6 +118,7 @@ table{
     left: 1008px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcScore.less

@@ -801,4 +801,10 @@
     width: 100%;
     box-sizing: border-box;
   }
+}
+.modal .modal-footer a.cancel{
+  display: none;
+  color: #FF4D4F;
+  border-color: #FF4D4F;
+  margin-right: 16px;
 }

src/html/qcScore.html

@@ -326,8 +326,8 @@
                 <!--<p>确定要删除该评分记录吗？</p>-->
             </div>
             <div class="modal-footer">
+                <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/qcList.js

@@ -708,9 +708,14 @@ function bindColOrder(){
 }
 
 $(".patientNumInp").on("input", function(e){
-    const val = $(this).val().trim()
-    behospitalCodeTemp = val
-})
+    const val = $(this).val().trim();
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+        return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
+});
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()
     nameTemp = val

src/js/qcListDept.js

@@ -704,7 +704,12 @@ function bindColOrder(){
 }
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim()
-    behospitalCodeTemp = val
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+      return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
 })
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()

src/js/qcListDocteam.js

@@ -629,7 +629,12 @@ function bindColOrder(){
 }
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim()
-    behospitalCodeTemp = val
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+      return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
 })
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()

src/js/qcListPerson.js

@@ -701,7 +701,12 @@ function bindColOrder(){
 }
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim()
-    behospitalCodeTemp = val
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+      return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
 })
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()

src/js/qcScore.js

@@ -310,6 +310,7 @@ function addScore(info){
 function showModal(flag,code,i){
   $("#delModal .modal-body").html("");
   $("#delModal").show();
+  $("#delModal .cancel").hide();
   $(".info-item .cont,.flaw-item .title,td").removeClass("active");
   //事件解绑
   $("#delModal .confirm").off("click");
@@ -391,9 +392,9 @@ function showModal(flag,code,i){
     });
   }else{
     $("#delModal .title").text("删除评分");
-    $("#delModal .confirm").text("确定");
+    $("#delModal .cancel").show();
     $("#delModal .modal-body").html('<p>确定要删除该评分记录吗？</p>');
-    $("#delModal .confirm").click(function(){
+    $("#delModal .confirm").text("确定").click(function(){
       delScore(code,info);
     });
   }