基本改完

src/css/deptScoreDetailControl.less

@@ -191,7 +191,7 @@
             cursor: pointer;
         }
     }
-    .selectLevel,.selectDept{
+    .selectLevel,.selectDept,.selectLeaveHosType{
         display: inline-block;
         position: relative;
         width:120px;
@@ -202,7 +202,7 @@
         box-sizing: border-box;
         cursor: pointer;
     }
-    .selectDept{
+    .selectDept,.selectLeaveHosType{
         width: 160px;
     }
     
@@ -400,3 +400,15 @@
 .abnormalClear {
     top: 2px !important;
 }
+.levelList,.checkList,.leaveHosTypeList {
+    width: 120px;
+    // height: 200px;
+    li:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+}
+.leaveHosTypeList{
+    width: 158px;
+    max-height: 300px;
+}

src/css/itemManager.less

@@ -100,8 +100,8 @@
         -moz-box-shadow: @activeColor  0px 0px 2px;
         box-shadow: @activeColor  0px 0px 2px;
       }
-    .moduleTypeList{
-         width: 160px;
+    .moduleTypeList.filterDropList{
+         width: 168px !important;
     }
     .selectUsed, .selectReject{
         width: 140px;

src/css/qcList.less

@@ -170,6 +170,7 @@ h2{
 .filterDropList{
     position: absolute;
     right: 0;
+    top: 34px !important;
     max-height: 200px;
     overflow-y: auto;
     background: #fff;

src/css/uccDetail.less

@@ -185,6 +185,7 @@ h2{
 .filterDropList{
     position: absolute;
     right: 0;
+    top: 34px !important;
     max-height: 200px;
     overflow-y: auto;
     background: #fff;

src/html/deptScoreDetailControl.html

@@ -29,7 +29,7 @@
                     <input type="text" class="selectDept canEditDept" value="全部">
                     <ul class="deptList filterDropList"></ul>
                 </span>
-                <span class="filterItem typeFilter deptListWrap">
+                <!-- <span class="filterItem typeFilter deptListWrap">
                     <span>科室系统：</span>
                     <span class="selectDept" data-id="">全部</span>
                     <ul class="deptList filterDropList">
@@ -37,6 +37,15 @@
                         <li class="deptItem ellipsis" title="内科系统" data-id="内科" data-name="内科系统">内科系统</li>
                         <li class="deptItem ellipsis" title="外科系统" data-id="外科" data-name="外科系统">外科系统</li>
                     </ul>
+                </span> -->
+                <span class="filterItem inorout deptListWrap">
+                    <span>科室系统：</span>
+                    <span class="selectLeaveHosType" data-id="">全部</span>
+                    <ul class="leaveHosTypeList filterDropList">
+                        <Li class="leaveHosTypeItem" data-name="全部" data-id="" title="全部">全部</Li>
+                        <Li class="leaveHosTypeItem" title="内科系统" data-id="内科" data-name="内科系统">内科系统</Li>
+                        <Li class="leaveHosTypeItem" title="外科系统" data-id="外科" data-name="外科系统">外科系统</Li>
+                    </ul>
                 </span>
                 <span class="filterItem typeFilter clearfix dataSelectLight">
                     <span class="fl">出院日期：</span>

src/html/qcList.html

@@ -17,10 +17,7 @@
                 <div class="clearfix">
                     <span class="filterItem typeFilter deptListWrap">
                         <span>科室：</span>
-                        <span class="selectDept">
-                            全部
-                        </span>
-
+                        <input type="text" class="selectDept canEditDept" value="全部">
                         <ul class="deptList filterDropList"></ul>
                     </span>
                     <span class="filterItem typeFilter clearfix" >

src/html/uccDetail.html

@@ -20,7 +20,7 @@
                 <div class="clearfix">
                     <span class="filterItem typeFilter deptListWrap">
                         <span>科室：</span>
-                        <span class="selectDept">全部</span>
+                        <input type="text" class="selectDept canEditDept" value="全部">
                         <ul class="deptList filterDropList"></ul>
                     </span>
                     <span class="filterItem typeFilter clearfix" >

src/html/uncorrectedCasesStatistics.html

@@ -19,13 +19,6 @@
     <div class="partTitleT"></div>
     <div class="main-body">
         <div class="filterBox clearfix">
-            <!-- <span class="filterItem typeFilter deptListWrap">
-                <span>科室名称：</span>
-                <span class="selectDept">
-                    全部
-                </span>
-                <ul class="deptList filterDropList"></ul>
-            </span> -->
             <span class="filterItem typeFilter">
                 <span>科室名称：</span>
                 <input type="text" class="selectDept canEditDept" value="全部">

src/js/checkControl.js

@@ -422,11 +422,7 @@ function bindDeptSelect(){
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
         deptNameTemp=deptItemName==="全部"?"":deptItemName;
-        if(deptItemName.length > 10){
-            $('.selectDept').val(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptItemName)
-        }
+        $('.selectDept').val(deptItemName)
         $('.selectDept ').attr('title',deptItemName)
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 

src/js/deptScoreDetailControl.js

@@ -19,7 +19,8 @@ let isPlacefile = getCookie('isPlacefile')||1
 listenScroll()
 $(".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,statisticsType="",deptType = "",
+$(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+let tabList = [], name = "",leaveHosType="",leaveHosTypeTemp="", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",deptType = "",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", deptName="",deptNameTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc="entryNum",data_asc="",hospital=getCookie("hospital");
   let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -30,8 +31,10 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
   if(hospital == '台州市立'){
     $(".deptListWrap").css("display","inline-block")
-    $(".deptListWrap .selectDept").html(deptType?(deptType+'系统'):"全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-    deptId = deptIdTemp = deptType
+    $('.selectLeaveHosType').html(deptType?(deptType+'系统'):"全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $(".leaveHosTypeList").css("display", "none")
+    $('.selectLeaveHosType').removeClass('unSelect')
+    leaveHosType = leaveHosTypeTemp = deptType
     deptName = deptNameTemp
   }else{
     $(".deptListWrap").css("display","none")
@@ -66,7 +69,14 @@ $(".abnormalClear").click(function(){
     setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     behospitalCode=behospitalCodeTemp = ""
     deptId =deptIdTemp= ""
+    leaveHosType =leaveHosTypeTemp= ""
     deptName =deptNameTemp= ""
+    leaveHosType="";
+    leaveHosTypeTemp="";
+    
+    $('.selectLeaveHosType').html('全部')
+    $(".leaveHosTypeList").css("display", "none")
+    $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
     $(".patientNumInp").val("")
     getTabData(1)
@@ -114,6 +124,19 @@ function dateChange(){
 $(".menu .page", parent.document).removeClass("active")
 $(parent.document).find(".menu .page[code=YH-ZKK-GKSQXZB_XQ]").addClass("active")
 
+bindleaveHosTypeSelect()
+//出院人数类型选择
+function bindleaveHosTypeSelect(){
+    $('.leaveHosTypeItem').on("click",function(){
+        const leaveHosTypeItemName = $(this).attr("data-name")
+        const leaveHosTypeItemItemId = $(this).attr("data-id")
+        leaveHosTypeTemp =leaveHosTypeItemItemId
+        $('.selectLeaveHosType').html(leaveHosTypeItemName)
+        $(".leaveHosTypeList").css("display", "none")
+        $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $('.selectLeaveHosType').removeClass('unSelect')
+    })
+}
 //判断有无某一权限
   function hasData(data,parent){
     let codeLis = getCookie("codeLis")
@@ -140,7 +163,7 @@ function getTabData(activePage){
         "asc": data_asc,
         "desc": data_desc,
         "name": behospitalCode||"",
-        "deptClass": deptId||'',
+        "deptClass": leaveHosType||'',
         "deptName": deptName=="全部"?"":deptName||"",
         "type": 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         "startDate":dateStatrt,
@@ -202,6 +225,7 @@ $(".filter").on("click", function(e){
     behospitalCode = behospitalCodeTemp
     level = levelTemp
     deptId = deptIdTemp
+    leaveHosType = leaveHosTypeTemp
     deptName = deptNameTemp
     getTabData(1)
 })
@@ -432,18 +456,23 @@ function saveModifyOne(itemCopy){
         
     })
 }
-//选择病历等级
-$('.selectLevel').on("click", function(e){
+
+//选择出院人数类型
+$('.selectLeaveHosType').on("click", function(e){
     e.stopPropagation()
     $(".deptList ").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
-    const showList =  $(".levelList ").css("display")
+    $(".levelList ").css("display","none")
+    $(".checkList ").css("display", "none")
+    $(".selectCheck .arrow").attr("src",iconDown)
+    $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    const showList =  $(".leaveHosTypeList ").css("display")
     if(showList == "none" ||!showList){
-        $(".levelList ").css("display","block")
-        $(".selectLevel .arrow").attr("src",iconUp)
+        $(".leaveHosTypeList ").css("display","block")
+        $(".selectLeaveHosType .arrow").attr("src",iconUp)
     }else{
-        $(".levelList ").css("display", "none")
-        $(".selectLevel .arrow").attr("src",iconDown)
+        $(".leaveHosTypeList ").css("display", "none")
+        $(".selectLeaveHosType .arrow").attr("src",iconDown)
     }
 })
 
@@ -512,13 +541,10 @@ function bindDeptSelect(){
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
         deptNameTemp=deptItemName==="全部"?"":deptItemName;
-        if(deptItemName.length > 10){
-            $('.selectDept').val(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptItemName)
-        }
-
+        $('.selectDept').val(deptItemName)
+        $('.selectDept ').attr('title',deptItemName)
         $(".deptList").css("display", "none")
+        $('.selectDept').removeClass('unSelect')
     })
 }
 function loading(){
@@ -681,7 +707,7 @@ $(function() {
         "asc": data_asc,
         "desc": data_desc,
         "name": behospitalCode||"",
-        "deptClass": deptId||'',
+        "deptClass": leaveHosType||'',
         "deptName": deptName=="全部"?"":deptName||"",
         "type": statisticsType||2, //1-本月，2-本年
         "startDate":startDateParam,

src/js/keyItemFlawControl.js

@@ -211,13 +211,8 @@ function bindDeptSelect(){
     const deptItemId = $(this).attr("data-id")
     deptIdTemp =deptItemId;
     deptNameTemp=deptItemName==="全部"?"":deptItemName;
-    if(deptItemName.length > 10){
-      $('.selectDept').val(deptItemName.substring(0,8)+'...')
-    }else{
-      $('.selectDept').val(deptItemName)
-    }
+    $('.selectDept').val(deptItemName)
     $('.selectDept ').attr('title',deptItemName)
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $(".deptList").css("display", "none")
     $('.selectDept').removeClass('unSelect')
   })

src/js/partDetailControl.js

@@ -422,11 +422,7 @@ function bindDeptSelect(){
         const deptItemId = $(this).attr("data-id")
         deptNameTemp=deptItemName=="全部"?"":deptItemName;
         deptIdTemp =deptItemId
-        if(deptItemName.length > 10){
-            $('.selectDept').val(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptItemName)
-        }
+        $('.selectDept').val(deptItemName)
         $('.selectDept ').attr('title',deptItemName)
         $(".deptList").css("display", "none")
     })

src/js/qcList.js

@@ -27,12 +27,13 @@ let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
 let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let docName = getUrlArgObjectNew("docName",srcUrl)||""
 let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+let from = getUrlArgObjectNew("from",srcUrl)||"";
 let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,deptNameTemp="",deptName="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckMain="",qcCheckMainTemp="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
@@ -53,13 +54,9 @@ if(docName){
     $('.doctorInp').val(docName)
 }
 if(deptIdPram&&deptNamePram){
-    deptIdTemp = deptIdPram
-    deptId = deptIdPram
-    if(deptNamePram.length > 10){
-        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
-    }else{
-        $('.selectDept').html(deptNamePram)
-    }
+    deptId = deptIdTemp = deptIdPram
+    deptName = deptNameTemp = deptNamePram
+    $('.selectDept').val(deptNamePram)
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -101,6 +98,7 @@ function getTabData(activePage){
     const param = {
         current:activePage,
         behospitalCode: behospitalCode,
+        deptName: deptName=="全部"?"":deptName||"",
         name: name, //条目名
         level:level,//病历等级
         deptId: deptId.trim(),
@@ -203,6 +201,7 @@ $(".filter").on("click", function(e){
     qcCheckName = qcCheckNameTemp
     qcCheckMain = qcCheckMainTemp
     doctorNum = doctorNumTemp
+    deptName = deptNameTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = qcCheckStatusTemp
     getTabData(1)
@@ -214,6 +213,7 @@ $(".abnormalClear").on("click", function(e){
     level=""; 
     scoreSum = 0; 
     nameTemp = "";  
+    deptName = deptNameTemp = ""
     behospitalCodeTemp=""; 
     levelTemp="";  
     deptId=""; 
@@ -278,7 +278,7 @@ $(".abnormalClear").on("click", function(e){
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
-    $('.selectDept ').html('全部')
+    $('.selectDept ').val('全部')
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectDept ').addClass('unSelect')
@@ -540,38 +540,7 @@ function bindOperaAll(){
     })
 }
 
-$('.selectDept').on("click", function(e){
-    e.stopPropagation()
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    $(".checkList ").css("display", "none")
-    $(".selectCheck .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
-    $(".qcCheckList ").css("display", "none")
-    $(".qcSelectCheck .arrow").attr("src",iconDown)
-    const showList =  $(".deptList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".deptList ").css("display","block")
-        $(".selectDept .arrow").attr("src",iconUp)
-    }else{
-        $(".deptList ").css("display", "none")
-        $(".selectDept .arrow").attr("src",iconDown)
-    }
-})
-
-//获取科室列表
-getDeptList()
-function getDeptList(){
-    post(api.getDeptList,{inputStr:""}).then(res =>{
-        if(res.data.code == '0'){
-           const  deptList = res.data.data
-           rendeDeptList(deptList)
-        }else{}
-    }).catch((e) =>{
 
-    })
-}
 
 //获取页面配置
 
@@ -640,7 +609,44 @@ function bindSetCol(){
     })
 }
 
+$('.selectDept').on("focus", function(e){
+    e.stopPropagation()
+    $(".levelList ").css("display","none")
+    $(".selectLevel .arrow").attr("src",iconDown)
+    $(".checkList ").css("display", "none")
+    $(".selectCheck .arrow").attr("src",iconDown)
+    $(".fpCheckList ").css("display", "none")
+    $(".fpSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".deptList ").css("display","block")
+})
+$('.selectDept').on("blur", function(e){
+  $(".deptList ").css("display", "none")
+  $(".selectDept .arrow").attr("src",iconDown)
+})
+$('.selectDept').on("input", function(e){
+  let val = $(this).val().trim()
+  deptName = deptNameTemp = val
+  getDeptList(deptName)
+})
+//获取科室列表
+getDeptList()
+function getDeptList(val){
+    post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
+        if(res.data.code == '0'){
+           const  deptList = res.data.data||[]
+           rendeDeptList(deptList)
+        }else{rendeDeptList([])}
+    }).catch((e) =>{
+
+    })
+}
 function rendeDeptList(deptList){
+    if(deptList.length == 0){
+      $('.deptList').html("")
+      return
+    }
     let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
@@ -650,17 +656,13 @@ function rendeDeptList(deptList){
 }
 //科室选择
 function bindDeptSelect(){
-    $('.deptItem').on("click",function(){
+    $('.deptItem').on("mousedown",function(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
-        if(deptItemName.length > 10){
-            $('.selectDept').html(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').html(deptItemName)
-        }
+        deptNameTemp=deptItemName==="全部"?"":deptItemName;
+        $('.selectDept').val(deptItemName)
         $('.selectDept ').attr('title',deptItemName)
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $(".deptList").css("display", "none")
         $('.selectDept').removeClass('unSelect')
     })
@@ -1124,7 +1126,6 @@ function renderPagination(totalPage,activePage,totalNum){
 
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
-    $(".deptList").css("display", "none")
     $(".checkList").css("display", "none")
     $(".fpCheckList").css("display", "none")
     $(".qcCheckList").css("display", "none")
@@ -1149,6 +1150,7 @@ $((function($){
         }
         const param = {
             "behospitalCode": behospitalCode,
+            "deptName": deptName=="全部"?"":deptName||"",
             "deptId": deptId.trim(),
             "doctorCode":doctorNum,
             "doctorName": doctorName,

src/js/qcListCopy.js

@@ -77,11 +77,7 @@ if(deptIdPram&&deptNamePram){
     }
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
-    if(deptNamePram.length > 10){
-        $('.selectDept').val(deptNamePram.substring(0,8)+'...')
-    }else{
-        $('.selectDept').val(deptNamePram)
-    }
+    $('.selectDept').val(deptNamePram)
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
 }
@@ -357,7 +353,7 @@ $(".abnormalClear").on("click", function(e){
         deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
         deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
     }
-    if (from == 4 || from == 9){
+    if (from == 4 || from == 9 || from == 8){
         deptIdTemp = deptIdPram = deptIdPram
         deptName = deptNameTemp = deptNamePram
     }
@@ -406,16 +402,14 @@ $(".abnormalClear").on("click", function(e){
     }).datepicker( "setDate","");
     if(from == 2){
         $('.selectDept ').val(deptListDept[0].deptName)
-    } else if (from == 4 || from == 9){
-        if(deptNamePram.length > 10){
-            $('.selectDept').val(deptNamePram.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptNamePram)
-        }
+        deptName = deptNameTemp = deptListDept[0].deptName
+    } else if (from == 4 || from == 9 || from == 8){
+        $('.selectDept').val(deptNamePram)
+        deptName = deptNameTemp = deptNamePram
         $('.selectDept ').attr('title',deptNamePram)
         $(".deptList").css("display", "none")
     }else{
-        $('.selectDept ').html('全部')
+        $('.selectDept ').val('全部')
     }
     $(".deptList").css("display", "none")
     // $('.selectDept ').addClass('unSelect')
@@ -678,6 +672,9 @@ function bindOperaAll(){
 
 $('.selectDept').on("focus", function(e){
     e.stopPropagation()
+    // let val = $(this).val().trim()
+    // deptName = deptNameTemp = val
+    // val&&getDeptList(val)
     $(".levelList ").css("display","none")
     $(".selectLevel .arrow").attr("src",iconDown)
     $(".fpCheckList ").css("display", "none")
@@ -736,11 +733,7 @@ function bindDeptSelect(){
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
         deptNameTemp=deptItemName==="全部"?"":deptItemName;
-        if(deptItemName.length > 10){
-            $('.selectDept').val(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptItemName)
-        }
+        $('.selectDept').val(deptItemName)
         $('.selectDept ').attr('title',deptItemName)
         $(".deptList").css("display", "none")
         $('.selectDept').removeClass('unSelect')

src/js/qcListCopyUnqualified.js

@@ -78,14 +78,9 @@ if(deptIdPram&&deptNamePram){
     }
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
-    if(deptNamePram.length > 10){
-        $('.selectDept').val(deptNamePram.substring(0,8)+'...')
-    }else{
-        $('.selectDept').val(deptNamePram)
-    }
+    $('.selectDept').val(deptNamePram)
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if(from==4){
     // $(".qcFiliterItem").css("display","none")
@@ -357,13 +352,11 @@ $(".abnormalClear").on("click", function(e){
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
     if(from == 2){
+        deptName = deptNameTemp = deptListDept[0].deptName
         $('.selectDept ').val(deptListDept[0].deptName)
     } else if (from == 4 || from == 9){
-        if(deptNamePram.length > 10){
-            $('.selectDept').val(deptNamePram.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptNamePram)
-        }
+        deptName = deptNameTemp = deptNamePram
+        $('.selectDept').val(deptNamePram)
         $('.selectDept ').attr('title',deptNamePram)
         $(".deptList").css("display", "none")
     }else{
@@ -737,11 +730,7 @@ function bindDeptSelect(){
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
         deptNameTemp=deptItemName==="全部"?"":deptItemName;
-        if(deptItemName.length > 10){
-            $('.selectDept').val(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptItemName)
-        }
+        $('.selectDept').val(deptItemName)
         $('.selectDept ').attr('title',deptItemName)
         $(".deptList").css("display", "none")
         $('.selectDept').removeClass('unSelect')

src/js/qcListOutHospital.js

@@ -71,14 +71,9 @@ if(docName){
 if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
-    if(deptNamePram.length > 10){
-        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
-    }else{
-        $('.selectDept').html(deptNamePram)
-    }
+    $('.selectDept').val(deptNamePram)
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if(from==2){
     // $(".export").css('display','none')
@@ -756,13 +751,8 @@ function bindDeptSelect(){
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
         deptNameTemp=deptItemName==="全部"?"":deptItemName;
-        if(deptItemName.length > 10){
-            $('.selectDept').val(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').val(deptItemName)
-        }
+        $('.selectDept').val(deptItemName)
         $('.selectDept ').attr('title',deptItemName)
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $(".deptList").css("display", "none")
         $('.selectDept').removeClass('unSelect')
     })

src/js/uccDetail.js

@@ -40,7 +40,6 @@ let currentPage;
 deptNameTemp = docName = doctorNameUrl
 listenScroll()
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
@@ -69,14 +68,9 @@ if(docName){
 if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
-    if(deptNamePram.length > 10){
-        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
-    }else{
-        $('.selectDept').html(deptNamePram)
-    }
+    $('.selectDept').val(deptNamePram)
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if(from==2){
     $(".export").css('display','none')
@@ -85,7 +79,7 @@ if(from==2){
     deptName=deptListDept[0]&&deptListDept[0].deptName;
     deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
     deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
-    $('.selectDept').html(deptName)
+    $('.selectDept').val(deptName)
 }else if(from==3){
     $(".partTitle .titlePic ").html(`<a href="uncorrectedCasesStatistics.html">时效性相关统计 / </a>病历列表`)
 }else if(from == 4){
@@ -133,7 +127,8 @@ function getTabData(activePage){
         patName: name, //病人姓名
         // casesEntryName: casesEntryName,
         casesEntryId:casesId,
-        behDeptName: deptName == "全部" ? "":deptName,
+        behDeptName: deptName == "全部" ? "":deptName||"",
+        deptName: deptName == "全部" ? "":deptName||"",
         doctorId: doctorNum,
         hospitalId:getCookie("hospitalid"),
         // doctorName: doctorName,
@@ -325,13 +320,17 @@ $(".abnormalClear").on("click", function(e){
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
     if(from == 2){
-        console.log('deptListDept',deptListDept)
-        $('.selectDept ').html(deptListDept[0].deptName)
+        $('.selectDept ').val(deptListDept[0].deptName)
+        deptName = deptNameTemp = deptListDept[0].deptName
+    } else if (from == 4 || from == 3){
+        deptName = deptNameTemp = deptNamePram
+        $('.selectDept').val(deptNamePram)
+        $('.selectDept ').attr('title',deptNamePram)
+        $(".deptList").css("display", "none")
     }else{
-        $('.selectDept ').html('全部')
+        $('.selectDept ').val('全部')
     }
     $(".deptList").css("display", "none")
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectDept ').addClass('unSelect')
     $('.selectLevel').html('全部')
     $(".levelList").css("display", "none")
@@ -594,8 +593,11 @@ function bindOperaAll(){
     })
 }
 
-$('.selectDept').on("click", function(e){
+$('.selectDept').on("focus", function(e){
     e.stopPropagation()
+    // let val = $(this).val().trim()
+    // deptName = deptNameTemp = val
+    // val&&getDeptList(val)
     $(".levelList ").css("display","none")
     $(".selectLevel .arrow").attr("src",iconDown)
     $(".checkList ").css("display", "none")
@@ -604,35 +606,66 @@ $('.selectDept').on("click", function(e){
     $(".fpSelectCheck .arrow").attr("src",iconDown)
     $(".qcCheckList ").css("display", "none")
     $(".qcSelectCheck .arrow").attr("src",iconDown)
-    const showList =  $(".deptList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".deptList ").css("display","block")
-        $(".selectDept .arrow").attr("src",iconUp)
-    }else{
-        $(".deptList ").css("display", "none")
-        $(".selectDept .arrow").attr("src",iconDown)
-    }
+    $(".deptList ").css("display","block")
 })
-
+$('.selectDept').on("blur", function(e){
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
+  })
+  $('.selectDept').on("input", function(e){
+    let val = $(this).val().trim()
+    deptName = deptNameTemp = val
+    getDeptList(deptName)
+  })
 //获取科室列表
 getDeptList()
-function getDeptList(){
+function getDeptList(val){
     if(from == 2){
         rendeDeptList(deptListDept) 
         return
     }
-    post(api.getDeptList,{inputStr:""}).then(res =>{
+    post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
         if(res.data.code == '0'){
            const  deptList = res.data.data
            rendeDeptList(deptList)
-        }else{}
+        }else{
+            rendeDeptList([])
+        }
     }).catch((e) =>{
 
     })
 }
 
-//获取页面配置
+function rendeDeptList(deptList){
+    if(deptList.length == 0){
+      $('.deptList').html("")
+      return
+    }
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
+    if(from == 2){
+        str = ''
+    }
+    for(let i = 0; i < deptList.length; i++){
+        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("mousedown",function(){
+        const deptItemName = $(this).attr("data-name")
+        const deptItemId = $(this).attr("data-id")
+        deptIdTemp =deptItemId
+        deptNameTemp=deptItemName==="全部"?"":deptItemName;
+        $('.selectDept').val(deptItemName)
+        $('.selectDept ').attr('title',deptItemName)
+        $(".deptList").css("display", "none")
+        $('.selectDept').removeClass('unSelect')
+    })
+}
 
+//获取页面配置
 function getPageSet(){
     return post(api.getQcListPageSet,{pageType:1}).then(res =>{
         if(res.data.code == '0'){
@@ -696,35 +729,6 @@ function bindSetCol(){
     })
 }
 
-function rendeDeptList(deptList){
-    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
-    if(from == 2){
-        str = ''
-    }
-    for(let i = 0; i < deptList.length; i++){
-        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")
-        deptIdTemp =deptItemId
-        deptNameTemp = deptItemName
-        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")
-        $('.selectDept').removeClass('unSelect')
-    })
-}
 function loading(){
     const str = `
     <div class="loadingBox">
@@ -1184,7 +1188,6 @@ function renderPagination(totalPage,activePage,totalNum){
 
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
-    $(".deptList").css("display", "none")
     $(".checkList").css("display", "none")
     $(".fpCheckList").css("display", "none")
     $(".qcCheckList").css("display", "none")
@@ -1211,7 +1214,8 @@ $(function($){
             behospitalCode: behospitalCode,            
             patName: name, //病人姓名
             level:level,//病历等级
-            behDeptName: deptName, 
+            deptName: deptName == "全部" ? "":deptName||"",
+            behDeptName: deptName == "全部" ? "":deptName||"",
             doctorName: doctorName,
             doctorId: doctorNum,    
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间

src/js/uncorrectedCasesStatistics.js

@@ -202,6 +202,9 @@ function renderTab(data,hisId,activePage){
 
 $('.selectDept').on("focus", function(e){
   e.stopPropagation()
+  // let val = $(this).val().trim()
+  // deptName = deptNameTemp = val
+  // val&&getDeptList(val)
   $(".deptList ").css("display","block")
 })
 $('.selectDept').on("blur", function(e){
@@ -247,11 +250,7 @@ function bindDeptSelect(){
     const deptItemId = $(this).attr("data-id")
     deptIdTemp =deptItemId;
     deptNameTemp=deptItemName==="全部"?"":deptItemName;
-    if(deptItemName.length > 10){
-      $('.selectDept').val(deptItemName.substring(0,8)+'...')
-    }else{
-      $('.selectDept').val(deptItemName)
-    }
+    $('.selectDept').val(deptItemName)
     $('.selectDept ').attr('title',deptItemName)
     $(".deptList").css("display", "none")
     $('.selectDept').removeClass('unSelect')

src/js/uncorrectedCopy.js

@@ -261,11 +261,7 @@ function bindDeptSelect(){
     const deptItemId = $(this).attr("data-id")
     deptIdTemp =deptItemId;
     deptNameTemp=deptItemName==="全部"?"":deptItemName;
-    if(deptItemName.length > 10){
-      $('.selectDept').val(deptItemName.substring(0,8)+'...')
-    }else{
-      $('.selectDept').val(deptItemName)
-    }
+    $('.selectDept').val(deptItemName)
     $('.selectDept ').attr('title',deptItemName)
     $(".deptList").css("display", "none")
     $('.selectDept').removeClass('unSelect')