Merge branch 'dev_zxc' into test

src/css/index.less

@@ -343,6 +343,7 @@
   .itemMsgInfoBox{
     line-height: 40px;
     margin: 0 0 10px 0;
+    position: relative;
   }
   .itemInfoRight{
     display: inline-block;
@@ -364,9 +365,13 @@
     color: #777;
   }
   .itemMsgInfoTips{
+    position: absolute;
     color: red;
     font-size: 14px;
     text-align: center;
+    width: 100%;
+    height: 14px;
+    top: 27px;
     display: none;
   }
   .switchImg{

src/css/itemManager.less

@@ -52,15 +52,16 @@ table{
     }
     
 }
-.filterBox{
-    margin: 0 0 20px 0;
-}
+// .filterBox{
+//     margin: 0 0 20px 0;
+// }
 .filterItem{
     position: relative;
     display: inline-block;
     margin-right: 20px;
     height: 40px;
     line-height: 40px;
+    margin: 0 20px 20px 0;
 }
 .filterDropList{
     position: absolute;

src/css/qcList.less

@@ -86,16 +86,14 @@ table{
     border: 1px solid #5A8EEE;
     color: #5A8EEE;
 }
-.filterBox{
-    margin: 0 0 20px 0;
-}
+
 .filterItem{
     position: relative;
     display: inline-block;
-    margin-right: 20px;
     float: left;
     height: 40px;
     line-height: 40px;
+    margin: 0 20px 20px 0;
     span{
         display: inline-block;
         line-height: 40px;
@@ -112,6 +110,40 @@ table{
         box-sizing: border-box;
     }
 }
+
+.filterDropList{
+    position: absolute;
+    right: 0;
+    height: 200px;
+    overflow-y: auto;
+    background: #fff;
+    display: none;
+    border: 1px solid #e4e7ed;
+    box-shadow: 0 2px 12px 0 #e4e7ed;
+    z-index: 2;
+    li{
+        padding: 0 10px;
+    }
+}
+.levelList{
+    width: 120px;
+    height: 200px;
+    li:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+}
+.selectLevel{
+    display: inline-block;
+    position: relative;
+    width:120px;
+    padding: 0 10px;
+    height:40px;
+    border-radius:4px;
+    border: 1px solid #E2E5EF;
+    box-sizing: border-box;
+    cursor: pointer;
+}
 .filter{
     display: inline-block;
     width:60px;
@@ -124,6 +156,13 @@ table{
     position: relative;
     top: 2px;
     cursor: pointer;
+    float: left;
+}
+.arrow{
+    position: absolute;
+    width: 10px;
+    top: 16px;
+    right: 10px;
 }
 .iconCheck{
     width: 14px;

src/html/qcList.html

@@ -15,20 +15,30 @@
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem typeFilter">
-                    <span>病案号：</span>
-                    <input class="patientNumInp" type="text" placeholder="请输入病案号">
+                    <span>病历号：</span>
+                    <input class="patientNumInp" type="text" placeholder="请输入病历号">
                 </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名：</span>
                     <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
                 </span>
                 <span class="filterItem typeFilter clearfix">
-                    <span class="fl">出院日期：</span>
-                    <span class="datapickerBox fl"><input type="text" id="datepicker" autocomplete="off" /></span>
+                    <span class="fl">入院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
-                    <span class="datapickerBox fl"><input type="text" id="datepicker2"  autocomplete="off" /></span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></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>
-                
                 <span class="filter">查询</span>
             </div>
             <table>
@@ -36,7 +46,7 @@
                     <th class="textCenter" ></th>
                     <th class="beHospitalId textCenter">病历号</th>
                     <th class="patientNo textCenter">病案号</th>
-                    <th class="patientName textCenter">病人姓名</th>
+                    <th class="patientName textCenter" style="width: 100px;">病人姓名</th>
                     <th class="patientSex textCenter">性别</th>
                     <th class="patientage textCenter">年龄</th>
                     <th class="bedNum textCenter">床号</th>
@@ -47,7 +57,7 @@
                     <th class="recordLevel textCenter">病历等级</th>
                     <th class="recordScore textCenter">病历得分</th>
                     <th class="scoreTime textCenter">评分时间</th>
-                    <th class="recordScoreOpera textCenter">操作</th>
+                    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
                 </thead>
                 <tbody>
     

src/html/qcScore.html

@@ -19,13 +19,13 @@
         </li>
     </script>
     <script type="text/html" id="infoTmpl">
-        <span>住院号：${fileCode}</span>
+        <span>病案号：${fileCode}</span>
         <span>姓名：${name}</span>
         <span>性别：${sex}</span>
         <span>年龄：${age}</span>
         <span>科室：${behDeptName}</span>
-        <span class="level">质控等级：${level}</span>
-        <span class="score">质控得分：${scoreRes}</span>
+        <span class="level">病历等级：${level}</span>
+        <span class="score">病历得分：${scoreRes}</span>
     </script>
     <script type="text/html" id="tableTmpl">
          {{if k==="出院诊断"}}

src/js/itemManager.js

@@ -140,11 +140,18 @@ function editItem(item,activePage){
                     <div class="itemMsgInfoBox"><span class="itemMsgLab">模块名称：</span> <span class="itemInfoRight">${itemCpoy.casesName}</span></div>
                     <div class="itemMsgInfoBox"><span class="itemMsgLab">条目名称：</span> <span class="itemInfoRight"> ${itemCpoy.name}</span></div>
                     <div class="itemMsgInfoBox"><span class="itemMsgLab">提示信息：</span> <span class="itemInfoRight"> <input class="itemTipMsg" value=${itemCpoy.msg} /></span></div>
-                    <div class="itemMsgInfoBox"><span class="itemMsgLab">分值：</span> <span class="itemInfoRight"> <input class="itemScore" type="number" min="0" value=${itemCpoy.score} /></span></div>
-                    <div class="itemMsgInfoBox"><span class="itemMsgLab">单项否决：</span><span class="itemInfoRight itemReject">${item.isReject == '1' ? `<img class="switchImg" src=${switchIconOpen} />`:`<img class="switchImg" src=${switchIconClose} />`}</span></div>
-                    <div class="itemMsgInfoBox"><span class="itemMsgLab">启用：</span><span class=" temInfoRight itemUsed">${item.isUsed == '1' ? `<img class="switchImg" src=${switchIconOpen} />`:`<img class="switchImg" src=${switchIconClose} />`}</span></div>
+                    <div class="itemMsgInfoBox"><span class="itemMsgLab">
+                        分值：
+                        </span> <span class="itemInfoRight"> 
+                            <input class="itemScore" type="number" min="0" value=${itemCpoy.score} />
+                        </span>
+                        <p class="itemMsgInfoTips">支持≥0的数字输入，最多保留小数点后1位~</p>
+                    </div>
+                 
+                    <div class="itemMsgInfoBox"><span class="itemMsgLab">单项否决：</span><span class="itemInfoRight itemReject">${item.isReject == '1' ? `<img class="switchImg" src=${switchIconOpen} /> 是`:`<img class="switchImg" src=${switchIconClose} /> 否`}</span></div>
+                    <div class="itemMsgInfoBox"><span class="itemMsgLab">启用：</span><span class=" temInfoRight itemUsed">${item.isUsed == '1' ? `<img class="switchImg" src=${switchIconOpen} /> 是`:`<img class="switchImg" src=${switchIconClose} /> 否`}</span></div>
                 </div>
-                <div  class="itemMsgInfoTips">支持≥0的数字输入，最多保留小数点后1位~</div>
+                
                 <div class="confirmEditBox"><span class="confirmEdit">保存</span></div>
             </div>
         </div>

src/js/qcList.js

@@ -15,7 +15,8 @@ const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
-let tabList = [], name = "", fileCode="", leaveHosDateStart="", leaveHosDateEnd="", scoreSum = 0,nameTemp = "", fileCodeTemp=""
+$(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "", behospitalCodeTemp="",levelTemp=""
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
@@ -30,10 +31,11 @@ $('.iconCalen').on("click", function(e){
 function getTabData(activePage){
     const param = {
         current:activePage,
-        fileCode: fileCode,
+        behospitalCode: behospitalCode,
         name: name, //条目名
-        leaveHosDateStart: leaveHosDateStart, //1-单项否决 0-非
-        leaveHosDateEnd: leaveHosDateEnd //0-未启用 1-启用
+        level:level,//病历等级
+        behosDateStart: behosDateStart, //1-单项否决 0-非
+        behosDateEnd: behosDateEnd //0-未启用 1-启用
     }
     post(api.qcList,param).then(res =>{
         if(res.data.code == '0'){
@@ -56,16 +58,17 @@ function getTabData(activePage){
 getTabData(1)
 
 $(".filter").on("click", function(e){
-    leaveHosDateStart = $("#datepicker").val().trim()
-    leaveHosDateEnd = $("#datepicker2").val().trim()
-    if(leaveHosDateStart){
-        leaveHosDateStart = leaveHosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
-    if(leaveHosDateEnd){
-        leaveHosDateEnd = leaveHosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     name = nameTemp
-    fileCode = fileCodeTemp
+    behospitalCode = behospitalCodeTemp
+    level = levelTemp
     getTabData(1)
 })
 function renderTab(data){
@@ -124,6 +127,32 @@ function bindScoreDetail(){
     })
 }
 
+//选择病历等级
+$('.selectLevel').on("click", function(e){
+    e.stopPropagation()
+    const showList =  $(".levelList ").css("display")
+    if(showList == "none" ||!showList){
+        $(".levelList ").css("display","block")
+        $(".selectLevel .arrow").attr("src",iconUp)
+    }else{
+        $(".levelList ").css("display", "none")
+        $(".selectLevel .arrow").attr("src",iconDown)
+    }
+})
+
+bindLeveldSelect()
+//是否启用选择
+function bindLeveldSelect(){
+    $('.levelItem').on("click",function(){
+        const levelItemName = $(this).attr("data-name")
+        const levelItemItemId = $(this).attr("data-id")
+        levelTemp =levelItemItemId
+        $('.selectLevel').html(levelItemName)
+        $(".levelList").css("display", "none")
+        $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    })
+}
+
 //全选绑定
 bindOperaAll()
 function bindScoreOperaItem(){
@@ -224,7 +253,7 @@ function recordScore(behospitalCode,totalNum){
 }
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim()
-    fileCodeTemp = val
+    behospitalCodeTemp = val
 })
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()
@@ -339,12 +368,9 @@ function renderPagination(totalPage,activePage,totalNum){
 }
 
 $(document).on("click", function(){
-    $(".moduleTypeList ").css("display", "none")
-    $(".rejectList ").css("display","none")
-    $(".usedList ").css("display", "none")
-    $(".selectModuleType .arrow").attr("src",iconDown)
-    $(".selectReject .arrow").attr("src",iconDown)
-    $(".selectUsed .arrow").attr("src",iconDown)
+    $(".levelList ").css("display", "none")
+    $(".selectLevel .arrow").attr("src",iconDown)
+    
 })
 
 $((function($){

src/js/qcScore.js

@@ -203,7 +203,7 @@ function showModal(flag,code,i){
   $("#qcScore,#qcMsg").off("input");
   const info = global_flawData[global_activeTab][i];
   if(flag==='0'){   //修改
-    $("#delModal .title").text("修改评分");
+    $("#delModal .title").text("修改");
     $("#editTmpl").tmpl(info).appendTo("#delModal .modal-body");
     //分数输入验证
     $("#qcScore").on("input",function(){