Merge branch 'v1.3.3' into byll

src/html/partDetailControl.html

@@ -36,6 +36,12 @@
                         <li class="deptItem ellipsis" title="不合格" data-id="不合格" data-name="不合格">不合格</li>
                     </ul>
                 </span> -->
+                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/js/partDetailControl.js

@@ -2,7 +2,8 @@ const $ = require('jquery');
 require("../css/partDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,setTitleTxt} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setTitleTxt,setDatePicker,
+    getPickerDate} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -14,7 +15,7 @@ const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
-
+setDatePicker($("#datepicker"),$("#datepicker2"),2)
 $(".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,
@@ -78,6 +79,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","block")
         $(".dayDetail .dayFilter").css("display","none")
         statisticsType = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -91,6 +93,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","none")
         $(".dayDetail .dayFilter").css("display","block")
         statisticsType = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }

src/js/utils.js

@@ -332,6 +332,7 @@ function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
     isRTL: false};
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
     let startDate = "", endDate=new Date()
+   
     let year = new Date().getFullYear()
     let month = new Date().getMonth() + 1
     if(mode == '1'){
@@ -342,16 +343,22 @@ function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
         startDate = startDateDefault || new Date()
         endDate = endDateDefault || new Date()
     }
-    picker1.datepicker({
+    console.log('endDate',endDate)
+    if(picker1){
+      picker1.datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
     }).datepicker( "setDate", startDate);
-    picker2.datepicker({
+    }
+    if(picker2){
+      picker2.datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate",endDate);
+      }).datepicker( "setDate",endDate); 
+    }
+    
 }
 
   //mode=1获取开始时间，mode=1获取结束时间