Merge branch 'test' into version1.3.7.3

src/css/common.less

@@ -217,7 +217,23 @@ input:-ms-input-placeholder, textarea:-ms-input-placeholder {
     color: #aaa;
 }
 
-
+.modaltipSuc {
+    position: fixed;
+    top: 40%;
+    left: 50%;
+    padding: 10px 30px;
+    border-radius: 3px;
+    color: #fff;
+    background: rgba(0, 0, 0, .6);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#88000000,endColorstr=#88000000);
+    img {
+      display: block;
+      width: 40px;
+      text-align: center;
+      margin-left: 8px;
+      margin-bottom: 8px;
+    }
+  }
 
 .filterItem{
     margin-right: 30px !important;

src/css/console.less

@@ -677,7 +677,7 @@ div.console {
   cursor: pointer;
   position: absolute;
   right: 10px;
-  top: 4px;
+  top: 6px;
   p {
     width: 100px;
     height: 26px;

src/css/index.less

@@ -50,6 +50,7 @@
         color: #777777;
         a{
           color: #777777;
+          display: block;
         }
         &:hover,a:hover{
           color: @activeColor;

src/js/login.js

@@ -54,7 +54,7 @@ function sureLogin(){
      
       localStorage.setItem('accessToken',data.data.accessToken)
       $(".divModal").remove()
-      $.alerModal({"message":"登录成功",type:"tip",time:'1000'});
+      $.alerModal({"message":"登录成功",type:"tip",time:'1000',win:true});
       setTimeout(() => {
         window.location.href = '/index.html'
       }, 600);

src/js/modal.js

@@ -2,6 +2,7 @@ const jQuery = require('jquery');
 
 (function ($) {
     let close = require("../images/icon_close_default.png")
+    let suc = require("../images/success.png")
     let loadingImg = require("../images/loading.gif")
     $.alerModal = function (options) {
         var dft = {
@@ -35,8 +36,18 @@ const jQuery = require('jquery');
                 </div>
             </div>
         `
+        // var tip = `
+        //     <div class="modaltip">${ops.message}</div>
+        // `
         var tip = `
-            <div class="modaltip">${ops.message}</div>
+            ${ops.win?`
+            <div class="modaltipSuc">
+                <img src="${suc}" />
+                ${ops.message}
+            </div>`:`
+            <div class="modaltip">
+                ${ops.message}
+            </div>`}
         `
         var loading = `
             <div class="loading"><img src="${loadingImg}" alt=""></div>

src/js/qcScore.js

@@ -64,7 +64,10 @@ function initMenu(data){
   $(".page").on("click",function(){
     $(".info-item .cont,.flaw-item,td").removeClass("active");   //清空缺陷定位背景
     const title = $(this).attr("code");
-    if(title==="缺陷总览"||title==="谈话告知书"||title==="知情同意书"||title==="医嘱信息"){
+    if(title==="缺陷总览"||title==="谈话告知书"||title==="知情同意书"){
+      if(title==="缺陷总览"){
+        getRecordDetailUpdate()
+      }
       $(".flaw-table .page-item").hide();
       $(".flaw-table,.flaw-table .page-item[code="+title+"]").show();
     }else{
@@ -129,6 +132,27 @@ function getRecordDetail(){
     }
   });
 }
+function getRecordDetailUpdate(){
+  post(api.getRecordDetail,{'behospitalCode':global_id}).then(function(res){
+    if(res.data.code==='0'){
+      const data = res.data.data;
+      const {beHospital,result,msg,checkStatus,drgs} = data;
+      // global_check = checkStatus
+      // const info=Object.assign(beHospital,result);
+      // initMenu(JSON.parse(result.menuData));
+      // $(".subMenu >li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
+      // global_activeTab=$(".sub-menu .page.active").attr("code");
+      // initPatientInfo(info);
+      // initContent(result.pageData);
+      initList(msg);
+      initScoreItem(msg);
+      global_flawData=msg;
+      global_flawDataPay=drgs;
+      // setBoxHeight();
+      // changePay()
+    }
+  });
+}
 function changePay(){
   $(document).on('click',".titleSpecial span",function(){
     let type = $(this).attr("data-type")
@@ -241,9 +265,9 @@ function formatInfoData(k,data){
       })
     }else if(type&&type==2){
       $(".titleNo").css({
-        'border-left':0,
         'background-color': '#fff',
         'border': '1px solid #777',
+        'border-left':0,
         'color': '#777'
       })
       $(".titlePay").css({