Bladeren bron

bug474,导出时间不关查询

zhouna 3 jaren geleden
bovenliggende
commit
640b2917ad
2 gewijzigde bestanden met toevoegingen van 23 en 4 verwijderingen
  1. 22 3
      src/js/dept/improveStatisticsDept.js
  2. 1 1
      src/js/utils.js

+ 22 - 3
src/js/dept/improveStatisticsDept.js

@@ -58,13 +58,30 @@ $(function() {
 
   //导出事件绑定
   $('.export').click(function(){
-	const param = getFilterParam();
-	if(param.startDate > param.endDate){
+	//const param = getFilterParam();
+	const startDate = getPickerDate($("#datepicker"),1);
+	const endDate = getPickerDate($("#datepicker2"),2);
+	const param = {
+	  "isPlacefile":isPlacefile,
+	  "deptId": deptNameTemp=="全部"?"":deptIdTemp||"", //科室id
+	  "casesName": caseNameTemp,
+	  "entryName":$("#entryName").val(),
+	  "deptName": deptNameTemp=="全部"?"":deptNameTemp||"",
+	  "asc":"",     //升序
+	  "desc":"",       //降序
+	  "startDate":startDate,
+	  "endDate":endDate,
+	  "doctorName":$("#doctorName").val(),
+	  "doctorId":$("#doctorId").val(),
+	  current:1,
+	  size:500
+	};
+	if(startDate > endDate){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
 	expJson(api.getEntryDefectImproveByDeptExport,param).then(res =>{
-	  downloadExportedData(res.data,"条目缺陷改善统计(科室)"+startDateParam.substr(0,10).replace(/\//g,'')+"-"+endDateParam.substr(0,10).replace(/\//g,'')+".xls");
+	  downloadExportedData(res.data,"条目缺陷改善统计(科室)"+startDate.substr(0,10).replace(/\//g,'')+"-"+endDate.substr(0,10).replace(/\//g,'')+".xls");
 	})
   })
   //给每一个标题绑定一个排序事件
@@ -88,6 +105,8 @@ $(function() {
 	data_desc="totalNum"
 	data_asc=""
 	setDatePicker($("#datepicker"),$("#datepicker2"),2);
+	startDateParam=getPickerDate($("#datepicker"),1)
+	endDateParam=getPickerDate($("#datepicker2"),2)
 	$("#entryName,#doctorId,#doctorName").val("");
 	$("th[code]").removeClass("desc asc");
 	$("th[code='totalNum']").addClass("desc");

+ 1 - 1
src/js/utils.js

@@ -614,7 +614,7 @@ function setDatePicker(picker1, picker2, mode, startDateDefault, endDateDefault)
   }
 }
 
-//mode=1获取开始时间,mode=1获取结束时间
+//mode=1获取开始时间,mode=2获取结束时间
 function getPickerDate(picker, mode) {
   if (!picker) {
     return;