luolei 4 年 前
コミット
298f8beb2d

+ 9 - 0
src/css/mukuai.less

@@ -65,6 +65,11 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        .canEditModule {
+            width: 142px;
+            height: 34px;
+            line-height: 34px;
+        }
     }
     .selectUsed,.selectReject {
         float: right;
@@ -290,4 +295,8 @@ th[code]{
 }
 .managerContainer.usrContain .selectReject {
     width: 140px;
+}
+
+.filterBox .filterItem .moduleLisWid {
+    width: 142px !important;
 }

+ 5 - 0
src/css/single.less

@@ -65,6 +65,11 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        .selectModuleType {
+            width: 142px;
+            height: 34px;
+            line-height: 34px;
+        }
     }
     .rejectList {
         height: 80px !important;

+ 1 - 1
src/html/assertTypeDetail.html

@@ -17,7 +17,7 @@
           <div class="main-body">
             <div class="filterBox clearfix">
                 <!-- <div class="filterItem typeFilter deptListWrap">
-                    <span class="explainL" style="overflow:hidden">科室名称:</span>
+                    <span class="explainL" style="overflow:hidden">科室:</span>
                     <span class="selectDept ellipsis" data-id=""><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 2 - 2
src/html/checkControl.html

@@ -24,7 +24,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <!-- <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称"> -->
                     <input type="text" class="selectDept canEditDept" value="全部">
                     <ul class="deptList filterDropList"></ul>
@@ -52,7 +52,7 @@
                 <table>
                     <thead>
                         <th class="moduleName" style="width: 65px;">序号</th>
-                        <th class="beHospitalId textCenter" code="deptName">科室名称</th>
+                        <th class="beHospitalId textCenter" code="deptName">科室</th>
                         <th class="beHospitalId textCenter" code="mrNum">质控总数</th>
                         <th class="beHospitalId textCenter" code="checkedNum">病历核查数量</th>
                         <th class="beHospitalId textCenter" code="improveNum">已改善数量</th>

+ 1 - 1
src/html/dayDetail.html

@@ -24,7 +24,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
                 <!-- <span class="filterItem typeFilter deptListWrap">

+ 1 - 1
src/html/deptScoreDetail.html

@@ -28,7 +28,7 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入医生名称">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室名称:</span>
+                    <span style="overflow:hidden">科室:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 1 - 1
src/html/deptScoreDetailControl.html

@@ -24,7 +24,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <!-- <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称"> -->
                     <input type="text" class="selectDept canEditDept" value="全部">
                     <ul class="deptList filterDropList"></ul>

+ 1 - 1
src/html/deptScoreDetailControlLevel.html

@@ -25,7 +25,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">

+ 2 - 2
src/html/jiaji.html

@@ -24,7 +24,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
                 <span class="filterItem typeFilter clearfix dataSelectLight">
@@ -41,7 +41,7 @@
                 <table>
                     <thead>
                         <th class="moduleName" style="width: 65px;">序号</th>
-                        <th class="moduleItemName">科室名称</th>
+                        <th class="moduleItemName">科室</th>
                         <th class="moduleScore" style="width: 80px;">甲级病历占比</th>
                     </thead>
                     <tbody class="tbody">

+ 2 - 2
src/html/keyItemFlawControl.html

@@ -20,7 +20,7 @@
     <div class="main-body">
         <div class="filterBox clearfix">
             <span class="filterItem typeFilter deptListWrap">
-                <span>科室名称:</span>
+                <span>科室:</span>
                 <!-- <span class="selectDept">
                     全部
                 </span> -->
@@ -41,7 +41,7 @@
             <table class="key-list">
                 <thead>
                 <th class="moduleName" style="width: 65px;">序号</th>
-                <th class="beHospitalId textCenter" code="deptName">科室名称</th>
+                <th class="beHospitalId textCenter" code="deptName">科室</th>
                 <th class="beHospitalId textCenter textBreak" code="consultationNum">未在24小时内<br/>完成会诊数</th>
                 <th class="beHospitalId textCenter textBreak" code="consultationPercentStr">未在24小时内<br/>完成会诊率</th>
                 <th class="beHospitalId textCenter textBreak" code="operationNameNum">手术记录名称不<br/>匹配数</th>

+ 1 - 1
src/html/mukuai.html

@@ -31,7 +31,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室名称:</span>
+                    <span style="overflow:hidden">科室:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 2 - 3
src/html/mukuaiControl.html

@@ -26,9 +26,8 @@
             <div class="filterBox">
                 <span class="filterItem">
                     <span>模块名称:</span>
-                    <span class="">
-                        <input class="moduleItemInp" type="text" placeholder="请输入模块名称">
-                    </span>
+                    <input type="text" class="selectModuleType canEditModule" value="全部">
+                    <ul class="moduleTypeList filterDropList moduleLisWid"></ul>
                 </span>
                 <!-- <span class="filterItem typeFilter deptListWrap">
                     <span>科室:</span>

+ 1 - 1
src/html/partDetail.html

@@ -28,7 +28,7 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入主管医生">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室名称:</span>
+                    <span style="overflow:hidden">科室:</span>
                     <span class="selectDept ellipsis" data-id=""><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 2 - 2
src/html/partDetailControl.html

@@ -24,7 +24,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <input type="text" class="selectDept canEditDept" value="全部">
                     <ul class="deptList filterDropList"></ul>
                 </span>
@@ -51,7 +51,7 @@
                 <table>
                     <thead>
                         <th class="moduleName" style="width: 65px;">序号</th>
-                        <th class="beHospitalId textCenter" code="deptName">科室名称</th>
+                        <th class="beHospitalId textCenter" code="deptName">科室</th>
                         <th class="beHospitalId textCenter" code="entryNum">缺陷总数</th>
                         <th class="beHospitalId textCenter" code="secondLevelNum">不合格数</th>
                         <th class="beHospitalId textCenter" code="firstLevelNum">合格数</th>

+ 2 - 2
src/html/payDetail.html

@@ -24,7 +24,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
                 <!-- <span class="filterItem typeFilter deptListWrap">
@@ -53,7 +53,7 @@
                 <table class="tableDay">
                     <thead>
                         <th class="moduleName" style="width: 65px;">序号</th>
-                        <th class="beHospitalId textCenter">科室名称</th>
+                        <th class="beHospitalId textCenter">科室</th>
                         <th class="patientNo textCenter" >平均住院花费(元)</th>
                     </thead>
                     <tbody class="tbody">

+ 1 - 1
src/html/qcListOutHospital.html

@@ -31,7 +31,7 @@
                         </ul>
                     </span>
                     <span class="filterItem typeFilter deptListWrap">
-                        <span>科室名称:</span>
+                        <span>科室:</span>
                         <!-- <span class="selectDept">
                             全部
                         </span> -->

+ 3 - 3
src/html/quexianDetail.html

@@ -26,7 +26,7 @@
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <span class="selectDepts" data-id="">全部</span>
                 </span>
                 <span class="filterItem">
@@ -36,7 +36,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>所属模块:</span>
+                    <span>模块名称:</span>
                     <span class="selectDept" data-id="">全部</span>
                     <ul class="deptList filterDropList">
                         <li class="deptItem ellipsis" title="全部" data-id="" data-name="全部">全部</li>
@@ -57,7 +57,7 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName desc" code="casesName">所属模块</th>
+                    <th class="moduleItemName desc" code="casesName">模块名称</th>
                     <th class="moduleItemName" code="name">缺陷名称</th>
                     <th class="moduleItemName textCenter" code="num">数量</th>
                     <th class="moduleScore" style="width: 100px;" code="percent">缺陷占比</th>

+ 3 - 3
src/html/quexianDetailControl.html

@@ -25,7 +25,7 @@
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <span class="selectDepts" data-id="">全部</span>
                 </span>
                 <span class="filterItem">
@@ -35,7 +35,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>所属模块:</span>
+                    <span>模块名称:</span>
                     <span class="selectDept" data-id="">全部</span>
                     <ul class="deptList filterDropList">
                         <li class="deptItem ellipsis" title="全部" data-id="" data-name="全部">全部</li>
@@ -57,7 +57,7 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName desc" code="casesName">所属模块</th>
+                    <th class="moduleItemName desc" code="casesName">模块名称</th>
                     <th class="moduleItemName" code="name">缺陷名称</th>
                     <th class="moduleItemName textCenter" code="num">数量</th>
                     <th class="moduleScore" style="width: 100px;" code="percent">缺陷占比</th>

+ 2 - 2
src/html/quexianDetailControlHome.html

@@ -25,7 +25,7 @@
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <span class="selectDept selectDepts" data-id="">
                         <span class="selectDefect"> 
                             
@@ -57,7 +57,7 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName desc">所属模块</th>
+                    <th class="moduleItemName desc">模块名称</th>
                     <th class="moduleItemName">缺陷名称</th>
                     <th class="moduleItemName textCenter">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>

+ 2 - 2
src/html/quexianXQ.html

@@ -25,7 +25,7 @@
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
-                    <span>科室名称:</span>
+                    <span>科室:</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
@@ -52,7 +52,7 @@
                 <table>
                     <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="beHospitalId textCenter">科室名称</th>
+                    <th class="beHospitalId textCenter">科室</th>
                     <th class="patientNo textCenter" >平均住院天数</th>
                     </thead>
                     <tbody class="tbody">

+ 2 - 2
src/html/readmission.html

@@ -25,8 +25,8 @@
             <div class="filterBox">
                 <div class="clearfix">
                     <!-- <span class="filterItem typeFilter">
-                        <span>科室名称:</span>
-                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
+                        <span>科室:</span>
+                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室">
                     </span> -->
                     <span class="filterItem typeFilter clearfix" >
                         <span class="fl">出院日期:</span>

+ 4 - 3
src/html/singleVeto.html

@@ -32,8 +32,9 @@
                 </span>
                 
                 <span class="filterItem typeFilter">
-                    <span>所属模块:</span>
-                    <span class="selectModuleType ellipsis">全部 </span>
+                    <span>模块名称:</span>
+                    <!-- <span class="selectModuleType ellipsis">全部 </span> -->
+                    <input type="text" class="selectModuleType canEditModule" value="全部">
                     <ul class="moduleTypeList filterDropList"></ul>
                 </span>
                 <span class="filterItem">
@@ -58,7 +59,7 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName">所属模块</th>
+                    <th class="moduleItemName">模块名称</th>
                     <th class="moduleItemName">缺陷名称</th>
                     <th class="moduleItemName">分值</th>
                     <th class="moduleItemName">单项否决</th>

+ 1 - 1
src/html/tiaomu.html

@@ -32,7 +32,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室名称:</span>
+                    <span style="overflow:hidden">科室:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 2 - 2
src/html/uncorrectedCasesStatistics.html

@@ -20,7 +20,7 @@
     <div class="main-body">
         <div class="filterBox clearfix">
             <span class="filterItem typeFilter">
-                <span>科室名称:</span>
+                <span>科室:</span>
                 <input type="text" class="selectDept canEditDept" value="全部">
                 <ul class="deptList filterDropList"></ul>
             </span>
@@ -39,7 +39,7 @@
                 <thead>
                 <tr class="tabTitle"></tr>
                 <!-- <th class="moduleName" style="width: 65px;">序号</th>
-                <th class="beHospitalId textCenter" code="deptName">科室名称</th>
+                <th class="beHospitalId textCenter" code="deptName">科室</th>
                 <th class="beHospitalId textCenter" code="consultationNum">入院记录24h内<br/>未完成</th>
                 <th class="beHospitalId textCenter" code="consultationPercentStr">首程8h内未完成</th>
                 <th class="beHospitalId textCenter" code="operationNameNum">入院后未连记3天</th>

+ 3 - 3
src/html/uncorrectedCopy.html

@@ -20,14 +20,14 @@
     <div class="main-body">
         <div class="filterBox clearfix">
             <!-- <span class="filterItem typeFilter deptListWrap">
-                <span>科室名称:</span>
+                <span>科室:</span>
                 <span class="selectDept">
                     全部
                 </span>
                 <ul class="deptList filterDropList"></ul>
             </span> -->
             <span class="filterItem typeFilter">
-                <span>科室名称:</span>
+                <span>科室:</span>
                 <input type="text" class="selectDept canEditDept" value="全部">
                 <ul class="deptList filterDropList"></ul>
             </span>
@@ -46,7 +46,7 @@
                 <thead>
                 <tr class="tabTitle"></tr>
                 <!-- <th class="moduleName" style="width: 65px;">序号</th>
-                <th class="beHospitalId textCenter" code="deptName">科室名称</th>
+                <th class="beHospitalId textCenter" code="deptName">科室</th>
                 <th class="beHospitalId textCenter" code="consultationNum">入院记录24h内<br/>未完成</th>
                 <th class="beHospitalId textCenter" code="consultationPercentStr">首程8h内未完成</th>
                 <th class="beHospitalId textCenter" code="operationNameNum">入院后未连记3天</th>

+ 2 - 2
src/js/dayDetail.js

@@ -156,14 +156,14 @@ function renderTab(data,hisId,activePage){
     let sts = `
         ${statisticsType==1?`<thead class="monType">
             <th class="moduleName" style="width: 65px;">序号</th>
-            <th class="beHospitalId textCenter">科室名称</th>
+            <th class="beHospitalId textCenter">科室</th>
             <th class="patientNo textCenter" >本月平均住院天数(天)</th>
             <th class="patientNo textCenter" >上月平均住院天数(天)</th>s
             <th class="patientNo textCenter" >去年本月平均住院天数(天)</th>
         </thead>`:`
         <thead class="yearType">
             <th class="moduleName" style="width: 65px;">序号</th>
-            <th class="beHospitalId textCenter">科室名称</th>
+            <th class="beHospitalId textCenter">科室</th>
             <th class="patientNo textCenter" >本年平均住院天数(天)</th>
             <th class="patientNo textCenter" >去年平均住院天数(天)</th>
         </thead>

+ 1 - 1
src/js/deptScoreDetailControl.js

@@ -235,7 +235,7 @@ function renderTab(data,hisId,activePage){
         <thead>
         <th class="moduleName" style="width: 65px;">序号</th>
         ${hospital=='台州市立'?'<th class="beHospitalId textCenter">科室系统</th>':null}
-        <th class="beHospitalId textCenter">科室名称</th>
+        <th class="beHospitalId textCenter">科室</th>
         <th class="beHospitalId textCenter ${data_asc == 'entryNum'?'asc':data_desc == 'entryNum'?'desc':''}" code="entryNum">缺陷总数</th>
         <th class="beHospitalId textCenter ${data_asc == 'sameNum'?'asc':data_desc == 'sameNum'?'desc':''}" code="sameNum">同比总数</th>
         <th class="beHospitalId textCenter ${data_asc == 'averageValue'?'asc':data_desc == 'averageValue'?'desc':''}" code="averageValue">质控平均分</th>

+ 1 - 1
src/js/deptScoreDetailControlLevel.js

@@ -169,7 +169,7 @@ function renderTab(data,hisId,activePage){
         <th class="moduleName" style="width: 65px;">序号</th>
         <th class="beHospitalId textCenter">科室编码</th>
         ${hospital=='台州市立'?'<th class="beHospitalId textCenter">科室系统</th>':null}
-        <th class="beHospitalId textCenter">科室名称</th>
+        <th class="beHospitalId textCenter">科室</th>
         <th class="beHospitalId textCenter">缺陷总数</th>
         <th class="beHospitalId textCenter">质控平均分</th>
         <th class="beHospitalId textCenter">质控病历数</th>

+ 29 - 31
src/js/mukuaiControl.js

@@ -11,9 +11,8 @@ const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 let isPlacefile = getCookie('isPlacefile')||1
-let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percent'],startDateParam="", endDateParam=""   
+let casesId="", name="", isReject ="", isUsed ="",casesName="",casesNameTemp="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percent'],startDateParam="", endDateParam=""   
 
-$(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -41,11 +40,13 @@ $(function(){
         // window.location.reload()
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name=nameTemp = ""
+        casesName=casesNameTemp = ""
         data_asc=[],
         data_desc=['percent']
         $("th[code]").removeClass("asc desc");
         $(".moduleScore").addClass("desc")
         $(".patientNumInp").val("")
+        $(".selectModuleType ").val("全部")
         getTabData(1)
     })
     
@@ -73,7 +74,6 @@ $(function(){
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     if(!isReject){
-        console.log("isRejectisRejectisReject")
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     getTabData(1)//条目缺陷
@@ -205,6 +205,7 @@ function getTabData(activePage){
         name: name, //条目名
         deptName: deptId, //科室名
         size: 15,
+        casesName:casesName=='全部'?'':casesName, //模块Id
         asc:data_asc,     //升序
         desc: data_desc,       //降序
         "startDate":dateStatrt,
@@ -233,34 +234,18 @@ $(".moduleItemInp").on("input", function(e){
     nameTemp = val
 })
 $(".filter").on("click", function(e){
-    casesId=casesIdTemp, name=nameTemp, isReject =isRejectTemp, isUsed =isUsedTemp,deptId = deptIdTemp
+    casesId=casesIdTemp, name=nameTemp, isReject =isRejectTemp, isUsed =isUsedTemp,deptId = deptIdTemp,casesName=casesNameTemp
     getTabData(1)
 })
 $(".filterclear").on("click", function(e){
     nameTemp = ""
     $(".moduleItemInp").val("")
 })
-$('.selectModuleType').on("click", function(e){
-    e.stopPropagation()
-    $(".rejectList ").css("display","none")
-    $(".usedList ").css("display", "none")
-    $(".selectReject .arrow").attr("src",iconDown)
-    $(".selectUsed .arrow").attr("src",iconDown)
-    const showList =  $(".moduleTypeList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".moduleTypeList ").css("display","block")
-        $(".selectModuleType .arrow").attr("src",iconUp)
-    }else{
-        $(".moduleTypeList ").css("display", "none")
-        $(".selectModuleType .arrow").attr("src",iconDown)
-    }
-})
     
 $('.selectReject').on("click", function(e){
     e.stopPropagation()
     $(".moduleTypeList ").css("display", "none")
     $(".usedList ").css("display", "none")
-    $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
     const showList =  $(".rejectList ").css("display")
     if(showList == "none" ||!showList){
@@ -275,7 +260,6 @@ $('.selectUsed').on("click", function(e){
     e.stopPropagation()
     $(".moduleTypeList ").css("display", "none")
     $(".rejectList ").css("display","none")
-    $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     const showList =  $(".usedList ").css("display")
     if(showList == "none" ||!showList){
@@ -428,9 +412,27 @@ function saveEdit(item,activePage){
     })
 }
 
+
+$('.selectModuleType').on("focus", function(e){
+    e.stopPropagation()
+    $(".rejectList ").css("display","none")
+    $(".usedList ").css("display", "none")
+    $(".selectReject .arrow").attr("src",iconDown)
+    $(".selectUsed .arrow").attr("src",iconDown)
+    $(".moduleTypeList ").css("display","block")
+})
+$('.selectModuleType').on("blur", function(e){
+    $(".moduleTypeList ").css("display","none")
+})
+$('.selectModuleType').on("input", function(e){
+    let val = $(this).val().trim()
+    casesName = casesNameTemp = val
+    getmoduleTypeList(val)
+})
+getmoduleTypeList()
 //获取模块类型
-function getmoduleTypeList(){
-    post(api.getQcCasesAll).then(res =>{
+function getmoduleTypeList(val){
+    post(api.getQcCasesAll,{casesName:val=="全部"?"":val||""}).then(res =>{
         if(res.data.code == '0'){
            const  moduleTypeList = res.data.data
            renderModuleTypeList(moduleTypeList)
@@ -439,8 +441,6 @@ function getmoduleTypeList(){
     
     })
 }
-
-
 function renderModuleTypeList(moduleTypeList){
     let str = `<li class="modeTypeItem " data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < moduleTypeList.length; i++){
@@ -452,13 +452,12 @@ function renderModuleTypeList(moduleTypeList){
 
 //模块类型选择
 function bindModuleTypeSelect(){
-    $('.modeTypeItem').on("click",function(){
+    $('.modeTypeItem').on("mousedown",function(){
         const modeTypeItemName = $(this).attr("data-name")
         const modeTypeItemId = $(this).attr("data-id")
         casesIdTemp =modeTypeItemId
-        $('.selectModuleType').html(modeTypeItemName).attr("title",modeTypeItemName)
-        $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-
+        casesName=casesNameTemp = modeTypeItemName
+        $('.selectModuleType').val(modeTypeItemName).attr("title",modeTypeItemName)
         $(".moduleTypeList ").css("display", "none")
     })
 }
@@ -550,10 +549,8 @@ 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)
 })
@@ -584,6 +581,7 @@ $(function() {
             name: name, //条目名
             deptName: deptId, //科室名
             asc:data_asc,     //升序
+            casesName:casesName=='全部'?'':casesName, //模块Id
             desc: data_desc,       //降序
             "startDate":startDateParam,
             "endDate":endDateParam,

+ 2 - 2
src/js/payDetail.js

@@ -160,14 +160,14 @@ function renderTab(data,hisId,activePage){
     let sts = `
         ${statisticsType==1?`<thead class="monType">
             <th class="moduleName" style="width: 65px;">序号</th>
-            <th class="beHospitalId textCenter">科室名称</th>
+            <th class="beHospitalId textCenter">科室</th>
             <th class="patientNo textCenter" >本月平均住院花费(元)</th>
             <th class="patientNo textCenter" >上月平均住院花费(元)</th>
             <th class="patientNo textCenter" >去年本月平均住院花费(元)</th>
         </thead>`:`
         <thead class="yearType">
             <th class="moduleName" style="width: 65px;">序号</th>
-            <th class="beHospitalId textCenter">科室名称</th>
+            <th class="beHospitalId textCenter">科室</th>
             <th class="patientNo textCenter" >本年平均住院花费(元)</th>
             <th class="patientNo textCenter" >去年平均住院花费(元)</th>
         </thead>

+ 0 - 2
src/js/qcList.js

@@ -914,7 +914,6 @@ function bindSaveColSet(){
             $("#mainBox .colSetBox", parent.document).remove()
             $.alerModal({"message":'保存失败,请重试~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         })
-
     })
     
 }
@@ -1176,6 +1175,5 @@ $((function($){
         expJson(api.exportQcList,param).then(res =>{
             downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")
         })
-      
     })
 })($));

+ 33 - 35
src/js/singleVeto.js

@@ -42,7 +42,7 @@ $(function(){
         selectReject=1
     }
     if(casesName){
-        $(".selectModuleType").html(casesName).attr("title",casesName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $(".selectModuleType").val(casesName).attr("title",casesName)
     }
     if(selectReject){
         isSingleReject = isSingleRejectTemp = '1'
@@ -74,9 +74,8 @@ $(function(){
     $(".abnormalClear").click(function(){
         // window.location.reload()
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
-        $(".selectModuleType").html("全部")
+        $(".selectModuleType").val("全部")
         $(".selectReject").html("全部")
-        $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         name = ""
         casesName=casesNameTemp=""
@@ -272,21 +271,6 @@ $(".filterclear").on("click", function(e){
     nameTemp = ""
     $(".moduleItemInp").val("")
 })
-$('.selectModuleType').on("click", function(e){
-    e.stopPropagation()
-    $(".rejectList ").css("display","none")
-    $(".usedList ").css("display", "none")
-    $(".selectReject .arrow").attr("src",iconDown)
-    $(".selectUsed .arrow").attr("src",iconDown)
-    const showList =  $(".moduleTypeList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".moduleTypeList ").css("display","block")
-        $(".selectModuleType .arrow").attr("src",iconUp)
-    }else{
-        $(".moduleTypeList ").css("display", "none")
-        $(".selectModuleType .arrow").attr("src",iconDown)
-    }
-})
 $('.selectReject').on("click", function(e){
     e.stopPropagation()
     $(".moduleTypeList ").css("display", "none")
@@ -306,7 +290,6 @@ $('.selectUsed').on("click", function(e){
     e.stopPropagation()
     $(".moduleTypeList ").css("display", "none")
     $(".rejectList ").css("display","none")
-    $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     const showList =  $(".usedList ").css("display")
     if(showList == "none" ||!showList){
@@ -471,11 +454,30 @@ function saveEdit(item,activePage){
     
     })
 }
-getmoduleTypeList()
 
+
+
+$('.selectModuleType').on("focus", function(e){
+    e.stopPropagation()
+    $(".rejectList ").css("display","none")
+    $(".usedList ").css("display", "none")
+    $(".selectReject .arrow").attr("src",iconDown)
+    $(".selectUsed .arrow").attr("src",iconDown)
+    $(".moduleTypeList ").css("display","block")
+})
+$('.selectModuleType').on("blur", function(e){
+    $(".moduleTypeList ").css("display","none")
+})
+$('.selectModuleType').on("input", function(e){
+    let val = $(this).val().trim()
+    casesName = casesNameTemp = val
+    getmoduleTypeList(val)
+})
+
+getmoduleTypeList()
 //获取模块类型
-function getmoduleTypeList(){
-    post(api.getQcCasesAll).then(res =>{
+function getmoduleTypeList(val){
+    post(api.getQcCasesAll,{casesName:val=="全部"?"":val||""}).then(res =>{
         if(res.data.code == '0'){
            const  moduleTypeList = res.data.data
            renderModuleTypeList(moduleTypeList)
@@ -484,9 +486,11 @@ function getmoduleTypeList(){
     
     })
 }
-
-
 function renderModuleTypeList(moduleTypeList){
+    if(moduleTypeList.length == 0){
+        $('.moduleTypeList').html("")
+        return
+    }
     let str = `<li class="modeTypeItem " data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < moduleTypeList.length; i++){
         str += `<li class="modeTypeItem ellipsis" title=${moduleTypeList[i].name} data-id=${moduleTypeList[i].id} data-name=${moduleTypeList[i].name}> ${moduleTypeList[i].name}</li>`
@@ -497,18 +501,12 @@ function renderModuleTypeList(moduleTypeList){
 
 //模块类型选择
 function bindModuleTypeSelect(){
-    $('.modeTypeItem').on("click",function(){
+    $('.modeTypeItem').on("mousedown",function(){
         const modeTypeItemName = $(this).attr("data-name")
         const modeTypeItemId = $(this).attr("data-id")
         casesIdTemp =modeTypeItemId
-        if(modeTypeItemId){
-            casesName=casesNameTemp = modeTypeItemName
-        }else{
-            casesName=casesNameTemp = ""
-        }
-        $('.selectModuleType').html(modeTypeItemName).attr("title",modeTypeItemName)
-        $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-
+        casesName=casesNameTemp = modeTypeItemName
+        $('.selectModuleType').val(modeTypeItemName).attr("title",modeTypeItemName)
         $(".moduleTypeList ").css("display", "none")
     })
 }
@@ -601,10 +599,10 @@ function renderPagination(totalPage,activePage,totalNum){
 }
 
 $(document).on("click", function(){
-    $(".moduleTypeList ").css("display", "none")
+    // $(".moduleTypeList ").css("display", "none")
+    // $(".selectModuleType .arrow").attr("src",iconDown)
     $(".rejectList ").css("display","none")
     $(".usedList ").css("display", "none")
-    $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
 })

+ 1 - 1
src/js/utils.js

@@ -144,7 +144,7 @@ const post = function (url, data) {
           setCookie('behosDateStart','')
           setCookie('behosDateEnd','')
           wd.location.href = "../login.html";
-        }else {
+        }else if(error.status===500||error.status===501||error.status===404){
           wd.location.href = "../error.html?code="+error.status;
         }
         reject(error);