Forráskód Böngészése

质控列表添加个人和科室

zhangxc 5 éve
szülő
commit
46340520e4

+ 4 - 4
src/css/qcList.less

@@ -122,7 +122,7 @@ table{
 .filterDropList{
     position: absolute;
     right: 0;
-    height: 200px;
+    max-height: 200px;
     overflow-y: auto;
     background: #fff;
     display: none;
@@ -134,7 +134,8 @@ table{
     }
 }
 .deptList{
-    width: 120px;
+    width: 160px;
+    max-height: 400px;
 }
 .levelList{
     width: 120px;
@@ -156,8 +157,7 @@ table{
     cursor: pointer;
 }
 .selectDept{
-    border: none;
-    padding: 0;
+    width: 160px;
 }
 
 .filter{

+ 332 - 0
src/css/qcListDept.less

@@ -0,0 +1,332 @@
+.container{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+}
+ul,li{
+    list-style: none;
+}
+h2{
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #fff;
+    z-index: 20;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 15px;
+    border-bottom: 1px solid #E2E5EF;
+    font-size: 16px;
+    font-weight: bold   ;
+    letter-spacing: 1px;
+}
+.main-body{
+    margin: 20px 0;
+    padding: 0 35px;
+    min-width: 1090px;
+    /*width: 100%;*/
+}
+table{
+    width: 100%;
+    min-width: 1090px;
+    border:1px solid #E2E5EF;
+    border-collapse: collapse;
+    thead{
+        background: #EFF0F9;
+       
+    }
+    th,td{
+        height: 40px;
+        box-sizing: border-box;
+        padding: 10px;
+        border:1px solid #E2E5EF;
+        border-collapse: collapse;
+    }
+    th{
+        font-size: 14px;
+        font-weight: 500;
+        white-space: nowrap;
+    }
+    td{
+        font-size: 14px;
+        font-weight: 400;
+        white-space: nowrap;
+    }
+    .moduleNumber{
+        text-align: center;
+    }
+    .scoreOperaItem{
+        width: 50px;
+        cursor: pointer;
+    }
+    
+}
+.tabFoot{
+    height: 40px;
+    /*border: 1px solid #E2E5EF;
+    border-top: none;
+    box-sizing: border-box;*/
+}
+.scoreOpera{
+    height: 50px;
+    line-height: 50px;
+    margin: 0 20px 0 0;
+    cursor: pointer;
+    img{
+        margin: 0 10px 0 0;
+    }
+}
+
+.recordScoreOperaBtn{
+    cursor: pointer;
+    color: #5A8EEE;
+}
+.recordScoreBtn{
+    cursor: pointer;
+    display: inline-block;
+    width:68px;
+    height:30px;
+    line-height: 30px;
+    text-align: center;
+    border-radius:4px;
+    box-sizing: border-box;
+    border: 1px solid #5A8EEE;
+    color: #5A8EEE;
+}
+.filterBox{
+    margin-bottom: 15px;
+}
+.filterItem{
+    position: relative;
+    display: inline-block;
+    float: left;
+    height: 40px;
+    line-height: 40px;
+    margin: 0 20px 15px 0;
+    span{
+        display: inline-block;
+        line-height: 40px;
+        position: relative;
+    }
+    input{
+        width:120px;
+        height:40px;
+        border-radius:4px;
+        border: 1px solid #E2E5EF;
+        outline: none;
+        margin-right: 10px;
+        padding: 0 10px;
+        box-sizing: border-box;
+    }
+}
+
+.filterDropList{
+    position: absolute;
+    right: 0;
+    max-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;
+    }
+}
+.deptList{
+    width: 160px;
+    max-height: 400px;
+}
+.levelList{
+    width: 120px;
+    height: 200px;
+    li:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+}
+
+.selectLevel,.selectDept{
+    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;
+}
+.selectDept{
+    width: 160px;
+}
+
+.filter{
+    display: inline-block;
+    width:60px;
+    height:36px;
+    background:#5A8EEE;
+    border-radius:4px;
+    color: #fff;
+    text-align: center;
+    line-height: 36px;
+    position: relative;
+    top: 2px;
+    cursor: pointer;
+    float: left;
+}
+.arrow{
+    position: absolute;
+    width: 10px;
+    top: 16px;
+    right: 10px;
+}
+.iconCheck{
+    width: 14px;
+}
+.fl{
+    float: left;
+}
+.clearfix:after {
+    content: '';
+    height: 0;
+    line-height: 0;
+    display: block;
+    visibility: hidden;
+    clear: both;
+}
+.clearfix{
+    zoom:1
+}
+.divide{
+    margin: 0 10px;
+}
+.datapickerBox{
+    position: relative;
+    display: inline-block;
+    width: 120px;
+    height: 40px;
+    input{
+        position: absolute;
+    }
+}
+.iconCalen{
+    position: absolute;
+    width: 15px;
+    top: 12px;
+    right: 10px;
+}
+.textCenter{
+    text-align: center;
+}
+.patientNameSpan{
+    color: #5A8EEE;
+    cursor: pointer;
+}
+
+.deptItem:hover{
+    background-color: #EEF4FF;
+    cursor: pointer;
+}
+.ellipsis{
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+}
+
+
+.pagination{
+    margin: 35px 0 0 0  ;
+    text-align: right;
+}
+.totalSum{
+    font-size:12px;
+    line-height:17px;
+    color: #777777;
+    margin-right: 20px;
+}
+.pageNum,.prePage,.nextPage, .more{
+    display: inline-block;
+    width: 20px;
+    cursor: pointer;
+    margin: 0 20px 0 0;
+    text-align: center;
+    color: #777;
+}
+.prePage,.nextPage{
+    img{
+        position: relative;
+        top: 0px   ;
+    }
+}
+ .more{
+    cursor: not-allowed;
+}
+.arrowPage{
+    width: 6px;
+}
+.activePage{
+    color: #5A8EEE;
+}
+
+
+
+.ui-datepicker-calendar {
+    border: 0 none;
+    min-width: 0;
+}
+.ui-datepicker thead {
+    background-color: #fff;
+    color: #c3cbd6;
+}
+.ui-datepicker td {
+    padding: 0;
+    height: auto;
+    color: #657180;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    text-align: center;
+    height: 30px;
+    line-height: 30px;
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    border: 0;
+    background-color: #fff;
+    &:hover {
+        background-color: #c4d8fe;
+    }
+}
+.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    color: #333;
+    font-weight: normal;
+    height: 30px;
+    line-height: 30px;
+    margin: 0 5px;
+    width: 40%;
+    border-radius: 3px;
+}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
+    top: 5px;
+}
+.ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #5a8eee !important;
+    color: #fff;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #fff5bf !important;
+    color: #657180;
+}
+.ui-widget-header {
+    background-color: #fff;
+    border: 0 none;
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+ 
+input[type="number"] {
+    -moz-appearance: textfield;
+}

+ 339 - 0
src/css/qcListPerson.less

@@ -0,0 +1,339 @@
+.container{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+}
+ul,li{
+    list-style: none;
+}
+h2{
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #fff;
+    z-index: 20;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 15px;
+    border-bottom: 1px solid #E2E5EF;
+    font-size: 16px;
+    font-weight: bold   ;
+    letter-spacing: 1px;
+}
+.main-body{
+    margin: 20px 0;
+    padding: 0 35px;
+    min-width: 1090px;
+    /*width: 100%;*/
+}
+table{
+    width: 100%;
+    min-width: 1090px;
+    border:1px solid #E2E5EF;
+    border-collapse: collapse;
+    thead{
+        background: #EFF0F9;
+       
+    }
+    th,td{
+        height: 40px;
+        box-sizing: border-box;
+        padding: 10px;
+        border:1px solid #E2E5EF;
+        border-collapse: collapse;
+    }
+    th{
+        font-size: 14px;
+        font-weight: 500;
+        white-space: nowrap;
+    }
+    td{
+        font-size: 14px;
+        font-weight: 400;
+        white-space: nowrap;
+    }
+    .moduleNumber{
+        text-align: center;
+    }
+    .scoreOperaItem{
+        width: 50px;
+        cursor: pointer;
+    }
+    
+}
+.tabFoot{
+    height: 40px;
+    /*border: 1px solid #E2E5EF;
+    border-top: none;
+    box-sizing: border-box;*/
+}
+.scoreOpera{
+    height: 50px;
+    line-height: 50px;
+    margin: 0 20px 0 0;
+    cursor: pointer;
+    img{
+        margin: 0 10px 0 0;
+    }
+}
+
+.recordScoreOperaBtn{
+    cursor: pointer;
+    color: #5A8EEE;
+}
+.recordScoreBtn{
+    cursor: pointer;
+    display: inline-block;
+    width:68px;
+    height:30px;
+    line-height: 30px;
+    text-align: center;
+    border-radius:4px;
+    box-sizing: border-box;
+    border: 1px solid #5A8EEE;
+    color: #5A8EEE;
+}
+.filterBox{
+    margin-bottom: 15px;
+}
+.filterItem{
+    position: relative;
+    display: inline-block;
+    float: left;
+    height: 40px;
+    line-height: 40px;
+    margin: 0 20px 15px 0;
+    span{
+        display: inline-block;
+        line-height: 40px;
+        position: relative;
+    }
+    input{
+        width:120px;
+        height:40px;
+        border-radius:4px;
+        border: 1px solid #E2E5EF;
+        outline: none;
+        margin-right: 10px;
+        padding: 0 10px;
+        box-sizing: border-box;
+    }
+}
+
+.filterDropList{
+    position: absolute;
+    right: 0;
+    max-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;
+    }
+}
+.deptList{
+    width: 160px;
+    max-height: 400px;
+}
+.levelList{
+    width: 120px;
+    height: 200px;
+    li:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+}
+.selectLevel,.selectDept,.selectDoctor{
+    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;
+}
+.selectDept{
+    width: 160px;
+}
+.doctorFilter{
+    span{
+        float: left;
+    }
+}
+.selectDoctor{
+    cursor: default;
+}
+
+.filter{
+    display: inline-block;
+    width:60px;
+    height:36px;
+    background:#5A8EEE;
+    border-radius:4px;
+    color: #fff;
+    text-align: center;
+    line-height: 36px;
+    position: relative;
+    top: 2px;
+    cursor: pointer;
+    float: left;
+}
+.arrow{
+    position: absolute;
+    width: 10px;
+    top: 16px;
+    right: 10px;
+}
+.iconCheck{
+    width: 14px;
+}
+.fl{
+    float: left;
+}
+.clearfix:after {
+    content: '';
+    height: 0;
+    line-height: 0;
+    display: block;
+    visibility: hidden;
+    clear: both;
+}
+.clearfix{
+    zoom:1
+}
+.divide{
+    margin: 0 10px;
+}
+.datapickerBox{
+    position: relative;
+    display: inline-block;
+    width: 120px;
+    height: 40px;
+    input{
+        position: absolute;
+    }
+}
+.iconCalen{
+    position: absolute;
+    width: 15px;
+    top: 12px;
+    right: 10px;
+}
+.textCenter{
+    text-align: center;
+}
+.patientNameSpan{
+    color: #5A8EEE;
+    cursor: pointer;
+}
+
+.deptItem:hover{
+    background-color: #EEF4FF;
+    cursor: pointer;
+}
+.ellipsis{
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+}
+
+
+.pagination{
+    margin: 35px 0 0 0  ;
+    text-align: right;
+}
+.totalSum{
+    font-size:12px;
+    line-height:17px;
+    color: #777777;
+    margin-right: 20px;
+}
+.pageNum,.prePage,.nextPage, .more{
+    display: inline-block;
+    width: 20px;
+    cursor: pointer;
+    margin: 0 20px 0 0;
+    text-align: center;
+    color: #777;
+}
+.prePage,.nextPage{
+    img{
+        position: relative;
+        top: 0px   ;
+    }
+}
+ .more{
+    cursor: not-allowed;
+}
+.arrowPage{
+    width: 6px;
+}
+.activePage{
+    color: #5A8EEE;
+}
+
+
+
+.ui-datepicker-calendar {
+    border: 0 none;
+    min-width: 0;
+}
+.ui-datepicker thead {
+    background-color: #fff;
+    color: #c3cbd6;
+}
+.ui-datepicker td {
+    padding: 0;
+    height: auto;
+    color: #657180;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    text-align: center;
+    height: 30px;
+    line-height: 30px;
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    border: 0;
+    background-color: #fff;
+    &:hover {
+        background-color: #c4d8fe;
+    }
+}
+.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    color: #333;
+    font-weight: normal;
+    height: 30px;
+    line-height: 30px;
+    margin: 0 5px;
+    width: 40%;
+    border-radius: 3px;
+}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
+    top: 5px;
+}
+.ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #5a8eee !important;
+    color: #fff;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #fff5bf !important;
+    color: #657180;
+}
+.ui-widget-header {
+    background-color: #fff;
+    border: 0 none;
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+ 
+input[type="number"] {
+    -moz-appearance: textfield;
+}

+ 4 - 3
src/html/qcList.html

@@ -21,14 +21,15 @@
                 <span class="filterItem typeFilter">
                     <span>科室:</span>
                     <span class="selectDept"> 
-                        <input class="selectDeptInput" type="text" placeholder="科室" value="全部">
+                        全部
                     </span>
                    
                     <ul class="deptList filterDropList"></ul>
                 </span>
-                <!-- <span class="filterItem typeFilter">
+                <span class="filterItem doctorFilter">
                     <span>医生:</span>
-                </span> -->
+                    <input class="doctorInp" type="text" placeholder="请输入医生姓名">
+                </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名:</span>
                     <input class="patientNameInp" type="text" placeholder="请输入病人姓名">

+ 7 - 3
src/html/qcListDept.html

@@ -18,14 +18,18 @@
                     <span>病历号:</span>
                     <input class="patientNumInp" type="text" placeholder="请输入病历号">
                 </span>
-                <!-- <span class="filterItem typeFilter">
+                <span class="filterItem typeFilter">
                     <span>科室:</span>
-                    <span class="selectDept">全部 </span>
+                    <span class="selectDept"> 
+                        全部
+                    </span>
+                   
                     <ul class="deptList filterDropList"></ul>
                 </span>
                 <span class="filterItem typeFilter">
                     <span>医生:</span>
-                </span> -->
+                    <input class="doctorInp" type="text" placeholder="请输入医生姓名">
+                </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名:</span>
                     <input class="patientNameInp" type="text" placeholder="请输入病人姓名">

+ 11 - 4
src/html/qcListPerson.html

@@ -18,14 +18,21 @@
                     <span>病历号:</span>
                     <input class="patientNumInp" type="text" placeholder="请输入病历号">
                 </span>
-                <!-- <span class="filterItem typeFilter">
+                <span class="filterItem typeFilter">
                     <span>科室:</span>
-                    <span class="selectDept">全部 </span>
+                    <span class="selectDept"> 
+                        全部
+                    </span>
+                   
                     <ul class="deptList filterDropList"></ul>
                 </span>
-                <span class="filterItem typeFilter">
+                <span class="filterItem doctorFilter">
                     <span>医生:</span>
-                </span> -->
+                    <span class="selectDoctor"> 
+                        
+                    </span>
+                    <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
+                </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名:</span>
                     <input class="patientNameInp" type="text" placeholder="请输入病人姓名">

+ 6 - 2
src/js/index.js

@@ -4,7 +4,7 @@ require('jquery-templates');
 const md5 = require('js-md5');
 require("./modal.js")
 const {api,post,pageMap,delCookie} = require('./utils.js');
-
+let userInfo={};
 $(function(){
   getMenu();
   //菜单展开收起
@@ -53,7 +53,10 @@ function initMenu(data,userInfo){
     $(".menu .active").removeClass('active');
     $(this).addClass("active");
     const code = $(this).attr("code");
-    const url = './'+pageMap[code];
+    let url = './'+pageMap[code];
+    if(code === 'YH-BLZK-ZKPFGR'){
+      url += `?doctorName=${userInfo.linkman}`
+    }
     $("#contentIframe").attr("src",url);
   });
 }
@@ -62,6 +65,7 @@ function getMenu(){
     if(res.data.code==='0'){
       const data = res.data.data;
       initMenu(data.menuWrappers,data.userLoginDTO);
+      userInfo = data.userLoginDTO
     }
   });
 };

+ 17 - 13
src/js/qcList.js

@@ -17,7 +17,7 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",bdeptIdTemp=""
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp=""
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
@@ -36,6 +36,7 @@ function getTabData(activePage){
         name: name, //条目名
         level:level,//病历等级
         deptId: deptId,
+        doctorName: doctorName,
         behosDateStart: behosDateStart, //1-单项否决 0-非
         behosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15
@@ -81,6 +82,7 @@ $(".filter").on("click", function(e){
     behospitalCode = behospitalCodeTemp
     level = levelTemp
     deptId = deptIdTemp
+    doctorName = doctorNameTemp
     getTabData(1)
 })
 function renderTab(data){
@@ -149,6 +151,8 @@ function bindScoreDetail(){
 //选择病历等级
 $('.selectLevel').on("click", function(e){
     e.stopPropagation()
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
     const showList =  $(".levelList ").css("display")
     if(showList == "none" ||!showList){
         $(".levelList ").css("display","block")
@@ -208,6 +212,8 @@ function bindOperaAll(){
 
 $('.selectDept').on("click", function(e){
     e.stopPropagation()
+    $(".levelList ").css("display","none")
+    $(".selectLevel .arrow").attr("src",iconDown)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -217,11 +223,7 @@ $('.selectDept').on("click", function(e){
         $(".selectDept .arrow").attr("src",iconDown)
     }
 })
-$('.selectDeptInput').on("input", function(e){
-    e.stopPropagation()
-    const value = e.target.value()
-    console.log('value', value)
-})
+
 //获取科室列表
 getDeptList()
 function getDeptList(){
@@ -250,14 +252,13 @@ function bindDeptSelect(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
-        if(deptItemName.length > 6){
-            $('.selectDept .selectDeptInput').val(deptItemName.substring(0,5)+'...')
+        if(deptItemName.length > 10){
+            $('.selectDept').html(deptItemName.substring(0,8)+'...')
         }else{
-            $('.selectDept .selectDeptInput').val(deptItemName)
+            $('.selectDept').html(deptItemName)
         }
-        
-        $('.selectDept .selectDeptInput').attr('title',deptItemName)
-        // $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $('.selectDept ').attr('title',deptItemName)
+        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
     })
@@ -319,7 +320,10 @@ $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()
     nameTemp = val
 })
-
+$(".doctorInp").on("input", function(e){
+    const val = $(this).val().trim()
+    doctorNameTemp = val
+})
 $(function() {
     $.datepicker.regional['zh-CN'] = {
     clearText: '清除',

+ 26 - 8
src/js/qcListDept.js

@@ -1,5 +1,5 @@
 const $ = require('jquery');
-require("../css/qcList.less");
+require("../css/qcListDept.less");
 require('./modal.js');
 const {api} = require('./api.js')
 const {post} = require('./utils.js')
@@ -17,7 +17,7 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "", behospitalCodeTemp="",levelTemp=""
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp=""
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
@@ -35,6 +35,8 @@ function getTabData(activePage){
         behospitalCode: behospitalCode,
         name: name, //条目名
         level:level,//病历等级
+        deptId: deptId,
+        doctorName: doctorName,
         behosDateStart: behosDateStart, //1-单项否决 0-非
         behosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15
@@ -79,6 +81,8 @@ $(".filter").on("click", function(e){
     name = nameTemp
     behospitalCode = behospitalCodeTemp
     level = levelTemp
+    deptId = deptIdTemp
+    doctorName = doctorNameTemp
     getTabData(1)
 })
 function renderTab(data){
@@ -147,6 +151,8 @@ function bindScoreDetail(){
 //选择病历等级
 $('.selectLevel').on("click", function(e){
     e.stopPropagation()
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
     const showList =  $(".levelList ").css("display")
     if(showList == "none" ||!showList){
         $(".levelList ").css("display","block")
@@ -206,6 +212,8 @@ function bindOperaAll(){
 
 $('.selectDept').on("click", function(e){
     e.stopPropagation()
+    $(".levelList ").css("display","none")
+    $(".selectLevel .arrow").attr("src",iconDown)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -215,10 +223,11 @@ $('.selectDept').on("click", function(e){
         $(".selectDept .arrow").attr("src",iconDown)
     }
 })
+
 //获取科室列表
 getDeptList()
 function getDeptList(){
-    post(api.getDeptListUser).then(res =>{
+    post(api.getDeptListUser,{inputStr:""}).then(res =>{
         if(res.data.code == '0'){
            const  deptList = res.data.data
            rendeDeptList(deptList)
@@ -232,18 +241,23 @@ function getDeptList(){
 function rendeDeptList(deptList){
     let str = `<li class="deptItem " data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
-        str += `<li class="deptItem ellipsis" title=${deptList[i].name} data-id=${deptList[i].id} data-name=${deptList[i].name}> ${deptList[i].name}</li>`
+        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
     $('.deptList').html(str)
     bindDeptSelect()
 }
-//模块类型选择
+//科室选择
 function bindDeptSelect(){
     $('.deptItem').on("click",function(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
-        deptId =deptItemId
-        $('.selectDept').html(deptItemName)
+        deptIdTemp =deptItemId
+        if(deptItemName.length > 10){
+            $('.selectDept').html(deptItemName.substring(0,8)+'...')
+        }else{
+            $('.selectDept').html(deptItemName)
+        }
+        $('.selectDept ').attr('title',deptItemName)
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
@@ -306,7 +320,10 @@ $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()
     nameTemp = val
 })
-
+$(".doctorInp").on("input", function(e){
+    const val = $(this).val().trim()
+    doctorNameTemp = val
+})
 $(function() {
     $.datepicker.regional['zh-CN'] = {
     clearText: '清除',
@@ -416,6 +433,7 @@ function renderPagination(totalPage,activePage,totalNum){
 
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
+    $(".deptList").css("display", "none")
     $(".selectLevel .arrow").attr("src",iconDown)
     
 })

+ 31 - 10
src/js/qcListPerson.js

@@ -1,8 +1,8 @@
 const $ = require('jquery');
-require("../css/qcList.less");
+require("../css/qcListPerson.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post} = require('./utils.js')
+const {post,getUrlArgObject} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -14,10 +14,14 @@ const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
+let doctorName_global = getUrlArgObject("doctorName")
+
+console.log('doctorName_global',doctorName_global)
+$('.selectDoctor').html(doctorName_global)
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "", behospitalCodeTemp="",levelTemp=""
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName=doctorName_global, doctorNameTemp=doctorName_global
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
@@ -35,6 +39,8 @@ function getTabData(activePage){
         behospitalCode: behospitalCode,
         name: name, //条目名
         level:level,//病历等级
+        deptId: deptId,
+        doctorName: doctorName,
         behosDateStart: behosDateStart, //1-单项否决 0-非
         behosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15
@@ -79,6 +85,8 @@ $(".filter").on("click", function(e){
     name = nameTemp
     behospitalCode = behospitalCodeTemp
     level = levelTemp
+    deptId = deptIdTemp
+    doctorName = doctorNameTemp
     getTabData(1)
 })
 function renderTab(data){
@@ -147,6 +155,8 @@ function bindScoreDetail(){
 //选择病历等级
 $('.selectLevel').on("click", function(e){
     e.stopPropagation()
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
     const showList =  $(".levelList ").css("display")
     if(showList == "none" ||!showList){
         $(".levelList ").css("display","block")
@@ -206,6 +216,8 @@ function bindOperaAll(){
 
 $('.selectDept').on("click", function(e){
     e.stopPropagation()
+    $(".levelList ").css("display","none")
+    $(".selectLevel .arrow").attr("src",iconDown)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -215,12 +227,12 @@ $('.selectDept').on("click", function(e){
         $(".selectDept .arrow").attr("src",iconDown)
     }
 })
+
 //获取科室列表
 getDeptList()
 function getDeptList(){
-    post(api.getDeptListUser).then(res =>{
+    post(api.getDeptListUser,{inputStr:""}).then(res =>{
         if(res.data.code == '0'){
-            console.log('aaaaaaaaaaa',res)
            const  deptList = res.data.data
            rendeDeptList(deptList)
         }else{}
@@ -233,18 +245,23 @@ function getDeptList(){
 function rendeDeptList(deptList){
     let str = `<li class="deptItem " data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
-        str += `<li class="deptItem ellipsis" title=${deptList[i].name} data-id=${deptList[i].id} data-name=${deptList[i].name}> ${deptList[i].name}</li>`
+        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
     $('.deptList').html(str)
     bindDeptSelect()
 }
-//模块类型选择
+//科室选择
 function bindDeptSelect(){
     $('.deptItem').on("click",function(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
-        deptId =deptItemId
-        $('.selectDept').html(deptItemName)
+        deptIdTemp =deptItemId
+        if(deptItemName.length > 10){
+            $('.selectDept').html(deptItemName.substring(0,8)+'...')
+        }else{
+            $('.selectDept').html(deptItemName)
+        }
+        $('.selectDept ').attr('title',deptItemName)
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
@@ -307,7 +324,10 @@ $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()
     nameTemp = val
 })
-
+$(".doctorInp").on("input", function(e){
+    const val = $(this).val().trim()
+    doctorNameTemp = val
+})
 $(function() {
     $.datepicker.regional['zh-CN'] = {
     clearText: '清除',
@@ -417,6 +437,7 @@ function renderPagination(totalPage,activePage,totalNum){
 
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
+    $(".deptList").css("display", "none")
     $(".selectLevel .arrow").attr("src",iconDown)
     
 })