Browse Source

任务列表增加来源列及筛选

zhouna 4 years ago
parent
commit
2ddfbcb761
4 changed files with 63 additions and 7 deletions
  1. 2 2
      src/css/checkTaskList.less
  2. 11 0
      src/html/checkTaskList.html
  3. 41 2
      src/js/checkTaskList.js
  4. 9 3
      src/js/utils.js

+ 2 - 2
src/css/checkTaskList.less

@@ -186,7 +186,7 @@ h2{
     width: 160px;
     max-height: 400px;
 }
-.levelList,.checkList,.statusList{
+.levelList,.checkList,.statusList,.scoreList{
     width: 120px;
     // height: 200px;
     li:hover{
@@ -194,7 +194,7 @@ h2{
         cursor: pointer;
     }
 }
-.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck,.selectStatus{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck,.selectStatus,.selectScore{
     display: inline-block;
     position: relative;
     width:120px;

+ 11 - 0
src/html/checkTaskList.html

@@ -61,6 +61,16 @@
                 <li class="levelItem" data-name="乙" data-id=乙>乙</li>
                 <li class="levelItem" data-name="丙" data-id=丙>丙</li>
             </ul>
+        </span>
+        <span class="filterItem">
+            <span>任务来源:</span>
+            <span class="selectScore">
+                <i>全部</i>
+                <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
+            </span>
+            <ul class="scoreList filterDropList">
+
+            </ul>
         </span>
             <span class="filter">查询</span>
             <span class="filterclear abnormalClear filterclearT">重置</span>
@@ -73,6 +83,7 @@
                  <thead>
                  <tr class="tabTitle">
                      <th class="textCenter" valCode="behospitalCode">病人住院序号</th>
+                     <th class="scoreTime textCenter" valCode="jobTypeName">任务来源</th>
                      <th class="scoreTime textCenter" valCode="month">任务月份</th>
                      <th class="doctorName textCenter" valCode="status" >病历核查状态</th>
                      <th class="deptName textCenter" valCode="behDeptName">科室</th>

+ 41 - 2
src/js/checkTaskList.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/checkTaskList.less");
 require('./modal.js');
 const { api, ywCheckApi } = require('./api.js')
-const { post, getCookie, getUrlArgObjectNew, emptyBox,  listenScroll } = require('./utils.js')
+const { post, getCookie, getUrlArgObjectNew, emptyBox,  listenScroll,getScoreTabList } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCalenBlue = require("./../images/icon_calen_blue.png")
@@ -17,7 +17,7 @@ $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectStatus").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
-let tabList = [],global_deptId = "",global_checkStatus = "",global_level="",data_desc = ["leaveHospitalDate"], data_asc = [];
+let tabList = [],global_deptId = "",global_checkStatus = "",global_score='',global_level="",data_desc = ["leaveHospitalDate"], data_asc = [];
 let isPlacefile = getCookie('isPlacefile') || 1
 if (isPlacefile != 1) {
     data_desc = ["behospitalDate"]
@@ -121,6 +121,15 @@ $(function(){
         }
     })
 
+    //筛选分值选择
+    $('.selectScore').on("click", function(e){
+        e.stopPropagation();
+        $(".deptList ").css("display","none")
+        $(".selectDept .arrow").attr("src",iconDown)
+        $(".selectScore .arrow").attr("src",iconDown)
+        $(".scoreList ").css("display","block")
+    })
+
     //筛选
     $(".filter").on("click", function () {
         const filterData = getFilterData();
@@ -137,6 +146,7 @@ $(function(){
         clearFilter();
         getTabData(1)
     })
+    getScoreTabList((data)=>{rendeScoreList(data)},true)
     getTabData(1)
     bindLeveldSelect()
     bindStatusdSelect()
@@ -226,6 +236,10 @@ function clearFilter(){
     $('.selectStatus').html('全部')
     $(".statusList").css("display", "none")
     $(".selectStatus").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+
+    $('.selectScore i').html('全部')
+    $(".scoreList").css("display", "none")
+    global_score='';
 }
 function getTabData(activePage) {
     const filterData = getFilterData();
@@ -236,6 +250,7 @@ function getTabData(activePage) {
         size: 15,
         current:activePage,
         ...filterData,
+        checkJobTypes:global_score.trim()?[global_score]:[],
         behDeptId:global_deptId.trim(),
         status:global_checkStatus,
         jobDistributionTimeStart:filterData.jobDistributionTimeStart+" 00:00:00",
@@ -280,6 +295,30 @@ function bindOrder() {
         getTabData(1);
     });
 }
+
+//来源筛选下拉
+function rendeScoreList(list){console.log(list)
+    const arr = Object.keys(list);
+    if(arr.length == 0){
+        $('.scoreList').html("")
+        return
+    }
+    let str = `<li class="scoreItem ellipsis" data-id=" " data-name="全部">全部</li>`;
+    for(let i = 0; i < arr.length; i++){
+        str += `<li class="scoreItem ellipsis" data-id=${arr[i]} data-name=${list[arr[i]]}> ${list[arr[i]]}</li>`
+    }
+    $('.scoreList').html(str)
+    bindScoreSelect()
+}
+function bindScoreSelect(){
+    $('.scoreItem').on("click",function(){
+        const scoreItemName = $(this).attr("data-name")
+        const scoreItemItemId = $(this).attr("data-id")
+        global_score =scoreItemItemId;
+        $('.selectScore i').html(scoreItemName)
+        $(".scoreList").css("display", "none")
+    })
+}
 function renderTab(data) {
     let str = ``,code="";
     if (data.length === 0) {

+ 9 - 3
src/js/utils.js

@@ -532,10 +532,16 @@ function initScroll(el, sliderDir, sliderMode, top) {
   }
 }
 //获取筛选分值、任务来源列表
-function getScoreTabList(fn){
-    const val = localStorage.getItem('valueList');
+function getScoreTabList(fn,isSource){
+    let val='';
+    if(isSource){
+        val = localStorage.getItem('sourceList');
+    }else{
+        val = localStorage.getItem('valueList');
+    }
+
     if(val.trim()){
-        fn(val.split(","));
+        fn(isSource?JSON.parse(val):val.split(","));
         return;
     }
     post(ywCheckApi.getCheckType).then(res =>{