浏览代码

模块名称改为下拉

zhouna 3 年之前
父节点
当前提交
738a116659

+ 9 - 5
src/css/dataAnalysis/improveStatistics.less

@@ -26,7 +26,8 @@
     .filterItem.deptListWrap {
 
         .selectDept,
-        .deptList {
+        .deptList,.selectCase,
+        .caseList {
             width: 180px;
         }
     }
@@ -174,7 +175,10 @@
         }
     }
 
-    .deptList {
+    .filterItem input{
+        height: 34px;
+    }
+    .deptList,.caseList {
         width: 160px;
         max-height: 400px;
     }
@@ -190,7 +194,7 @@
     }
 
     .selectLevel,
-    .selectDept {
+    .selectDept,.selectCase {
         display: inline-block;
         position: relative;
         width: 120px;
@@ -202,7 +206,7 @@
         cursor: pointer;
     }
 
-    .selectDept {
+    .selectDept,.selectCase {
         width: 160px;
     }
 
@@ -286,7 +290,7 @@
         margin-left: 30px;
     }
 
-    .deptItem:hover {
+    .deptItem:hover,.caseItem:hover {
         background-color: #EEF4FF;
         cursor: pointer;
     }

+ 2 - 1
src/html/dataAnalysis/improveStatistics.html

@@ -34,7 +34,8 @@
                 </span>
                 <span class="filterItem">
                     <span>模块名称:</span>
-                    <input class="moduleItemInp" id="casesName" type="text" placeholder="模块名称" autocomplete="off">
+                    <span class="selectCase canEditDept">全部</span>
+                    <ul class="caseList filterDropList"></ul>
                 </span>
                 <span class="filterItem typeFilter clearfix dataSelectLight">
                     <span class="fl">选择日期:</span>

+ 75 - 16
src/js/dataAnalysis/improveStatistics.js

@@ -1,34 +1,33 @@
 require('../mock')
 const $ = require('jquery');
-// require("../css/partDetailControl.less");
 require("../../css/dataAnalysis/improveStatistics.less");
 
 require('../modal.js');
 const {api} = require('../api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,setTitleTxt,setDatePicker,getPickerDate,downloadExportedData,expJson,initScroll,listenScroll} = require('../utils.js')
+const {post,getCookie,emptyBox,setDatePicker,getPickerDate,downloadExportedData,expJson,listenScroll} = require('../utils.js')
 require('../../resource/jquery-ui/jquery-ui.min.js');
 require('../../resource/jquery-ui/jquery-ui.min.css');
-const iconDown= require("../../images/arrow_down.png")
 const loadingImg = require("../../images/loading.gif")
+const iconDown= require("../../images/arrow_down.png")
+const iconUp = require("../../images/arrow_up.png")
 const arrowLeft= require("../../images/arrow_left.png")
 
 const arrowRight = require("../../images/arrow_right.png");
-$(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".selectCase").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
 let isPlacefile = getCookie('isPlacefile')||1
 
-let deptName="",deptNameTemp="", behospitalCode="", behospitalCodeTemp="",deptId="",deptIdTemp="",casesName='',entryName='',
+let deptName="",deptNameTemp="",caseName="",caseNameTemp="", behospitalCode="", behospitalCodeTemp="",deptId="",deptIdTemp="",caseId="",caseIdTemp="",entryName='',entryNameTemp='',
   data_desc="improveleNum",data_asc="";
-  let srcUrl = $("#contentIframe",parent.document).attr("src")
-  from = getUrlArgObjectNew("from",srcUrl)||""
-  let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
-  let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+  let startDateParam = ""
+  let endDateParam = ""
 
 $(function() {
   const  iconCalenBlue= require("../../images/icon_calen_blue.png")
   const  iconCalenGrey= require("../../images/icon_calen_grey.png")
   //获取科室列表
   getDeptList()
+  getCaseList();
   //日期控件事件绑定
   $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
   $('.iconCalen').on("mouseenter", function(e){
@@ -41,7 +40,7 @@ $(function() {
 	$(this).parent().find("input").focus()
   })
   //日期默认当年
-  setDatePicker($("#datepicker"), $("#datepicker2"), 1);
+  setDatePicker($("#datepicker"), $("#datepicker2"), 2);
   startDateParam=getPickerDate($("#datepicker"),1)
   endDateParam=getPickerDate($("#datepicker2"),2)
   //初始列表数据获取
@@ -78,14 +77,15 @@ $(function() {
 	data_desc=""
 	data_asc=""
 	setDatePicker($("#datepicker"),$("#datepicker2"),"default");
-	$("#casesName,#entryName").val("");
+	$("#entryName").val("");
 	$("th[code]").removeClass("desc asc");
 	behospitalCode =behospitalCodeTemp= ""
 	deptName = deptNameTemp = ""
 	deptId = deptIdTemp = ""
-	casesName="";
-	entryName="";
+	caseName=caseNameTemp="";
+	entryName=entryNameTemp="";
 	$(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
+	$(".selectCase").attr({'title':"全部",'data-id':''}).val("全部")
 	getTabData(1)
 	getDeptList()
   })
@@ -96,17 +96,24 @@ $(function() {
 	endDateParam=getPickerDate($("#datepicker2"),2)
 	deptId = deptIdTemp;
 	deptName = deptNameTemp;
-	casesName =$("#casesName").val();
-	entryName = $("#entryName").val();
+	caseName =caseNameTemp;
+	entryName = entryNameTemp;
 	getTabData(1)
   })
+  //点其他关闭弹窗
+  $(document).on("click", function(){
+	$(".caseList ").css("display", "none")
+	$(".deptList ").css("display","none")
+	$(".selectCase .arrow").attr("src",iconDown)
+	$(".selectDept .arrow").attr("src",iconDown)
+  })
 });
 
 function getFilterParam(current){
   const param = {
 	"isPlacefile":isPlacefile,
 	"deptId": deptName=="全部"?"":deptId||"", //科室id
-	"casesName": casesName,
+	"casesName": caseName,
 	"entryName":entryName,
 	"deptName": deptName=="全部"?"":deptName||"",
 	"asc":data_asc,     //升序
@@ -186,6 +193,58 @@ function renderTab(data,hisId,activePage){
         $(parent.document).find("#contentIframe").attr("src", "statisticsDetail.html?deptName=" + deptName + "&deptId=" + deptId + "&casesId=" + casesId+"&defectName="+casesName+"&typeMark="+typeMark+"&startDate="+startDateParam+"&endDate="+endDateParam)
     })
 }
+//模块下拉
+function getCaseList(val){
+  post(api.getQcCasesAll,{inputStr:val=="全部"?"":val||""}).then(res =>{
+	if(res.data.code == '0'){
+	  const caseList = res.data.data||[]
+	  renderCaseList(caseList)
+	}else{
+	  renderCaseList([])
+	}
+  }).catch((e) =>{
+
+  })
+}
+
+//模块下拉框
+function renderCaseList(caseList){
+  if(caseList.length == 0){
+	$('.caseList').html("")
+	return
+  }
+  let str = `<li class="caseItem " data-id="" data-name="全部">全部</li>`
+  for(let i = 0; i < caseList.length; i++){
+	str += `<li class="caseItem ellipsis" title=${caseList[i].name} data-id=${caseList[i].id} data-name=${caseList[i].name}> ${caseList[i].name}</li>`
+  }
+  $('.caseList').html(str)
+  bindCaseSelect()
+}
+//模块选择
+function bindCaseSelect(){
+  $('.caseItem').on("click",function(){
+	const caseItemName = $(this).attr("data-name")
+	const caseItemId = $(this).attr("data-id")
+	caseNameTemp=caseItemName=="全部"?"":caseItemName;
+	caseIdTemp =caseItemId||''
+	$('.selectCase').text(caseItemName)
+	$('.selectCase ').attr('title',caseItemName)
+	$(".caseList").css("display", "none")
+  })
+  //下拉显示
+  $('.selectCase').on("click", function(e){
+	e.stopPropagation()
+	if($(".caseList:visible").length){
+	  $(".caseList").css("display","none")
+	  $(".selectCase .arrow").attr("src",iconDown)
+	}else{
+	  $(".caseList").css("display","block")
+	  $(".selectCase .arrow").attr("src",iconUp)
+	}
+
+  })
+}
+//科室下拉
 function getDeptList(val){
     post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
         if(res.data.code == '0'){