Browse Source

Merge remote-tracking branch 'origin/version1.3.3' into test

# Conflicts:
#	src/html/qcList.html
zhouna 5 years ago
parent
commit
706b5ece7b
2 changed files with 2 additions and 17 deletions
  1. 0 17
      src/html/qcList.html
  2. 2 0
      src/js/qcScore.js

+ 0 - 17
src/html/qcList.html

@@ -62,23 +62,6 @@
                     <span>医生工号:</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
-                <!-- <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
-                    <span class="fl">出院日期:</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
-                    <span  class="divide fl">-</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
-                </span> -->
-                    <span class="filterItem">
-                    <span>病历等级:</span>
-                    <span class="selectLevel">全部</span>
-                    <ul class="levelList filterDropList">
-                        <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
-                        <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
-                        <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
-                        <li class="levelItem" data-name="乙" data-id=乙>乙</li>
-                        <li class="levelItem" data-name="丙" data-id=丙>丙</li>
-                    </ul>
-                </span>
                 </div>
             </div>
             <div class="overAuto">

+ 2 - 0
src/js/qcScore.js

@@ -51,6 +51,7 @@ function initMenu(data){
   });
   //右侧内容切换
   $(".page").on("click",function(){
+    $(".info-item .cont,.flaw-item").removeClass("active");   //清空缺陷定位背景
     const title = $(this).attr("code");
     if(title==="缺陷总览"||title==="谈话告知书"||title==="知情同意书"){
       $(".flaw-table .page-item").hide();
@@ -171,6 +172,7 @@ function formatInfoData(k,data){
       $(".sub-menu .page[code="+pCode+"]").parents(".list-1").click();
       $(".sub-menu .page[code="+pCode+"],.menu-mini .page[code="+pCode+"").click();
       //缺陷定位
+      $(".info-item .cont,.flaw-item").removeClass("active");
       const flawItem=$(".flaw-item .title a[code="+code+"]");
       if(!flawItem.length){
         $.alerModal({"message":'模块数据缺失~',type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});