zhouna 3 年 前
コミット
f8ae262f52

+ 2 - 2
src/js/dataAnalysis/improveStatistics.js

@@ -58,8 +58,8 @@ $(function() {
 	  "casesName": caseNameTemp,
 	  "entryName":entryNameTemp,
 	  "deptName": deptNameTemp=="全部"?"":deptNameTemp||"",
-	  "asc":"",     //升序
-	  "desc":"",       //降序
+	  "asc":data_asc,     //升序
+	  "desc":data_desc,       //降序
 	  "startDate":startDateTemp,
 	  "endDate":endDateTemp,
 	  current:1,

+ 2 - 2
src/js/dataAnalysis/useStatistics.js

@@ -50,8 +50,8 @@ $(function() {
 	endDateTemp=getPickerDate($("#datepicker2"),2);
 	const param = {
 	  "deptName": deptNameTemp=="全部"?"":deptNameTemp||"",
-	  "asc":"",     //升序
-	  "desc":"",       //降序
+	  "asc":data_asc,     //升序
+	  "desc":data_desc,       //降序
 	  "startDate":startDateTemp,
 	  "endDate":endDateTemp
 	};

+ 4 - 4
src/js/dept/improveStatisticsDept.js

@@ -67,8 +67,8 @@ $(function() {
 	  "casesName": caseNameTemp,
 	  "entryName":$("#entryName").val(),
 	  "deptName": deptNameTemp=="全部"?"":deptNameTemp||"",
-	  "asc":"",     //升序
-	  "desc":"",       //降序
+	  "asc":data_asc,     //升序
+	  "desc":data_desc,       //降序
 	  "startDate":startDate,
 	  "endDate":endDate,
 	  "doctorName":$("#doctorName").val(),
@@ -80,7 +80,7 @@ $(function() {
 	  $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
 	  return
 	}
-	expJson(api.getEntryDefectImproveByDeptExport,param).then(res =>{
+	expJson(api.getEntryDefectImproveByDeptExport,param,{noPlacefile:true}).then(res =>{
 	  downloadExportedData(res.data,"条目缺陷改善统计(科室)"+startDate.substr(0,10).replace(/\//g,'')+"-"+endDate.substr(0,10).replace(/\//g,'')+".xls");
 	})
   })
@@ -186,7 +186,7 @@ function getTabData(activePage){
   }
   $('.pagination').html("")
   $('.tbody').html(emptyBox('努力加载中...','',1))
-  post(api.getEntryDefectImproveDept,param).then(res =>{
+  post(api.getEntryDefectImproveDept,param,{noPlacefile:true}).then(res =>{
 	if(res.data.code == '0'){
 	  const data = res.data.data;
 	  const detail = data.records||[];

+ 4 - 4
src/js/dept/statisticsDetailDept.js

@@ -30,7 +30,7 @@ let currentPage;
 listenScroll()
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="",
 	nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="",  deptName="", deptNameTemp="",
-	data_desc="leaveHospitalDate",data_asc="";
+	data_desc="behospitalDate",data_asc="";
 //科室传参
 if(deptIdPram&&deptNamePram){
   deptId=deptIdTemp = deptIdPram
@@ -156,7 +156,7 @@ $(function() {
 	  desc:data_desc,       //降序
 	  size: 500,       //每页显示条数
 	};
-	expJson(api.getDefectImproveInnerByDeptExport , param).then(res => {
+	expJson(api.getDefectImproveInnerByDeptExport , param,{noPlacefile:true}).then(res => {
 	  downloadExportedData(res.data, '条目缺陷改善统计详情'+startDateParam.substr(0,10).replace(/\//g,'')+"-"+endDateParam.substr(0,10).replace(/\//g,'') + ".xls")
 	})
   })
@@ -195,7 +195,7 @@ function getTabData(activePage){
   }
   $('.pagination').html("")
   $('.tbody').html(emptyBox('努力加载中...','',1))
-  return post(api.getEntryDefectImproveInnerDept,param).then(res =>{
+  return post(api.getEntryDefectImproveInnerDept,param,{noPlacefile:true}).then(res =>{
 	if(res.data.code == '0'){
 	  const data = res.data.data;
 	  tabList = data.records;
@@ -215,7 +215,7 @@ function getTabData(activePage){
 }
 function getFilterParam(current){
   const param = {
-	"isPlacefile":isPlacefile,
+	//"isPlacefile":isPlacefile,
 	"deptId": deptName=="全部"?"":deptId||"", //科室id
 	"deptName": deptName=="全部"?"":deptName||"",
 	"asc":data_asc,     //升序

+ 1 - 1
src/js/utils.js

@@ -209,7 +209,7 @@ const post = function (url, data, opts) {
       cache: false,
       processData: false,
       data: (opts && opts.needqs) ? qs.stringify(data) : JSON.stringify(Object.assign({}, data, {
-        isPlacefile: isPlacefile
+        isPlacefile: (opts && opts.noPlacefile?undefined:isPlacefile)
       })),
       contentType: 'application/json; charset=UTF-8',
       beforeSend: function (xmlHttp) {