bug497

src/js/dataAnalysis/useStatistics.js

@@ -19,8 +19,8 @@ let isPlacefile = getCookie('isPlacefile')||1
 
 let deptName="",deptNameTemp="", behospitalCode="", behospitalCodeTemp="",deptId="",deptIdTemp="",
 	data_desc="totalModeNum",data_asc="";
-let startDateParam = "";
-let endDateParam = "";
+let startDate="",startDateTemp = "";
+let endDate="",endDateTemp = "";
 
 $(function() {
   const  iconCalenBlue= require("../../images/icon_calen_blue.png")
@@ -40,19 +40,27 @@ $(function() {
   })
   //日期默认当年
   setDatePicker($("#datepicker"), $("#datepicker2"), 2);
-  startDateParam=getPickerDate($("#datepicker"),1)
-  endDateParam=getPickerDate($("#datepicker2"),2)
+  startDate=startDateTemp=getPickerDate($("#datepicker"),1)
+  endDate=endDateTemp=getPickerDate($("#datepicker2"),2)
   //初始列表数据获取
   getTabData(1);
   //导出事件绑定
   $('.export').click(function(){
-	const param = getFilterParam();
-	if(param.start > param.end){
+	startDateTemp=getPickerDate($("#datepicker"),1);
+	endDateTemp=getPickerDate($("#datepicker2"),2);
+	const param = {
+	  "deptName": deptNameTemp=="全部"?"":deptNameTemp||"",
+	  "asc":"",     //升序
+	  "desc":"",       //降序
+	  "startDate":startDateTemp,
+	  "endDate":endDateTemp
+	};
+	if(startDateTemp > endDateTemp){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
 	expJson(api.getQcClickByExport,param).then(res =>{
-	  downloadExportedData(res.data,"临床质控使用统计"+startDateParam.substr(0,10).replace(/\//g,'')+"-"+endDateParam.substr(0,10).replace(/\//g,'')+".xls");
+	  downloadExportedData(res.data,"临床质控使用统计"+startDateTemp.substr(0,10).replace(/\//g,'')+"-"+endDateTemp.substr(0,10).replace(/\//g,'')+".xls");
 	})
   })
   //给每一个标题绑定一个排序事件
@@ -76,6 +84,8 @@ $(function() {
 	data_desc="totalModeNum"
 	data_asc=""
 	setDatePicker($("#datepicker"),$("#datepicker2"),"default");
+	startDate=getPickerDate($("#datepicker"),1);
+	endDate=getPickerDate($("#datepicker2"),2);
 	$("#casesName,#entryName").val("");
 	$("th[code]").removeClass("desc asc");
 	$("th[code='totalModeNum']").addClass("desc");
@@ -84,7 +94,7 @@ $(function() {
 	deptId = deptIdTemp = ""
 	$(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
 	getTabData(1)
-	getDeptList()
+	//getDeptList()
   })
 
 //查询
@@ -92,9 +102,9 @@ $(function() {
 	behospitalCode = behospitalCodeTemp
 	deptId = deptIdTemp
 	deptName = deptNameTemp
-	startDateParam=getPickerDate($("#datepicker"),1)
-	endDateParam=getPickerDate($("#datepicker2"),2)
-	if(startDateParam > endDateParam){
+	startDate=getPickerDate($("#datepicker"),1)
+	endDate=getPickerDate($("#datepicker2"),2)
+	if(startDate > endDate){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
@@ -113,8 +123,8 @@ function getFilterParam(){
 	"deptName": deptName=="全部"?"":deptName||"",
 	"asc":data_asc,     //升序
 	"desc":data_desc,       //降序
-	"startDate":startDateParam,
-	"endDate":endDateParam
+	"startDate":startDate,
+	"endDate":endDate
   }
   return param;
 }
@@ -181,7 +191,7 @@ function renderTab(data,hisId,activePage){
   $(".goHomeDetail").click(function(){
 	let deptName = $(this).parents("tr").attr("data-dept")
 	let deptId = $(this).parents("tr").attr("data-deptid")
-	$(parent.document).find("#contentIframe").attr("src", "useStatisticsDept.html?deptName=" + deptName + "&deptId=" + deptId+ "&startDate=" + startDateParam+ "&endDate=" + endDateParam)
+	$(parent.document).find("#contentIframe").attr("src", "useStatisticsDept.html?deptName=" + deptName + "&deptId=" + deptId+ "&startDate=" + startDate+ "&endDate=" + endDate)
   })
 }
 function getDeptList(val){