Merge remote-tracking branch 'origin/master' into referMaster

src/css/deptScoreDetailControl.less

@@ -216,7 +216,7 @@
         border: 1px solid #777;
         box-sizing: border-box;
         cursor: pointer;
-        margin-left: 10px;
+        margin:0 0 20px 10px;
         float: left;
         top: 0px;
     }

src/css/qcList.less

@@ -115,6 +115,7 @@ table{
     left: 1008px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListDept.less

@@ -113,6 +113,7 @@ table{
     left: 1008px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListDocteam.less

@@ -112,6 +112,7 @@ table{
     left: 788px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListPerson.less

@@ -118,6 +118,7 @@ table{
     left: 1008px;
     top: 8px;
     color: #777;
+    white-space: nowrap;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/single.less

@@ -92,7 +92,6 @@
     }
     .main-body{
         .main-body-com;
-        box-sizing: border-box;
     }
     table{
         .table;
@@ -193,7 +192,7 @@
         cursor: pointer;
     }
     .export{
-        display: inline-block;
+        display: none;
         width:60px;
         height:34px;
         line-height: 34px;

src/js/api.js

@@ -81,7 +81,8 @@ const api = {
     exportQcList:'/qc/behospitalInfo/exportQcresult',//质控评分导出
     exportQcListDept:'/qc/behospitalInfo/exportQcresultByDept',//质控评分（科室）导出
     exportQcDocteam:'/qc/behospitalInfo/exportQcresultByGroup', //质控评分（医疗组）导出
-    exportDeptFlaws:'/console/export/levelExport',       //各科室缺陷占比导出
+    exportDeptFlaws:'/console/export/levelExport',       //各科室缺陷占比导出-长兴
+    exportDeptFlawsTz:'/console/export/levelExport_TZ', //各科室缺陷占比导出-台州
     exportIndexQualified:'/console/export/homePageLevelExport',       //病案首页合格率占比导出
     exportItemFlaw:'/console/export/entryGroupByEntryExport',       //条目缺陷占比导出
     entryRejectPercent:'/console/entryRejectPercent',//单项否决占比

src/js/console.js

@@ -12,6 +12,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');
+const { get } = require('jquery');
 let payMoney = [],behosDateStart="",behosDateEnd="",dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="合格率",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
 
 $(function(){
@@ -113,10 +114,9 @@ $(function(){
     $(".part02").on("mouseleave",".bingli li.sec",function(){
       $(this).find(".explainNum").css("color","#A5ADBF")
     })
-    getDetails()
     getEveryDeptLevel()
 })
-function getDetails(){
+function getDetails(dateType){
     $(".pubEchartB.paymoney .title").click(function(){
       focusMenuItem("YH-ZKK-GKSQXZB_XQ");
       $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&deptType="+deptType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
@@ -166,6 +166,17 @@ function getDetails(){
         focusMenuItem("YH-ZKK-TMQXZB_XQ");
         $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
+    $("body").on("click",".homegodetail",function(){
+        let name = $(this).attr("data-name")
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&model="+name+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+    })
+    $("body").on("click",".explainPanT .explainLi",function(){
+        let deptName = $(this).attr("data-dept")
+        let deptId = $(this).attr("dept-id")
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=1&shijian="+dateType+"&qxName="+deptName+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+    })
 }
 
 //判断有无某一权限
@@ -1638,11 +1649,6 @@ function queList(data){
         `
     }
     $(".qtable").html(tmp+strAll)
-    $(".homegodetail").click(function(){
-        let name = $(this).attr("data-name")
-        focusMenuItem("YH-ZKK-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&model="+name+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
-    })
 }
 //饼图列表注释渲染
 function panDetail(data){
@@ -1660,12 +1666,6 @@ function panDetail(data){
         `
     }
     $(".explainPanT table").html(strAll);
-    $(".explainPanT .explainLi").click(function(){
-        let deptName = $(this).attr("data-dept")
-        let deptId = $(this).attr("dept-id")
-        focusMenuItem("YH-ZKK-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=1&shijian="+dateType+"&qxName="+deptName+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
-    })
 }
 function panDetailB(data){
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
@@ -1700,7 +1700,6 @@ $(".sureDate").click(function(){
     if(!getStaticDate()){
         return
     }
-    
     setCookieAction(behosDateStart.split(" ")[0],behosDateEnd.split(" ")[0])
     getAverageScoreLis()
     getBarData(dateType)
@@ -1717,6 +1716,7 @@ $(".sureDate").click(function(){
         backgroundColor:'#203463'
     })
     dateType = 3
+    getDetails(dateType)
 })
 //日期联动
 function dateConsole(dateType,flg){
@@ -1730,9 +1730,11 @@ 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
         $(".monthYear .year").css({
             "border-color":'#A5ADBF',
             color:'#A5ADBF',
@@ -1744,6 +1746,7 @@ function dateConsole(dateType,flg){
             backgroundColor:'#203463'
         })
     }
+    getDetails(dateType)
     $( "#datepicker" ).datepicker({
         yearRange: "2015:"+year,
         changeMonth: true,
@@ -1758,7 +1761,6 @@ function dateConsole(dateType,flg){
     }).datepicker( "setDate",endDate);
     getStaticDate(flg)
     getAverageScoreLis()
-    getBarData(dateType)
     getHomeData('firstLevelPercent')
     getEveryDeptLevel()
 }

src/js/deptConsole.js

@@ -47,9 +47,8 @@ $(function(){
       $(".part02").on("mouseleave",".bingli li.sec",function(){
         $(this).find(".explainNum").css("color","#A5ADBF")
       })
-    tiaomu()
 })
-function tiaomu(){
+function tiaomu(dateType){
     $(".defect .partTitlePub").click(function(){
         focusMenuItem("YH-KSZR-GMKQXZB_XQ");
         $(parent.document).find("#contentIframe").attr("src","mukuai.html?from=2&deptName="+curDept+"&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
@@ -72,6 +71,11 @@ function tiaomu(){
         let chengdu = dataC == 1?'甲':dataC==2?'乙':'丙'
         $(parent.document).find("#contentIframe").attr("src","./qcListDept.html?from=1&dateType="+dateType+"&chengdu="+chengdu+"&deptName="+curDept+"&deptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
+    $("body").on("click",".homegodetail",function(){
+        let name = $(this).attr("data-name")
+        focusMenuItem("YH-KSZR-TMQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&shijian="+dateType+"&model="+name+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+    })
 }
 //判断有无某一权限
 function hasData(data){
@@ -757,11 +761,6 @@ function queList(data){
         `
     }
     $(".qtable").html(tmp+strAll)
-    $(".homegodetail").click(function(){
-        let name = $(this).attr("data-name")
-        focusMenuItem("YH-KSZR-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&shijian="+dateType+"&model="+name+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
-    })
 }
 //饼图列表注释渲染
 function panDetailB(data){
@@ -823,7 +822,6 @@ $(".sureDate").click(function(){
     if(!getStaticDate()){
         return
     }
-    
     setCookieAction(behosDateStart.split(" ")[0],behosDateEnd.split(" ")[0])
     getBarData(dateType)
     dateType = 3
@@ -837,6 +835,7 @@ $(".sureDate").click(function(){
         color:'#A5ADBF',
         backgroundColor:'#203463'
     })
+    tiaomu(dateType)
 })
 //日期联动
 function dateConsole(dateType,flg){
@@ -851,6 +850,7 @@ function dateConsole(dateType,flg){
         startDate = "-1m"
     }
     if(getCookie("behosDateStart")&&!flg){
+        dateType = 3
         startDate = new Date(getCookie("behosDateStart"))
         endDate = new Date(getCookie("behosDateEnd"))
         $(".monthYear .year").css({
@@ -863,6 +863,8 @@ function dateConsole(dateType,flg){
             color:'#A5ADBF',
             backgroundColor:'#203463'
         })
+    }else{
+        getBarData(dateType)
     }
     $( "#datepicker" ).datepicker({
         yearRange: "2015:"+year,
@@ -877,7 +879,7 @@ function dateConsole(dateType,flg){
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate",endDate);
     getStaticDate(flg)
-    getBarData(dateType)
+    tiaomu(dateType)
 }
 function setCookieAction(startDate,endDate){
     setCookie('behosDateStart',startDate)

src/js/deptScoreDetailControl.js

@@ -601,8 +601,9 @@ $(function() {
       "type": statisticsType||2, //1-本月，2-本年
       "startDate":dateStatrt,
       "endDate":dateEnd
-    }
-    expJson(api.exportDeptFlaws,param).then(res =>{
+    };
+    const url = hospital == '台州市立'?api.exportDeptFlawsTz:api.exportDeptFlaws;
+    expJson(url,param).then(res =>{
       downloadExportedData(res.data, dateStatrt.slice(0,10).replace(/-/g,"")+"-"+dateEnd.slice(0,10).replace(/-/g,"")+"各科室缺陷占比.xls")
     })
 

src/js/index.js

@@ -249,6 +249,8 @@ $("#changeWord").click(function(e){
 //推出登录
 $(".login-out").click(function(){
   delCookie('accessToken')
+  setCookie('behosDateStart','')
+  setCookie('behosDateEnd','')
 })
 
 //时间获取

src/js/qcList.js

@@ -708,9 +708,14 @@ function bindColOrder(){
 }
 
 $(".patientNumInp").on("input", function(e){
-    const val = $(this).val().trim()
-    behospitalCodeTemp = val
-})
+    const val = $(this).val().trim();
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+        return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
+});
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()
     nameTemp = val

src/js/qcListDept.js

@@ -704,7 +704,12 @@ function bindColOrder(){
 }
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim()
-    behospitalCodeTemp = val
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+      return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
 })
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()

src/js/qcListDocteam.js

@@ -65,7 +65,7 @@ $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
   //判断有无某一权限
 function hasData(data){
     let trdObj = JSON.parse(getCookie("trdObj"))
-    let lis = trdObj['YH-BLZK-ZKPFKS']
+    let lis = trdObj['YH-BLZK-ZKPFYLZ']
     if(!lis){
       return false
     }
@@ -629,7 +629,12 @@ function bindColOrder(){
 }
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim()
-    behospitalCodeTemp = val
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+      return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
 })
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()

src/js/qcListPerson.js

@@ -701,7 +701,12 @@ function bindColOrder(){
 }
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim()
-    behospitalCodeTemp = val
+    let beCode=behospitalCode;
+    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+    beCode=val.replace(patrn,function(x){
+      return "\\"+x;
+    });
+    behospitalCodeTemp = beCode
 })
 $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()

src/js/qcScore.js

@@ -17,9 +17,13 @@ $(function(){
   let global_flaws=[];  //缺陷条目列表缓存
   let global_selectedFlaw = {};    //新增时选中的条目信息
   getAllModules();
-  $(".add-flaw").click(function(){
-    getQcCasesEntry();
-  });
+  let hasAu3 = hasData('FUNC000011');   //新增缺陷权限
+  if(hasAu3){
+    $(".add-flaw").click(function(){
+      getQcCasesEntry();
+    });
+  }
+
 function initMenu(data){
   const menu=[{id:0,name:"缺陷总览",parentId: -1,sonMode: []},...(data||[])];
   //菜单数据填充
@@ -201,8 +205,8 @@ function initList(data){
 //评分项数据填充
 function initScoreItem(data){
   $("#flaws .flaw-box").html("");
-  let hasAu = hasData('FUNC000013')
-  let hasAu2 = hasData('FUNC000012')
+  let hasAu = hasData('FUNC000013');    //修改缺陷权限
+  let hasAu2 = hasData('FUNC000012');   //删除缺陷权限
   for(let k in data){
     $("#flawTmpl").tmpl(data[k]).appendTo("#flaws .flaw-box");
   }
@@ -211,7 +215,7 @@ function initScoreItem(data){
     const i = $(".flaw-item[code="+global_activeTab+"]").index($(this).parents(".flaw-item"));
     const code=$(this).attr("code");
     const isEdit = $(this).is(".edit-flaw");
-    if(!hasAu)return
+    //if(!hasAu)return
     if(isEdit&&hasAu){
       showModal('0',code,i);
     }else if(!isEdit&&hasAu2){
@@ -220,6 +224,7 @@ function initScoreItem(data){
   })
   $(".edit-flaw").css({"opacity":hasAu?"1":"0.5",cursor:hasAu?"pointer":"unset"});
   $(".del-flaw").css({"opacity":hasAu2?"1":"0.5",cursor:hasAu2?"pointer":"unset"});
+  $(".add-flaw").css({"opacity":hasAu3?"1":"0.5",cursor:hasAu3?"pointer":"unset"});
   $(".flaw-item .title a[href]").click(function(){
     const id = $(this).attr("href");
     const anchors=$(this).attr("anchors").split(",");

src/js/singleVeto.js

@@ -11,6 +11,10 @@ const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
+const currentPage=$(window.parent.document).find(".menu .page.active").attr("code");
+if(currentPage==="YH-ZKK-TMQXZB_XQ"){
+  $(".export").css("display","inline-block");
+}
 
 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="下拉">`)
@@ -148,7 +152,7 @@ function getDeptList(){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
     }
-    $(".tiaomu .filterDropList").html(str)
+    $(".singleVeto .filterDropList").html(str)
 }
 function getTabData(activePage){
     const dateStatrt = getPickerDate($("#datepicker"),1)

src/js/utils.js

@@ -351,6 +351,7 @@ function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
         startDate = startDateDefault || new Date()
         endDate = endDateDefault || new Date()
     }
+    // console.log(picker1,picker2,mode,startDateDefault,endDateDefault)
     if(picker1){
       picker1.datepicker({
         yearRange: "2015:"+year,