Browse Source

模块名称改可输入下拉

zhouna 3 years ago
parent
commit
9efdd7ea4c

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

@@ -34,7 +34,7 @@
                 </span>
                 <span class="filterItem">
                     <span>模块名称:</span>
-                    <span class="selectCase canEditDept">全部</span>
+                    <input type="text" class="selectCase canEditDept" value="全部">
                     <ul class="caseList filterDropList"></ul>
                 </span>
                 <span class="filterItem typeFilter clearfix dataSelectLight">

+ 1 - 1
src/html/dept/improveStatisticsDept.html

@@ -34,7 +34,7 @@
                 </span>
                 <span class="filterItem">
                     <span>模块名称:</span>
-                    <span class="selectCase canEditDept">全部</span>
+                    <input type="text" class="selectCase canEditDept" value="全部">
                     <ul class="caseList filterDropList"></ul>
                 </span>
                 <span class="filterItem typeFilter">

+ 49 - 37
src/js/dataAnalysis/improveStatistics.js

@@ -13,7 +13,7 @@ const iconUp = require("../../images/arrow_up.png")
 const arrowLeft= require("../../images/arrow_left.png")
 
 const arrowRight = require("../../images/arrow_right.png");
-$(".selectCase").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+//$(".selectCase").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
 let isPlacefile = getCookie('isPlacefile')||1
 
@@ -39,6 +39,10 @@ $(function() {
   $('.iconCalen').on("click", function(e){
 	$(this).parent().find("input").focus()
   })
+  $("#entryName").on("input", function(e){
+	const val = $(this).val().trim();
+	entryNameTemp = val
+  })
   //日期默认当年
   setDatePicker($("#datepicker"), $("#datepicker2"), 2);
   startDateParam=getPickerDate($("#datepicker"),1)
@@ -85,7 +89,7 @@ $(function() {
 	caseName=caseNameTemp="";
 	entryName=entryNameTemp="";
 	$(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
-	$(".selectCase").attr({'title':"全部",'data-id':''}).text("全部")
+	$(".selectCase").attr({'title':"全部",'data-id':''}).val("全部")
 	getTabData(1)
 	getDeptList()
   })
@@ -196,7 +200,7 @@ function renderTab(data,hisId,activePage){
 }
 //模块下拉
 function getCaseList(val){
-  post(api.getQcCasesAll,{inputStr:val=="全部"?"":val||""}).then(res =>{
+  post(api.getQcCasesAll,{casesName:val=="全部"?"":val||""}).then(res =>{
 	if(res.data.code == '0'){
 	  const caseList = res.data.data||[]
 	  renderCaseList(caseList)
@@ -223,26 +227,31 @@ function renderCaseList(caseList){
 }
 //模块选择
 function bindCaseSelect(){
-  $('.caseItem').on("click",function(){
+  $('.caseItem').on("mousedown",function(){
 	const caseItemName = $(this).attr("data-name")
 	const caseItemId = $(this).attr("data-id")
 	caseNameTemp=caseItemName=="全部"?"":caseItemName;
 	caseIdTemp =caseItemId||''
-	$('.selectCase').text(caseItemName)
+	$('.selectCase').val(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)
-	}
-
+  })
+  //科室下拉显示、选中事件
+  $('.selectCase').on("focus", function(e){
+	e.stopPropagation()
+	$(".caseList ").css("display","block")
+  })
+  $('.selectCase').on("blur", function(e){
+	$(".caseList ").css("display", "none")
+	$(".selectCase .arrow").attr("src",iconDown)
+  })
+  $('.selectCase').on("input", function(e){
+	let val = $(this).val().trim()
+	caseName = caseNameTemp = val
+	getCaseList(caseName)
   })
 }
 //科室下拉
@@ -273,29 +282,32 @@ function rendeDeptList(deptList){
 }
 //科室选择
 function bindDeptSelect(){
-    $('.deptItem').on("mousedown",function(){
-        const deptItemName = $(this).attr("data-name")
-        const deptItemId = $(this).attr("data-id")
-        deptNameTemp=deptItemName=="全部"?"":deptItemName;
-        deptIdTemp =deptItemId||''
-        $('.selectDept').val(deptItemName)
-        $('.selectDept ').attr('title',deptItemName)
-        $(".deptList").css("display", "none")
-    })
-  	//科室下拉显示、选中事件
-	$('.selectDept').on("focus", function(e){
-	  e.stopPropagation()
-	  $(".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)
-	})
+  $('.deptItem').on("mousedown",function(){
+	const deptItemName = $(this).attr("data-name")
+	const deptItemId = $(this).attr("data-id")
+	deptNameTemp=deptItemName=="全部"?"":deptItemName;
+	deptIdTemp =deptItemId||''
+	$('.selectDept').val(deptItemName)
+	$('.selectDept ').attr('title',deptItemName)
+	$(".deptList").css("display", "none")
+  })
+  $('.selectDept').on("click", function(e){
+	e.stopPropagation()
+  })
+  //科室下拉显示、选中事件
+  $('.selectDept').on("focus", function(e){
+	e.stopPropagation()
+	$(".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)
+  })
 }
 /*function loading(){
     const str = `

+ 19 - 18
src/js/dept/improveStatisticsDept.js

@@ -13,7 +13,7 @@ const loadingImg = require("../../images/loading.gif")
 const arrowLeft= require("../../images/arrow_left.png")
 
 const arrowRight = require("../../images/arrow_right.png");
-$(".selectCase").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+//$(".selectCase").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
 let isPlacefile = getCookie('isPlacefile')||1
 
@@ -39,10 +39,6 @@ $(function() {
   $('.iconCalen').on("click", function(e){
 	$(this).parent().find("input").focus()
   })
-  $("#casesName").on("input", function(e){
-	const val = $(this).val().trim()
-	caseNameTemp  = val
-  })
   $("#entryName").on("input", function(e){
 	const val = $(this).val().trim();
 	entryNameTemp = val
@@ -103,7 +99,7 @@ $(function() {
 	doctorId=doctorIdTemp=""
 	doctorName=doctorNameTemp=""
 	$(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
-	$(".selectCase").attr({'title':"全部",'data-id':''}).text("全部")
+	$(".selectCase").attr({'title':"全部",'data-id':''}).val("全部")
 	getTabData(1)
 	getDeptList()
   })
@@ -223,7 +219,7 @@ function renderTab(data,hisId,activePage){
 }
 //模块下拉
 function getCaseList(val){
-  post(api.getQcCasesAll,{inputStr:val=="全部"?"":val||""}).then(res =>{
+  post(api.getQcCasesAll,{casesName:val=="全部"?"":val||""}).then(res =>{
 	if(res.data.code == '0'){
 	  const caseList = res.data.data||[]
 	  renderCaseList(caseList)
@@ -250,26 +246,31 @@ function renderCaseList(caseList){
 }
 //模块选择
 function bindCaseSelect(){
-  $('.caseItem').on("click",function(){
+  $('.caseItem').on("mousedown",function(){
 	const caseItemName = $(this).attr("data-name")
 	const caseItemId = $(this).attr("data-id")
 	caseNameTemp=caseItemName=="全部"?"":caseItemName;
 	caseIdTemp =caseItemId||''
-	$('.selectCase').text(caseItemName)
+	$('.selectCase').val(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)
-	}
-
+  })
+  //科室下拉显示、选中事件
+  $('.selectCase').on("focus", function(e){
+	e.stopPropagation()
+	$(".caseList ").css("display","block")
+  })
+  $('.selectCase').on("blur", function(e){
+	$(".caseList ").css("display", "none")
+	$(".selectCase .arrow").attr("src",iconDown)
+  })
+  $('.selectCase').on("input", function(e){
+	let val = $(this).val().trim()
+	caseName = caseNameTemp = val
+	getCaseList(caseName)
   })
 }
 //科室下拉