Merge branch 'byll' into test

src/css/dayDetail.less

@@ -39,7 +39,7 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px 50px 35px;
+        padding: 0 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }

src/css/deptScoreDetail.less

@@ -38,7 +38,7 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px 50px 35px;
+        padding: 0 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }

src/css/deptScoreDetailControl.less

@@ -37,7 +37,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        padding: 20px 35px 50px 35px;
+        padding: 20px 35px 0 35px;
         min-width: 1090px;
         box-sizing: border-box;
         /*width: 100%;*/

src/css/itemManager.less

@@ -16,7 +16,7 @@
     }
     .main-body{
         margin: 10px 40px;
-        padding-bottom: 50px;
+        padding-bottom: 0px !important;
     }
     table{
         .table;

src/css/jiaji.less

@@ -41,7 +41,7 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px 50px 35px;
+        padding: 0 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }

src/css/partDetail.less

@@ -41,7 +41,7 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px 50px 35px;
+        padding: 0 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }

src/css/partDetailControl.less

@@ -41,7 +41,7 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px 50px 35px;
+        padding: 0 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }

src/css/payDetail.less

@@ -42,7 +42,7 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px 50px 35px;
+        padding: 0 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }

src/css/qcList.less

@@ -13,7 +13,7 @@ h2{
 .main-body{
     margin: 10px 0;
     min-width: 1090px;
-    padding: 0 35px 50px 35px;
+    padding: 0 35px;
     // overflow: auto;
 }
 table{

src/css/qcListDept.less

@@ -12,7 +12,7 @@ h2{
 }
 .main-body{
     margin: 10px 0;    
-    padding: 0 35px 50px 35px;
+    padding: 0 35px;
     min-width: 1090px;
     /*width: 100%;*/
 }

src/css/qcListPerson.less

@@ -12,13 +12,18 @@ h2{
 }
 .main-body{
     margin: 10px 0;
-    padding: 0 35px 50px 35px;
+    padding: 0 35px;
     min-width: 1090px;
     /*width: 100%;*/
 }
 table{
     .table;
     min-width: 1090px;
+    border:1px solid #E2E5EF;
+    border-collapse: collapse;
+    thead th{
+        background: #EFF0F9;
+    }
     th,td{
         padding:5px 10px;
     }

src/css/quexianDetail.less

@@ -91,7 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
-        padding-bottom: 50px;
+        padding-bottom: 0px !important;
     }
     table{
         width: 100%;

src/css/quexianDetailControl.less

@@ -91,7 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
-        padding-bottom: 50px;
+        padding-bottom: 0px !important;
     }
     table{
         width: 100%;

src/css/tiaomu.less

@@ -91,7 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
-        padding-bottom: 50px;
+        padding-bottom: 0px !important;
     }
     table{
         .table;

src/js/console.js

@@ -26,6 +26,9 @@ $(function(){
     initConsole()//质控列表
     getBarData(2)//图标数据获取
     dateChange()
+    $(window).resize(function(){
+        resizeBox()
+    })
     $(window).click(function(){
         window.parent.userActionHide()
         $(".toggleSlide ul").css("display","none")
@@ -64,22 +67,33 @@ $(function(){
 function getDetails(){
     $(".part02 .bingli,.part02 .bingliLis,.part03 .circle .title,.pubEchartB.paymoney .title").click(function(){
       focusMenuItem("YH-ZKK-GKSQXZB_XQ");
+      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
     })
     $(".part03 .partTitlePub").click(function(){
-      hospital=="台州市立"?focusMenuItem("YH-ZKK-GKSJJBLZB_XQ"):focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
+        if(hospital=="台州市立"){
+            focusMenuItem("YH-ZKK-GKSJJBLZB_XQ")
+            $(parent.document).find("#contentIframe").attr("src","./jiaji.html?from=1&dateType="+dateType)
+        }else{
+            focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType)
+        }
     })
     $(".paymoney.pubEchart .title").click(function(){
         if($(this).text().indexOf("花费")!==-1){
-          focusMenuItem("YH-ZKK-KSPJZYHF_XQ");
+            focusMenuItem("YH-ZKK-KSPJZYHF_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./payDetail.html?from=1&dateType="+dateType)
         }else{
-          focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
+            focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./dayDetail.html?from=1&dateType="+dateType)
         }
     })
     $(".defect .partTitlePub").click(function(){//from 1 console / 2  deptConsole
         focusMenuItem("YH-ZKK-GMKQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./mukuaiControl.html?from=1&dateType="+dateType)
     })
     $(".circleB .title").click(function(){
-      focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./tiaomuControl.html?from=1&dateType="+dateType)
     })
 }
 

src/js/dayDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/dayDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,8 +20,27 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+
+if(statisticsType == 1){
+    $(".monthYear .mon").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}else{
+    $(".monthYear .year").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}
 $(".abnormalClear").click(function(){
-    // window.location.reload()
         behospitalCode = ""
         $(".patientNumInp").val("")
         getTabData(1)

src/js/deptConsole.js

@@ -51,9 +51,11 @@ function tiaomu(){
     });
     $(".homePage .title").click(function(){
         focusMenuItem("YH-KSZR-BASYHGLZB_XQ")
+        $(parent.document).find("#contentIframe").attr("src","partDetail.html?from=2&deptName="+curDept+"&dateType="+dateType)
     });
     $(".part02 .bingli,.part02 .bingliLis").click(function(){
         focusMenuItem("YH-KSZR-KSQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","deptScoreDetail.html?from=2&deptName="+curDept+"&dateType="+dateType)
     });
 }
 //判断有无某一权限
@@ -144,7 +146,7 @@ function getOwnDept(){
                 let result = data.data
                 renderDeptLis(result)//科室tab渲染
                 curDept = result[0].deptName
-                $(".partTitle p i,.toggleSlide p span").html(curDept).attr("title",curDept)
+                $(".partTitle p i,.toggleSlide p span").html(curDept).attr({"title":curDept,'data-dept':curDept})
                 getBarData(2)//图标数据获取
             }else {
                 $(".partTitle p i,.toggleSlide p span").html('--')
@@ -165,8 +167,8 @@ function renderDeptLis(data){
     $(".toggleSlide ul li").click(function(){
         let name = $(this).attr("data-dept")
         curDept = name
-        $(this).parent().slideToggle().prev().find("span").html(name).attr("title",name)
-        $(".partTitle p i").html(name).attr("title",name)
+        $(this).parent().slideToggle().prev().find("span").html(name).attr({"title":name,'data-dept':curDept})
+        $(".partTitle p i").html(name).attr({"title":name,'data-dept':curDept})
         personNum(datafst[name]||[])
         setNumDetail(datasec[name]||[])
         queList(datatrd[name]||[])
@@ -486,7 +488,9 @@ function part02pan(data,dom){
 }
 //柱状图住院日期
 function emptyCircleB(data){
+    if(!document.getElementById('emptyCircleB'))return
     var myChart = echarts.init(document.getElementById('emptyCircleB'));
+    return
     $(window).resize(function(){
         myChart.resize()
     });

src/js/deptScoreDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -17,13 +17,48 @@ 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=2,deptList=[],
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
-let deptList = JSON.parse(getCookie("deptList"))||[]
+$(function(){
+    deptList = JSON.parse(getCookie("deptList"))||[]
+    let srcUrl = $("#contentIframe",parent.document).attr("src")
+    deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+    console.log(deptIdTemp,deptId)
+    if(statisticsType == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+    if(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
+    getTabData(1)
+
+  })
+
+
 $(".abnormalClear").click(function(){
-    // window.location.reload()
-    deptId = deptList[0].deptName
+    deptId = deptIdTemp = deptList[0].deptName
     behospitalCode = ""
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
@@ -49,13 +84,15 @@ $('.iconCalen').on("click", function(e){
 })
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 //科室处理
-getDeptList()
-function getDeptList(){
+// getDeptList()
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
-    $(".deptScoreDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
-    deptIdTemp = deptList[0].deptName
-    deptId = deptList[0].deptName
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
+    // $(".deptScoreDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
@@ -106,6 +143,7 @@ function dateChange(){
 }
 
 function getTabData(activePage){
+    console.log(deptIdTemp,deptId,7878778)
     const param = {
         "asc": "",
         "deptName": deptId||"",
@@ -135,7 +173,6 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
 
 $(".filter").on("click", function(e){
     name = nameTemp
@@ -348,7 +385,7 @@ $('.selectDept').on("click", function(e){
 function rendeDeptList(deptList){
     let str = `<li class="deptItem " data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
-        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
+        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptName} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
     $('.deptList').html(str)
 }

src/js/deptScoreDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 1){
+      $(".monthYear .mon").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }else{
+      $(".monthYear .year").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }
 $(".abnormalClear").click(function(){
     // window.location.reload()
     behospitalCode = ""

src/js/index.js

@@ -14,6 +14,11 @@ $(function(){
   $(".main").css({
     height:$(window).height()-52+'px'
   })
+  $(window).resize(function(){
+    $(".main").css({
+      height:$(window).height()-52+'px'
+    })
+  })
   $("body").on('focus',".modalAction input",function(){
     $(this).attr("type","password")
   })

src/js/jiaji.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/jiaji.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,12 +20,31 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+
+if(statisticsType == 1){
+    $(".monthYear .mon").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}else{
+    $(".monthYear .year").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}
 $(".abnormalClear").click(function(){
     behospitalCode = ""
     $(".patientNumInp").val("")
     getTabData(1)
 })
-
 $(".partTitle a").click(function(){
     //初始菜单选中
     $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");

src/js/moduleManager.js

@@ -10,7 +10,7 @@ const {post,getCookie} = require('./utils.js')
 function setTbaleInfoHei(){
  
     $(".tableInfo").css({
-        height:$(window).height()-180+'px'
+        height:$(window).height()-140+'px'
     })
 }
 setTbaleInfoHei()

src/js/mukuai.js

@@ -21,11 +21,36 @@ let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    isReject = 2||getUrlArgObjectNew("dateType",srcUrl)
-    // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isReject = getUrlArgObjectNew("dateType",srcUrl)||2
+    deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
-    
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+    if(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
     $(".partTitle a").click(function(){
         //初始菜单选中
         focusMenuItem('YH-KZTKS')

src/js/mukuaiControl.js

@@ -22,6 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
     
@@ -36,6 +37,24 @@ $(function(){
         $(".patientNumInp").val("")
         getTabData(1)
     })
+    
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
 })
 function focusMenuItem(code){
     const ele = $(parent.document).find(".menu .page[code="+code+"]");

src/js/partDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -21,8 +21,39 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 let deptList = JSON.parse(getCookie("deptList"))||[]
+$(function(){
+    let srcUrl = $("#contentIframe",parent.document).attr("src")
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||2
+    deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    if(statisticsType == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+    if(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
+})
+
 $(".abnormalClear").click(function(){
-    // window.location.reload()
     deptId = deptList[0].deptName
     behospitalCode = ""
     $(".patientNumInp").val("")
@@ -60,18 +91,19 @@ $('.iconCalen').on("click", function(e){
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 
 //科室处理
-getDeptList()
-function getDeptList(){
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
-    $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
-    deptIdTemp = deptList[0].deptName
-    deptId = deptList[0].deptName
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
     }
     $(".partDetail .filterDropList").html(str)
+    getTabData(1)
 }
 
 dateChange()
@@ -142,7 +174,6 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
 
 $(".filter").on("click", function(e){
     name = nameTemp

src/js/partDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 1){
+      $(".monthYear .mon").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }else{
+      $(".monthYear .year").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }
 $(".abnormalClear").click(function(){
     // window.location.reload()
     $(".patientNumInp").val("")

src/js/payDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/payDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 1){
+      $(".monthYear .mon").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }else{
+      $(".monthYear .year").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }
 $(".abnormalClear").click(function(){
     behospitalCode = ""
     $(".patientNumInp").val("")

src/js/tiaomu.js

@@ -21,8 +21,36 @@ let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    deptId = deptIdTemp = deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
+    
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+    if(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
     getTabData(1)//条目缺陷
     
     $(".partTitle a").click(function(){
@@ -88,10 +116,14 @@ $('.selectDept').on("click", function(e){
 })
 
 //科室处理
-getDeptList()
-function getDeptList(){
+// getDeptList()
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
     $(".tiaomu .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]

src/js/tiaomuControl.js

@@ -22,6 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
     
@@ -36,6 +37,24 @@ $(function(){
         $(".patientNumInp").val("")
         getTabData(1)
     })
+    
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
 })
 bindDeptSelect()
 //科室选择