瀏覽代碼

Merge remote-tracking branch 'remotes/origin/byll_console' into test

luolei 5 年之前
父節點
當前提交
b807031025
共有 12 個文件被更改,包括 336 次插入127 次删除
  1. 44 0
      src/css/console.less
  2. 1 1
      src/css/index.less
  3. 12 5
      src/html/console.html
  4. 185 93
      src/js/console.js
  5. 15 2
      src/js/index.js
  6. 13 2
      src/js/itemManager.js
  7. 1 1
      src/js/login.js
  8. 13 3
      src/js/moduleManager.js
  9. 11 10
      src/js/qcList.js
  10. 17 2
      src/js/qcListDept.js
  11. 18 3
      src/js/qcListPerson.js
  12. 6 5
      src/js/roleManager.js

+ 44 - 0
src/css/console.less

@@ -163,6 +163,7 @@ body.console {
 }
 .paymoney {
   box-sizing: border-box;
+  position: relative;
 }
 .dept {
   box-sizing: border-box;
@@ -411,4 +412,47 @@ body.console {
 }
 .explainNum {
   margin-top: 8px;
+}
+
+.toggleSlide {
+  cursor: pointer;
+  position: absolute;
+  right: 10px;
+  top: 4px;
+  p {
+    width: 100px;
+    height: 26px;
+    line-height: 28px;
+    border: 1px solid #E2E5EF;
+    padding-right: 20px;
+    padding-left: 10px;
+    position: relative;
+    font-size: 14px;
+    border-radius: 4px;
+    img {
+      width: 10px;
+      position: absolute;
+      right: 10px;
+      top: 12px;
+    }
+  }
+  ul {
+    display: none;
+    background-color: #fff;
+    position: absolute;
+    top: 27px;
+    right: 0;
+    border: 1px solid #E2E5EF;
+    z-index: 100;
+    padding: 0;
+    width: 130px;
+    li {
+      height: 30px;
+      line-height: 30px;
+      padding: 0 10px;
+      &:hover {
+        background-color: #EEF4FF;
+      }
+    }
+  }
 }

+ 1 - 1
src/css/index.less

@@ -37,7 +37,7 @@
       text-indent: 0;
       width: 100px;
       position: absolute;
-      right: 0;
+      right: -15px;
       top:42px;
       box-shadow:0px 4px 20px -3px rgba(59,89,126,0.3);
       li {

+ 12 - 5
src/html/console.html

@@ -69,13 +69,13 @@
         </ul>
         <div class="bingliLis clearfix">
           <p>病历评分等级占比</p>
-          <div class="panPartPub panPart01">
+          <div class="panPartPub panPart02">
             <div class="fen" id="fen01"></div>
-            <p>级占比</p>
+            <p>级占比</p>
           </div>
-          <div class="panPartPub panPart02">
+          <div class="panPartPub panPart01">
             <div class="fen" id="fen02"></div>
-            <p>级占比</p>
+            <p>级占比</p>
           </div>
           <div class="panPartPub panPart03">
             <div class="fen" id="fen03"></div>
@@ -84,6 +84,13 @@
         </div>
         <div class="pubEchart paymoney">
           <p class="title">科室平均住院天数柱状图</p>
+          <div class="toggleSlide">
+            <p><span>平均住院天数</span><img src="../images/arrow_down.png" alt=""> </p>
+            <ul>
+              <li class="toggleAverge" data-str="平均住院天数" data-type="1">平均住院天数</li>
+              <li class="toggleAverge" data-str="平均住院花费" data-type="2">平均住院花费</li>
+            </ul>
+          </div>
           <div id="barChart" class="barChartPay"></div>
         </div>
       </div>
@@ -97,7 +104,7 @@
         <div class="circle clearfix">
           <p class="title">各科室缺陷占比</p>
           <div id="emptyCircle" class="emptyCircle"></div>
-          <div class="explainPan">
+          <div class="explainPan explainPanT">
             <table>
               
             </table>

+ 185 - 93
src/js/console.js

@@ -2,11 +2,12 @@ const $ = require('jquery');
 require("../css/reset.less")
 require("../css/console.less")
 require("../images/logo.png")
+require("../images/arrow_down.png")
 
 // import 'zrender/lib/svg/svg';
 const echarts = require('echarts');
 const {post,setCookie,delCookie,getCookie} = require('../js/utils.js');
-
+let payMoney = [],dayLis = [],dataType = 1;
 $(function(){
     $(".partTitle p span").html(getCookie("hospital"))
     setInterval(() => {
@@ -18,8 +19,31 @@ $(function(){
     dateChange()
     $(window).click(function(){
         window.parent.userActionHide()
+        $(".toggleSlide ul").css("display","none")
+    })
+    $(".toggleSlide p").click(function(e){
+        e.stopPropagation()
+        $(this).next().slideToggle()
+    })
+    $(".toggleSlide li").click(function(){
+        let str = $(this).attr("data-str"),type = $(this).attr("data-type") 
+        if(type == 1){
+            barChart(dayLis,dataType)
+        }else{
+            barChart(payMoney,dataType)
+        }
+        $(this).parent().slideToggle().prev().find("span").html(str)
     })
 })
+//判断有无某一权限
+function hasData(data){
+    let lis = JSON.parse(getCookie("codeLis"))
+    // console.log(lis)
+    if(lis.indexOf(data)>-1){//有权限
+        return true
+    }
+    return false;
+  }
 function resizeBox(){
     $(".partWrap").css({
         height:$(window).height()-38+'px'
@@ -35,6 +59,7 @@ function dateChange(){
             color:'#5A8EEE',
             backgroundColor:'#fff'
         })
+        dataType = 1
         getBarData(1)
     })
     $(".monthYear .year").click(function(){
@@ -45,6 +70,7 @@ function dateChange(){
             color:'#5A8EEE',
             backgroundColor:'#fff'
         })
+        dataType = 2
         getBarData(2)
     })
 }
@@ -89,98 +115,163 @@ function initConsole(result){
 }
 //获取图表数据
 function getBarData(type){
-    post('/console/mrStatistics',{//出院人数统计,各科室甲级病历占比,病历数统计
-        "type": type||1//1月2年
-    }).then((res)=>{
-        let data = res.data;
-        if(data.code == 0){
-            let result = data.data
-            let result1 = data.data['出院人数统计']||[]
-            personNum(result1)
-            let result3 = data.data['病历数统计']||[]
-            if(result3.length == 0){
-                result3 = [
-                    {
-                        "id":null,
-                        "name":"累计质控病历数",
-                        "totleNum":0,
-                        "num":0,
-                        "percent":null,
-                        "percentStr":null
-                    },
-                    {
-                        "id":null,
-                        "name":"甲级病历",
-                        "totleNum":10,
-                        "num":0,
-                        "percent":0,
-                        "percentStr":"0.00%"
-                    },
-                    {
-                        "id":null,
-                        "name":"乙级病历",
-                        "totleNum":10,
-                        "num":0,
-                        "percent":0,
-                        "percentStr":"0.00%"
-                    },
-                    {
-                        "id":null,
-                        "name":"丙级病历",
-                        "totleNum":10,
-                        "num":0,
-                        "percent":0,
-                        "percentStr":"0.00%"
-                    }
-                ]
+    if(hasData('FUNC000045')){
+        post('/console/getAverageDayNum',{//平均住院天数
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result2 = data.data['平均住院日']||[]
+                dayLis = result2
+                barChart(result2,type||1)
             }
-            setNumDetail(result3)
-            let result2 = data.data['各科室甲级病历占比']||[]
-            let dataX2=[],dataY2=[];
-            for(let i = 0;i < result2.length;i++){
-                dataX2.push(result2[i].deptName)
-                dataY2.push(result2[i].firstPercent.replace('%',''))
+        })
+    }
+    if(hasData('FUNC000046')){
+        post('/console/getAverageFee',{//平均住院费用
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result3 = data.data['平均住院费用']||[]
+                payMoney = result3;
+                barChart(result2,type||1)
             }
-            lineChart(dataX2,dataY2)
-        }
-    })
-    post('/console/averageStatistics',{//平均住院日,平均住院费用,各科室质控平均分
-        type:type||1
-    }).then((res)=>{
-        let data = res.data;
-        if(data.code == 0){
-            let result1 = data.data['各科室质控平均分']||[]
-            let result2 = data.data['平均住院日']||[]
-            let dataX1=[],dataY1=[],dataX2=[],dataY2=[];
-            for(let i = 0;i < result1.length;i++){
-                dataX1.push(result1[i].name)
-                dataY1.push(result1[i].averageValue)
-            }
-            barChartPay(dataX1,dataY1)
-            barChart(result2,type||1)
-        }
-    })
-    post('/console/resultStatistics',{//各科室缺陷占比,各模块缺陷占比排行,条目缺陷占比
-        type:type||1
-    }).then((res)=>{
-        let data = res.data;
-        if(data.code == 0){
-            let result1 = data.data['各模块缺陷占比排行']||[]
-            let result2 = data.data['各科室缺陷占比']||[]
-            let result3 = data.data['条目缺陷占比']||[]
-            for(let i = 0;i < result2.length;i++){
-                result2[i].value = result2[i].num
-            }
-            for(let i = 0;i < result3.length;i++){
-                result3[i].value = result3[i].num
-            }
-            queList(result1)
-            emptyCircle(result2)
-            emptyCircleB(result3)
-            panDetail(result2)
-            panDetailB(result3)
-        }
-    })
+        })
+    }
+    if(hasData('FUNC000047')){
+        post('/console/getAverageScore',{//各科室质控平均分
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result1 = data.data['各科室质控平均分']||[]
+                let dataX1=[],dataY1=[]
+                for(let i = 0;i < result1.length;i++){
+                    dataX1.push(result1[i].name)
+                    dataY1.push(result1[i].averageValue)
+                }
+                barChartPay(dataX1,dataY1)
+            }
+        })
+    }
+    if(hasData('FUNC000048')){
+        post('/console/getLevelResultDept',{//各科室甲级占比
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result2 = data.data['各科室甲级病历占比']||[]
+                let dataX2=[],dataY2=[];
+                for(let i = 0;i < result2.length;i++){
+                    dataX2.push(result2[i].deptName)
+                    dataY2.push(result2[i].firstPercent.replace('%',''))
+                }
+                lineChart(dataX2,dataY2)
+            }
+        })
+    }
+    if(hasData('FUNC000049')){
+        post('/console/leaveHosCount',{//出院人数统计
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                // barChart(result2,type||1)
+                // console.log(data)
+                let result1 = data.data['出院人数统计']||[]
+                personNum(result1)
+            }
+        })
+    }
+    if(hasData('FUNC000050')){
+        post('/console/mrCount',{//质控病历统计
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data
+            if(data.code == 0){
+                let result3 = data.data['病历数统计']||[]
+                if(result3.length == 0){
+                    result3 = [
+                        {
+                            "id":null,
+                            "name":"累计质控病历数",
+                            "totleNum":0,
+                            "num":0,
+                            "percent":null,
+                            "percentStr":null
+                        },
+                        {
+                            "id":null,
+                            "name":"甲级病历",
+                            "totleNum":10,
+                            "num":0,
+                            "percent":0,
+                            "percentStr":"0.00%"
+                        },
+                        {
+                            "id":null,
+                            "name":"乙级病历",
+                            "totleNum":10,
+                            "num":0,
+                            "percent":0,
+                            "percentStr":"0.00%"
+                        },
+                        {
+                            "id":null,
+                            "name":"丙级病历",
+                            "totleNum":10,
+                            "num":0,
+                            "percent":0,
+                            "percentStr":"0.00%"
+                        }
+                    ]
+                }
+                setNumDetail(result3)
+            }
+        })
+    }
+    if(hasData('FUNC000051')){
+        post('/console/entryCountGroupByCase',{//各模块缺陷占比排行
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result1 = data.data['各模块缺陷占比排行']||[]
+                queList(result1)
+            }
+        })
+    }
+    if(hasData('FUNC000052')){
+        post('/console/entryCountGroupByEntry',{//条目缺陷占比
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result3 = data.data['条目缺陷占比']||[]
+                for(let i = 0;i < result3.length;i++){
+                    result3[i].value = result3[i].num
+                }
+                emptyCircleB(result3)
+                panDetailB(result3)
+            }
+        })
+    }
+    if(hasData('FUNC000053')){
+        post('/console/entryByDept',{//各科室缺陷占比
+            "type": type||1//1月2年
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result2 = data.data['各科室缺陷占比']||[]
+                for(let i = 0;i < result2.length;i++){
+                    result2[i].value = result2[i].num
+                }
+                emptyCircle(result2)
+                panDetail(result2)
+            }
+        })
+    }
 }
 //part01
 function personNum(data){
@@ -473,6 +564,7 @@ function barChartPay(dataX,dataY){
 }
 //柱状图住院日期
 function barChart(data,type){
+    // console.log(data,type)
     var myChart = echarts.init(document.getElementById('barChart'));
     $(window).resize(function(){
         myChart.resize()
@@ -876,7 +968,7 @@ function emptyCircleB(data){
 }
 //缺陷列表渲染
 function queList(data){
-    let strAll = '',tmp = `
+    let strAll = '',tmp = `mm
         <tr class="thead">
         <td class="td01">排名</td>
         <td class="td02">缺陷详情</td>
@@ -910,7 +1002,7 @@ function panDetail(data){
             </tr>
         `
     }
-    $(".explainPan table").html(strAll);
+    $(".explainPanT table").html(strAll);
     $(".explainPan").css({
         marginTop:-($(".explainPan").height()/2-20)+'px'
     })

+ 15 - 2
src/js/index.js

@@ -3,7 +3,7 @@ const $ = require('jquery');
 require('jquery-templates');
 const md5 = require('js-md5');
 require("./modal.js")
-const {api,post,pageMap,delCookie,setCookie,hasData} = require('./utils.js');
+const {api,post,pageMap,delCookie,setCookie,getCookie} = require('./utils.js');
 let userInfo={};
 $(function(){
   getMenu();
@@ -18,8 +18,18 @@ $(function(){
   $(window).click(function(e){
     $(".userAction").css("display","none")
   })
+  $("#changeWord").css("opacity",hasData('FUNC000002')?'1':'0.5').hover(function(){
+    $(this).css("color","#777777")
+  })
 });
-
+//判断有无某一权限
+function hasData(data){
+  let lis = JSON.parse(getCookie("codeLis"))
+  if(lis.indexOf(data)>-1){//有权限
+      return true
+  }
+  return false;
+}
 function userActionHide(e){
   $(".userAction").css("display","none")
 }
@@ -138,6 +148,9 @@ $(".login").click(function(e){
 })
 //点击修改密码
 $("#changeWord").click(function(e){
+  if(!hasData('FUNC000002')){
+      return
+  }
   e.stopPropagation()
   const status = $(".modalAction").css("display")
   $.alerModal({

+ 13 - 2
src/js/itemManager.js

@@ -3,7 +3,7 @@ require("../css/itemManager.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,hasData} = require('./utils.js')
+const {post,getCookie} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -17,6 +17,14 @@ $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
+//判断有无某一权限
+function hasData(data){
+    let lis = JSON.parse(getCookie("codeLis"))
+    if(lis.indexOf(data)>-1){//有权限
+        return true
+    }
+    return false;
+  }
 //获取表格数据
 function getTabData(activePage){
     const param = {
@@ -116,7 +124,7 @@ function renderTab(data,activePage){
                 <td  class="textCenter">${item.score}</td>
                 <td  class="textCenter">${item.isReject == '1' ? `是`:`否`}</td>
                 <td class="textCenter">${item.isUsed == '1' ? `是`:`否`}</td>
-                <td class="${cls} textCenter">修改</td>
+                <td class="editItem textCenter" style="opacity:${hasData('FUNC000007')?'1':'0.5'}">修改</td>
             </tr>
         `
     }
@@ -125,6 +133,9 @@ function renderTab(data,activePage){
 }
 
 function bindEdit(data,activePage){
+    if(!hasData('FUNC000007')){
+        return
+    }
     $('.editItem').click(function(e){
         const index = $(this).parent().attr('data-index') 
         editItem(data[index],activePage)

+ 1 - 1
src/js/login.js

@@ -24,7 +24,7 @@ $(function(){
   })
 });
 function sureLogin(){
-  $(".login .waring").css('display','none')
+  $(".login .waring").html('')
   let username = $("#username").val().trim();
   let password = $("#password").val().trim();
   if(!username){

+ 13 - 3
src/js/moduleManager.js

@@ -6,11 +6,18 @@ require('./modal.js');
 
 // const  layui = require('layui-src');
 const {api} = require('./api.js')
-const {post,hasData} = require('./utils.js')
+const {post,getCookie} = require('./utils.js')
 $(".tableWrapper").css({
     height:$(window).height()-180+'px'
 })
-
+//判断有无某一权限
+function hasData(data){
+    let lis = JSON.parse(getCookie("codeLis"))
+    if(lis.indexOf(data)>-1){//有权限
+        return true
+    }
+    return false;
+  }
 let data = {}
 function getTabData(){
     post(api.getQcCases).then(res =>{
@@ -63,7 +70,7 @@ function renderTab(){
             <td class="moduleNumber">${i+1}</td>
             <td class="moduleName">${data[i].name}</td>
             <td class="moduleScore">${data[i].score}</td>
-            <td class="moduleOpera ${cls} textCenter">修改</td>
+            <td class="moduleOpera moduleOperaItem textCenter" style="opacity:${hasData('FUNC000004')?'1':'0.5'}">修改</td>
         </tr>
         `
     }
@@ -82,6 +89,9 @@ function renderTab(){
 }
 
 function bindModuleOpera(){
+    if(!hasData('FUNC000004')){
+        return
+    }
     $(".moduleOperaItem").on("click", function(e){
         const index = $(this).parent().attr('data-index') 
         const item = data[index]

+ 11 - 10
src/js/qcList.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcList.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,hasData} = require('./utils.js')
+const {post,getCookie} = 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")
@@ -33,6 +33,14 @@ $('.iconCalen').on("click", function(e){
 })
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 
+//判断有无某一权限
+function hasData(data){
+    let lis = JSON.parse(getCookie("codeLis"))
+    if(lis.indexOf(data)>-1){//有权限
+        return true
+    }
+    return false;
+  }
 function getTabData(activePage){
     const param = {
         current:activePage,
@@ -108,7 +116,7 @@ function renderTab(data,hisId){
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
-                <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
+                <td  class="textCenter"><span data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
                 <td  class="textCenter">${item.sex || "-"}</td>
                 <td  class="textCenter">${item.age || "-"}</td>
                 <td  class="textCenter">${item.bedCode || "-"}</td>
@@ -225,9 +233,6 @@ function bindOperaAll(){
 }
 
 $('.selectDept').on("click", function(e){
-    if($(this).prev().html() == '科室:'&&!hasData("FUNC000030")){
-        return
-    }
     e.stopPropagation()
     $(".levelList ").css("display","none")
     $(".selectLevel .arrow").attr("src",iconDown)
@@ -242,11 +247,7 @@ $('.selectDept').on("click", function(e){
 })
 
 //获取科室列表
-if(hasData("FUNC000030")){
-    getDeptList()
-}else{
-    $(".deptListWrap").css("opacity","0.5")
-}
+getDeptList()
 function getDeptList(){
     post(api.getDeptList,{inputStr:""}).then(res =>{
         if(res.data.code == '0'){

+ 17 - 2
src/js/qcListDept.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListDept.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post} = require('./utils.js')
+const {post,getCookie} = 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")
@@ -30,6 +30,15 @@ $('.iconCalen').on("mouseleave", function(e){
 $('.iconCalen').on("click", function(e){
     $(this).parent().find("input").focus()
 })
+$('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
+//判断有无某一权限
+function hasData(data){
+    let lis = JSON.parse(getCookie("codeLis"))
+    if(lis.indexOf(data)>-1){//有权限
+        return true
+    }
+    return false;
+  }
 function getTabData(activePage){
     const param = {
         current:activePage,
@@ -113,7 +122,7 @@ function renderTab(data){
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter">评分</td>
+                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -206,6 +215,9 @@ function bindScoreOperaItem(){
 }
 function bindRecordScoreOper(){
     $(".recordScoreOperaBtn").on("click",  function(e){
+        if(!hasData('FUNC000017')){
+            return
+        }
         const index = $(this).parent().attr("data-index")
         const behospitalCode = tabList[index].behospitalCode
         loading()
@@ -295,6 +307,9 @@ function hideLoading(){
     $("#mainBox .loadingBox", parent.document).remove()
 }
 $('.recordScoreBtn').on("click",function(e){
+    if(!hasData('FUNC000017')){
+        return
+    }
     let scoreList = []
     for(let i = 0; i <tabList.length; i++){
         if(tabList[i].hasSelect){

+ 18 - 3
src/js/qcListPerson.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListPerson.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getUrlArgObject} = require('./utils.js')
+const {post,getUrlArgObject,getCookie} = 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")
@@ -34,6 +34,15 @@ $('.iconCalen').on("mouseleave", function(e){
 $('.iconCalen').on("click", function(e){
     $(this).parent().find("input").focus()
 })
+$('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
+//判断有无某一权限
+function hasData(data){
+    let lis = JSON.parse(getCookie("codeLis"))
+    if(lis.indexOf(data)>-1){//有权限
+        return true
+    }
+    return false;
+  }
 function getTabData(activePage){
     const param = {
         current:activePage,
@@ -115,7 +124,7 @@ function renderTab(data){
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter">评分</td>
+                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -208,6 +217,9 @@ function bindScoreOperaItem(){
 }
 function bindRecordScoreOper(){
     $(".recordScoreOperaBtn").on("click",  function(e){
+        if(!hasData('FUNC000017')){
+            return
+        }
         const index = $(this).parent().attr("data-index")
         const behospitalCode = tabList[index].behospitalCode
         loading()
@@ -248,7 +260,7 @@ $('.selectDept').on("click", function(e){
 //获取科室列表
 getDeptList()
 function getDeptList(){
-    post(api.getDeptListUser,{inputStr:""}).then(res =>{
+    post(api.getDeptListDept,{inputStr:""}).then(res =>{
         if(res.data.code == '0'){
            const  deptList = res.data.data
            rendeDeptList(deptList)
@@ -297,6 +309,9 @@ function hideLoading(){
     $("#mainBox .loadingBox", parent.document).remove()
 }
 $('.recordScoreBtn').on("click",function(e){
+    if(!hasData('FUNC000017')){
+        return
+    }
     let scoreList = []
     for(let i = 0; i <tabList.length; i++){
         if(tabList[i].hasSelect){

+ 6 - 5
src/js/roleManager.js

@@ -20,6 +20,7 @@ $(function(){
     $(".role .leftMenu").css("height",$(window).height()-128+'px')
     $(".role .rightMenu").css({"height":$(window).height()-88+'px',"width":$(".filterBox").width()-400+'px'})
     $(".saveRoleSet").click(function(){//保存角色设置
+        getParams()
         $.alerModal({type:"loading"});
         let params = {
             "roleId": curId,
@@ -130,11 +131,11 @@ $(function(){
                                 ++num
                             }
                         }
-                        if(num == tmpPer.length){//内层全部都取消了,父级取消选中
-                            tmpDataLis[i].haveMenu = '0'
-                        }else{
-                            tmpDataLis[i].haveMenu = '1'
-                        }
+                        // if(num == tmpPer.length){//内层全部都取消了,父级取消选中
+                        //     tmpDataLis[i].haveMenu = '0'
+                        // }else{
+                        //     tmpDataLis[i].haveMenu = '1'
+                        // }
                         //二层否有选中,有则第一层选中,否则第一层不选中
                         if(tmpDataLis[i].haveMenu == 0){
                             ++tmpNum