|
@@ -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
|
|
|
}
|