Sfoglia il codice sorgente

使用统计重置。。

zhouna 3 anni fa
parent
commit
f833bb6f8f

+ 1 - 1
src/js/dataAnalysis/useStatistics.js

@@ -39,7 +39,7 @@ $(function() {
 	$(this).parent().find("input").focus()
   })
   //日期默认当年
-  setDatePicker($("#datepicker"), $("#datepicker2"), 1);
+  setDatePicker($("#datepicker"), $("#datepicker2"), 2);
   startDateParam=getPickerDate($("#datepicker"),1)
   endDateParam=getPickerDate($("#datepicker2"),2)
   //初始列表数据获取

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

@@ -219,7 +219,7 @@ function renderTab(data,hisId,activePage){
   })
 }
 function getDeptList(val){
-  post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
+  post(api.getDept,{inputStr:val=="全部"?"":val||""}).then(res =>{
 	if(res.data.code == '0'){
 	  const deptList = res.data.data||[]
 	  rendeDeptList(deptList)

+ 4 - 61
src/js/dept/useStatisticsDept.js

@@ -5,15 +5,12 @@ 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,getUrlArgObjectNew,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 arrowLeft= require("../../images/arrow_left.png")
 
 const arrowRight = require("../../images/arrow_right.png");
-$(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
 let isPlacefile = getCookie('isPlacefile')||1
 
@@ -28,8 +25,6 @@ let endDateParam = getUrlArgObjectNew("endDate",srcUrl)||""
 $(function() {
   const  iconCalenBlue= require("../../images/icon_calen_blue.png")
   const  iconCalenGrey= require("../../images/icon_calen_grey.png")
-  //获取科室列表
-  //getDeptList()
   //日期控件事件绑定
   $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
   $('.iconCalen').on("mouseenter", function(e){
@@ -90,17 +85,15 @@ $(function() {
   $(".abnormalClear").click(function(){
 	data_desc=[]
 	data_asc=[]
-	setDatePicker($("#datepicker"),$("#datepicker2"),"default");
+	setDatePicker($("#datepicker"),$("#datepicker2"),"",startDateParam,endDateParam);
 	$("#doctorNum,#doctorName").val("");
 	$("th[code]").removeClass("desc asc");
 	behospitalCode =behospitalCodeTemp= ""
-	deptName = deptNameTemp = ""
-	deptId = deptIdTemp = ""
+	deptName = deptNameTemp = deptNameParam
+	deptId = deptIdTemp = deptIdParam
 	doctorId = "";
 	doctorName = "";
-	$(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
 	getTabData(1)
-	getDeptList()
   })
 
 //查询
@@ -190,57 +183,7 @@ function renderTab(data,hisId,activePage){
   }
   $('.tbody').html(str?str:emptyBox())
 }
-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 " 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>`
-  }
-  $('.deptList').html(str)
-  bindDeptSelect()
-}
-//科室选择
-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)
-  })
-}
 /*function loading(){
     const str = `
     <div class="loadingBox">