时间选择问题

src/js/dataAnalysis/improveStatistics.js

@@ -52,7 +52,7 @@ $(function() {
   //导出事件绑定
   $('.export').click(function(){
 	const param = getFilterParam();
-	if(param.start > param.end){
+	if(param.startDate > param.endDate){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
@@ -96,8 +96,12 @@ $(function() {
 
 //查询
   $(".filter").on("click", function(e){
-	startDateParam=getPickerDate($("#datepicker"),1)
-	endDateParam=getPickerDate($("#datepicker2"),2)
+	let startDate=getPickerDate($("#datepicker"),1)
+	let endDate=getPickerDate($("#datepicker2"),2)
+	if(startDate > endDate){
+	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+	  return
+	}
 	deptId = deptIdTemp;
 	deptName = deptNameTemp;
 	caseName =caseNameTemp;
@@ -114,6 +118,8 @@ $(function() {
 });
 
 function getFilterParam(current){
+  let startDate=getPickerDate($("#datepicker"),1)
+  let endDate=getPickerDate($("#datepicker2"),2)
   const param = {
 	"isPlacefile":isPlacefile,
 	//"deptId": deptName=="全部"?"":deptId||"", //科室id
@@ -122,8 +128,8 @@ function getFilterParam(current){
 	"deptName": deptName=="全部"?"":deptName||"",
 	"asc":data_asc,     //升序
 	"desc":data_desc,       //降序
-	"startDate":startDateParam,
-	"endDate":endDateParam,
+	"startDate":startDate,
+	"endDate":endDate,
 	current,
 	size:15
   }

src/js/dataAnalysis/useStatistics.js

@@ -93,6 +93,10 @@ $(function() {
 	deptName = deptNameTemp
 	startDateParam=getPickerDate($("#datepicker"),1)
 	endDateParam=getPickerDate($("#datepicker2"),2)
+	if(startDateParam > endDateParam){
+	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+	  return
+	}
 	if(deptName == ""){
 	  $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
 

src/js/dept/improveStatisticsDept.js

@@ -59,7 +59,7 @@ $(function() {
   //导出事件绑定
   $('.export').click(function(){
 	const param = getFilterParam();
-	if(param.start > param.end){
+	if(param.startDate > param.endDate){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
@@ -157,7 +157,7 @@ function getFilterParam(current){
 }*/
 function getTabData(activePage){
   const param=getFilterParam(activePage);
-  if(param.start > param.end){
+  if(param.startDate > param.endDate){
 	$.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	console.log('开始时间',dateStatrt)
 	return

src/js/dept/useStatisticsDept.js

@@ -57,7 +57,7 @@ $(function() {
   //导出事件绑定
   $('.export').click(function(){
 	const param = getFilterParam();
-	if(param.start > param.end){
+	if(param.startDate > param.endDate){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
@@ -98,8 +98,12 @@ $(function() {
 
 //查询
   $(".filter").on("click", function(e){
-	startDateParam=getPickerDate($("#datepicker"),1)
-	endDateParam=getPickerDate($("#datepicker2"),2)
+	let startDate=getPickerDate($("#datepicker"),1)
+	let endDate=getPickerDate($("#datepicker2"),2)
+	if(startDate > endDate){
+	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+	  return
+	}
 	deptId = deptIdTemp;
 	deptName = deptNameTemp;
 	doctorId = $("#doctorNum").val().trim();
@@ -109,6 +113,8 @@ $(function() {
 });
 
 function getFilterParam(current){
+  let startDate=getPickerDate($("#datepicker"),1)
+  let endDate=getPickerDate($("#datepicker2"),2)
   const param = {
 	"isPlacefile":isPlacefile,
 	"deptId": deptId=="null"?"":deptId||"", //科室id
@@ -117,8 +123,8 @@ function getFilterParam(current){
     "doctorName":doctorName,
 	"asc":data_asc,     //升序
 	"desc":data_desc,       //降序
-	"startDate":startDateParam,
-	"endDate":endDateParam,
+	"startDate":startDate,
+	"endDate":endDate,
 	current,
 	size:15
   }