导出时间等bug

src/html/dept/statisticsDetailDept.html

@@ -50,11 +50,11 @@
                     </span>
                 <span class="filterItem doctorFilter">
                         <span>医生姓名：</span>
-                        <input class="doctorInp" type="text" placeholder="请输入医生姓名" disabled>
+                        <input class="doctorInp" type="text" disabled>
                     </span>
                 <span class="filterItem doctorFilter">
                         <span>医生工号：</span>
-                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号" disabled>
+                        <input class="doctorNumInp" type="text" disabled>
                     </span>
             </div>
         </div>

src/js/dataAnalysis/improveStatistics.js

@@ -19,8 +19,8 @@ let isPlacefile = getCookie('isPlacefile')||1
 
 let deptName="",deptNameTemp="",caseName="",caseNameTemp="", behospitalCode="", behospitalCodeTemp="",deptId="",deptIdTemp="",caseId="",caseIdTemp="",entryName='',entryNameTemp='',
   data_desc="totalNum",data_asc="";
-  let startDateParam = ""
-  let endDateParam = ""
+  let startDate="",startDateTemp = "";
+  let endDate="",endDateTemp = "";
 
 $(function() {
   const  iconCalenBlue= require("../../images/icon_calen_blue.png")
@@ -45,19 +45,32 @@ $(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.startDate > param.endDate){
+	startDateTemp=getPickerDate($("#datepicker"),1)
+	endDateTemp=getPickerDate($("#datepicker2"),2)
+    const param={
+	  //"deptId": deptName=="全部"?"":deptId||"", //科室id
+	  "casesName": caseNameTemp,
+	  "entryName":entryNameTemp,
+	  "deptName": deptNameTemp=="全部"?"":deptNameTemp||"",
+	  "asc":"",     //升序
+	  "desc":"",       //降序
+	  "startDate":startDateTemp,
+	  "endDate":endDateTemp,
+	  current:1,
+	  size:500
+	};
+	if(startDateTemp > endDateTemp){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
 	expJson(api.getEntryDefectImproveByExport,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");
 	})
   })
   //给每一个标题绑定一个排序事件
@@ -81,6 +94,8 @@ $(function() {
 	data_desc="totalNum"
 	data_asc=""
 	setDatePicker($("#datepicker"),$("#datepicker2"),"default");
+	startDate=startDateTemp=getPickerDate($("#datepicker"),1)
+	endDate=endDateTemp=getPickerDate($("#datepicker2"),2)
 	$("#entryName").val("");
 	$("th[code]").removeClass("desc asc");
 	$("th[code='totalNum']").addClass("desc");
@@ -92,13 +107,13 @@ $(function() {
 	$(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
 	$(".selectCase").attr({'title':"全部",'data-id':''}).val("全部")
 	getTabData(1)
-	getDeptList()
+	//getDeptList()
   })
 
 //查询
   $(".filter").on("click", function(e){
-	let startDate=getPickerDate($("#datepicker"),1)
-	let endDate=getPickerDate($("#datepicker2"),2)
+	startDate=getPickerDate($("#datepicker"),1)
+	endDate=getPickerDate($("#datepicker2"),2)
 	if(startDate > endDate){
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
@@ -119,8 +134,6 @@ $(function() {
 });
 
 function getFilterParam(current){
-  let startDate=getPickerDate($("#datepicker"),1)
-  let endDate=getPickerDate($("#datepicker2"),2)
   const param = {
 	"isPlacefile":isPlacefile,
 	//"deptId": deptName=="全部"?"":deptId||"", //科室id
@@ -202,7 +215,7 @@ function renderTab(data,hisId,activePage){
         let deptName = $(this).parents("tr").attr("data-dept")
         let deptId = $(this).parents("tr").attr("data-deptid")
 	  	let typeMark = $(this).attr("data-type")
-        $(parent.document).find("#contentIframe").attr("src", "statisticsDetail.html?deptName=" + deptName + "&deptId=" + deptId + "&casesId=" + casesId+"&defectName="+casesName+"&typeMark="+typeMark+"&startDate="+startDateParam+"&endDate="+endDateParam)
+        $(parent.document).find("#contentIframe").attr("src", "statisticsDetail.html?deptName=" + deptName + "&deptId=" + deptId + "&casesId=" + casesId+"&defectName="+casesName+"&typeMark="+typeMark+"&startDate="+startDate+"&endDate="+endDate)
     })
 }
 //模块下拉