소스 검색

数据报表明细默认时间设为1周

zhangxc 5 년 전
부모
커밋
3efbcbed39
6개의 변경된 파일52개의 추가작업 그리고 30개의 파일을 삭제
  1. 11 7
      src/js/deptScoreDetailControl.js
  2. 6 4
      src/js/jiaji.js
  3. 11 6
      src/js/mukuaiControl.js
  4. 5 3
      src/js/partDetailControl.js
  5. 12 5
      src/js/quexianDetailControl.js
  6. 7 5
      src/js/singleVeto.js

+ 11 - 7
src/js/deptScoreDetailControl.js

@@ -15,11 +15,11 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,deptType = "",
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",deptType = "",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[],hospital=getCookie("hospital");
   let srcUrl = $("#contentIframe",parent.document).attr("src")
-  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"2"
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
   deptType = getUrlArgObjectNew("deptType",srcUrl)||""
   let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
   let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
@@ -50,12 +50,14 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
       setDatePicker($("#datepicker"),$("#datepicker2"),2)
   }else if(statisticsType == 3){
     setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+  }else{
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
   }
   if(!statisticsType){
-     setDatePicker($("#datepicker"),$("#datepicker2"),2)
+     setDatePicker($("#datepicker"),$("#datepicker2"),"default")
   }
 $(".abnormalClear").click(function(){
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     behospitalCode=behospitalCodeTemp = ""
     deptId =deptIdTemp= ""
     $(".selectDept").attr({'title':"全部",'data-id':''}).html("全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -129,7 +131,7 @@ function getTabData(activePage){
         "desc": "",
         "name": behospitalCode||"",
         "deptClass": deptId||'',
-        "type": statisticsType||2, //1-本月,2-本年
+        "type": 0, //1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
@@ -142,6 +144,8 @@ function getTabData(activePage){
     }else{
         return
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(url,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
@@ -215,14 +219,14 @@ function renderTab(data,hisId,activePage){
     $(".goHomeDetailQuexian").click(function(){
         let deptName = $(this).attr("data-dept")
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian="+statisticsType)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
     $(".goHomeDetailB").click(function(){
         let deptName = $(this).attr("data-dept")
         let deptC = $(this).attr("data-c")
         let deptIds = $(this).attr("dept-id")
         focusMenuItem("YH-BLZK-ZKPF");
-        $(parent.document).find("#contentIframe").attr("src","qcList.html?deptName="+deptName+"&from=2"+"&shijian="+statisticsType+"&chengdu="+deptC+"&deptId="+deptIds)
+        $(parent.document).find("#contentIframe").attr("src","qcList.html?deptName="+deptName+"&from=2"+"&shijian=3&chengdu="+deptC+"&deptId="+deptIds+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

+ 6 - 4
src/js/jiaji.js

@@ -17,7 +17,7 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -32,7 +32,7 @@ if(statisticsType == 1){
         backgroundColor:'#fff'
     })
     setDatePicker($("#datepicker"),$("#datepicker2"),1)
-}else{
+}else if(statisticsType == 2){
     $(".monthYear .year").css({
         backgroundColor:'#00A1FF',
         color:'#fff'
@@ -41,10 +41,12 @@ if(statisticsType == 1){
         backgroundColor:'#fff'
     })
     setDatePicker($("#datepicker"),$("#datepicker2"),2)
+} else{
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
 }
 $(".abnormalClear").click(function(){
     behospitalCode =behospitalCodeTemp= ""
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     getTabData(1)
 })
@@ -121,7 +123,7 @@ function getTabData(activePage){
         current:activePage,
         size: 15,
         name: behospitalCode||"",
-        type: statisticsType||2, //1-本月,2-本年
+        type: 0, //1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
         dateType: level||"",//(3-上月,4-去年本月,5-去年(必填))
         "startDate":dateStatrt,
         "endDate":dateEnd

+ 11 - 6
src/js/mukuaiControl.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percentStr']    
+let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percentStr'],startDateParam="", endDateParam=""   
 
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -23,7 +23,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||"2"
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     name =nameTemp = getUrlArgObjectNew("name",srcUrl)||""
     let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
@@ -39,7 +39,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name=nameTemp = ""
         data_asc=[],
         data_desc=['percentStr']
@@ -69,9 +69,12 @@ $(function(){
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
     } else if(isReject == 3){
         setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     if(!isReject){
-        setDatePicker($("#datepicker"),$("#datepicker2"),2)
+        console.log("isRejectisRejectisReject")
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     getTabData(1)//条目缺陷
 })
@@ -195,7 +198,7 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0,
         name: name, //条目名
         deptName: deptId, //科室名
         size: 15,
@@ -204,6 +207,8 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam=dateStatrt
+    endDateParam=dateEnd
     post(from == 1?api.entryCountGroupByCasePage:api.entryCountGroupByCaseAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
@@ -298,7 +303,7 @@ function renderTab(data,activePage){
         let model = $(this).attr("data-model")
         focusMenuItem("YH-ZKK-TMQXZB_XQ");
         // $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptName+"&from=1&casesId=243"+"&shijian="+statisticsType+"&ruleType="+ruleType)
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&model="+model+"&shijian="+isReject)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&model="+model+"&shijian=3&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

+ 5 - 3
src/js/partDetailControl.js

@@ -14,7 +14,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc="",data_asc="";
   let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -48,6 +48,8 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
       setDatePicker($("#datepicker"),$("#datepicker2"),2)
   }else if(statisticsType == 3){
     setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+  }else{
+    setDatePicker($("#datepicker"),$("#datepicker2"),'default')
   }
   if(!statisticsType){
     setDatePicker($("#datepicker"),$("#datepicker2"),'default')
@@ -55,7 +57,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
 $(".abnormalClear").click(function(){
     data_desc=""
     data_asc=""
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     behospitalCode =behospitalCodeTemp= ""
     getTabData(1)
@@ -125,7 +127,7 @@ function getTabData(activePage){
         "name": behospitalCode||"",
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
-        "type": statisticsType||2, //1-本月,2-本年
+        "type": 0, //1-本月,2-本年,0-自定义时间(现在所有都是自定义时间,都会传开始日期和结束日期)
         "startDate":dateStatrt,
         "endDate":dateEnd
     }

+ 12 - 5
src/js/quexianDetailControl.js

@@ -11,7 +11,7 @@ const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
-let casesId="", name="", isReject ="2",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -23,8 +23,10 @@ $(function(){
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     deptId = deptIdTemp = getUrlArgObjectNew("caseName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
-    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||"2"
+    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(isReject == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -34,7 +36,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -43,6 +45,11 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),'default')
     }
     $(".selectDepts").html(deptName)
     // if(from == 1){
@@ -62,7 +69,7 @@ $(function(){
     getTabData(1)//条目缺陷
     
     $(".abnormalClear").click(function(){
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name =nameTemp= ""
         deptId = deptIdTemp = ""
         $(".selectDept").html("全部").attr("data-id","").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -156,7 +163,7 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0,//1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
         name: name, //条目名
         doctorName:"",
         casesName:deptId,

+ 7 - 5
src/js/singleVeto.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
+let casesId="", name="", isReject ="",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -22,7 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    isRejectTemp = isReject = getUrlArgObjectNew("shijian",srcUrl)||"2"
+    isRejectTemp = isReject = getUrlArgObjectNew("shijian",srcUrl)||""
     selectReject = getUrlArgObjectNew("selectReject",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     special = getUrlArgObjectNew("special",srcUrl)||""
@@ -59,7 +59,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         $(".selectModuleType").html("全部")
         $(".selectReject").html("全部")
         $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -92,9 +92,11 @@ $(function(){
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }else if(isReject == 3){
         setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     if(!isReject){
-        setDatePicker($("#datepicker"),$("#datepicker2"),2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
       }
     getTabData(1)//条目缺陷
 })
@@ -157,7 +159,7 @@ function getTabData(activePage){
     endDateParam=dateEnd
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0,
         casesId:casesId, //模块Id
         casesName:casesName=='全部'?'':casesName, //模块Id
         isReject:isSingleReject, //是否单项否决