Merge branch 'test'

src/css/qcScore.less

@@ -801,4 +801,10 @@
     width: 100%;
     box-sizing: border-box;
   }
+}
+.modal .modal-footer a.cancel{
+  display: none;
+  color: #FF4D4F;
+  border-color: #FF4D4F;
+  margin-right: 16px;
 }

src/html/qcScore.html

@@ -326,8 +326,8 @@
                 <!--<p>确定要删除该评分记录吗？</p>-->
             </div>
             <div class="modal-footer">
+                <a class="close cancel" href="javascript:void(0);">取消</a>
                 <a class="confirm" href="javascript:void(0);">保存</a>
-                <!--<a class="close cancel" href="javascript:void(0);">取消</a>-->
             </div>
         </div>
     </div>

src/js/console.js

@@ -13,7 +13,7 @@ require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData} = require('../js/utils.js');
 const { get } = require('jquery');
-let payMoney = [],behosDateStart="",behosDateEnd="",dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="合格率",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
+let payMoney = [],behosDateStart="",ownSelectDate='',behosDateEnd="",dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="合格率",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
 
 $(function(){
     if(!hasData('YH-KZT')){
@@ -206,7 +206,8 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 1
-            dateConsole(1,1)
+            ownSelectDate = ''
+            dateConsole(1,true)
         })
         $(".monthYear .year").click(function(){
             $(this).css({
@@ -219,7 +220,8 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 2
-            dateConsole(2,1)
+            ownSelectDate = ''
+            dateConsole(2,true)
         })
     }
 
@@ -410,6 +412,7 @@ function getBarData(type){
     //         }
     //     })
     // }
+    console.log(behosDateStart,45455555555555)
     if(hasData('FUNC000049')){
         post(api.leaveHosCount,{//出院人数统计
             "type": type||1,//1月2年
@@ -1700,11 +1703,9 @@ $(".sureDate").click(function(){
     if(!getStaticDate()){
         return
     }
-    setCookieAction(behosDateStart.split(" ")[0],behosDateEnd.split(" ")[0])
-    getAverageScoreLis()
-    getBarData(dateType)
-    getEveryDeptLevel()
-    getHomeData('firstLevelPercent')
+    let dateStartI = behosDateStart.split(" ")[0]
+    let dateEndI = behosDateEnd.split(" ")[0]
+    setCookieAction(dateStartI,dateEndI)
     $(".monthYear .year").css({
         "border-color":'#A5ADBF',
         color:'#A5ADBF',
@@ -1715,8 +1716,12 @@ $(".sureDate").click(function(){
         color:'#A5ADBF',
         backgroundColor:'#203463'
     })
-    dateType = 3
-    getDetails(dateType)
+    ownSelectDate = 3
+    getBarData(dateType)
+    getAverageScoreLis()
+    getEveryDeptLevel()
+    getHomeData('firstLevelPercent')
+    getDetails(ownSelectDate||dateType)
 })
 //日期联动
 function dateConsole(dateType,flg){
@@ -1730,11 +1735,10 @@ function dateConsole(dateType,flg){
     } else {
         startDate = "-6d"
     }
-    getBarData(dateType)
     if(getCookie("behosDateStart")&&!flg){
         startDate = new Date(getCookie("behosDateStart"))
         endDate = new Date(getCookie("behosDateEnd"))
-        dateType = 3
+        ownSelectDate = 3
         $(".monthYear .year").css({
             "border-color":'#A5ADBF',
             color:'#A5ADBF',
@@ -1746,7 +1750,7 @@ function dateConsole(dateType,flg){
             backgroundColor:'#203463'
         })
     }
-    getDetails(dateType)
+    getDetails(ownSelectDate||dateType)
     $( "#datepicker" ).datepicker({
         yearRange: "2015:"+year,
         changeMonth: true,
@@ -1760,9 +1764,6 @@ function dateConsole(dateType,flg){
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate",endDate);
     getStaticDate(flg)
-    getAverageScoreLis()
-    getHomeData('firstLevelPercent')
-    getEveryDeptLevel()
 }
 function setCookieAction(startDate,endDate){
     setCookie('behosDateStart',startDate)
@@ -1786,6 +1787,11 @@ function getStaticDate(flg){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
+    getBarData(dateType)
+    getHomeData('firstLevelPercent')
+    getAverageScoreLis()
+    getEveryDeptLevel()
+    console.log(behosDateStart,behosDateEnd,898989898)
     return true
 }
 $(function() {

src/js/deptConsole.js

@@ -11,7 +11,7 @@ const echarts = require('echarts');
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData } = require('../js/utils.js');
-let payMoney = [],behosDateStart="",behosDateEnd="",dayLis = [],dateType = 2,curDept = '',curDeptId='',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
+let payMoney = [],behosDateStart="",behosDateEnd="",ownSelectDate='',dayLis = [],dateType = 2,curDept = '',curDeptId='',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
 $(function(){
     if(!hasData('YH-KZT')&&!hasData('YH-KZTKS')){
         $("body").html('')
@@ -104,6 +104,7 @@ function dateChange(){
             backgroundColor:'#203463'
         })
         dateType = 1
+        ownSelectDate = ''
         dateConsole(1,1)
     })
     $(".monthYear .year").click(function(){
@@ -117,6 +118,7 @@ function dateChange(){
             backgroundColor:'#203463'
         })
         dateType = 2
+        ownSelectDate = ''
         dateConsole(2,1)
     })
 }
@@ -822,9 +824,6 @@ $(".sureDate").click(function(){
     if(!getStaticDate()){
         return
     }
-    setCookieAction(behosDateStart.split(" ")[0],behosDateEnd.split(" ")[0])
-    getBarData(dateType)
-    dateType = 3
     $(".monthYear .year").css({
         "border-color":'#A5ADBF',
         color:'#A5ADBF',
@@ -835,7 +834,10 @@ $(".sureDate").click(function(){
         color:'#A5ADBF',
         backgroundColor:'#203463'
     })
-    tiaomu(dateType)
+    setCookieAction(behosDateStart.split(" ")[0],behosDateEnd.split(" ")[0])
+    ownSelectDate = 3
+    getBarData(dateType)
+    tiaomu(ownSelectDate||dateType)
 })
 //日期联动
 function dateConsole(dateType,flg){
@@ -850,7 +852,7 @@ function dateConsole(dateType,flg){
         startDate = "-1m"
     }
     if(getCookie("behosDateStart")&&!flg){
-        dateType = 3
+        ownSelectDate = 3
         startDate = new Date(getCookie("behosDateStart"))
         endDate = new Date(getCookie("behosDateEnd"))
         $(".monthYear .year").css({
@@ -863,8 +865,6 @@ function dateConsole(dateType,flg){
             color:'#A5ADBF',
             backgroundColor:'#203463'
         })
-    }else{
-        getBarData(dateType)
     }
     $( "#datepicker" ).datepicker({
         yearRange: "2015:"+year,
@@ -879,7 +879,7 @@ function dateConsole(dateType,flg){
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate",endDate);
     getStaticDate(flg)
-    tiaomu(dateType)
+    tiaomu(ownSelectDate||dateType)
 }
 function setCookieAction(startDate,endDate){
     setCookie('behosDateStart',startDate)
@@ -907,6 +907,8 @@ function getStaticDate(flg){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
+    
+    getBarData(dateType)
     return true
 }
 $(function() {

src/js/qcScore.js

@@ -310,6 +310,7 @@ function addScore(info){
 function showModal(flag,code,i){
   $("#delModal .modal-body").html("");
   $("#delModal").show();
+  $("#delModal .cancel").hide();
   $(".info-item .cont,.flaw-item .title,td").removeClass("active");
   //事件解绑
   $("#delModal .confirm").off("click");
@@ -391,9 +392,9 @@ function showModal(flag,code,i){
     });
   }else{
     $("#delModal .title").text("删除评分");
-    $("#delModal .confirm").text("确定");
+    $("#delModal .cancel").show();
     $("#delModal .modal-body").html('<p>确定要删除该评分记录吗？</p>');
-    $("#delModal .confirm").click(function(){
+    $("#delModal .confirm").text("确定").click(function(){
       delScore(code,info);
     });
   }