luolei 5 years ago
parent
commit
a9164521f3
3 changed files with 4 additions and 4 deletions
  1. 2 2
      src/js/console.js
  2. 1 1
      src/js/roleManager.js
  3. 1 1
      src/js/singleVeto.js

+ 2 - 2
src/js/console.js

@@ -114,7 +114,7 @@ function getDetails(){
     })
     $(".part03 .circle .title").click(function(){
       focusMenuItem("YH-ZKK-DXFZZB_XQ");
-      $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?shijian"+dateType+"&qxName=&selectReject=1")
+      $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&shijian"+dateType+"&qxName=&selectReject=1")
     })
     $(".part02").on("click",".bingli li.sec",function(){
       focusMenuItem("YH-BLZK-ZKPF");
@@ -1618,7 +1618,7 @@ function panDetail(data){
         let deptName = $(this).attr("data-dept")
         let deptId = $(this).attr("dept-id")
         focusMenuItem("YH-ZKK-DXFZZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?shijian"+dateType+"&qxName="+deptName)
+        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=1&shijian"+dateType+"&qxName="+deptName)
     })
 }
 function panDetailB(data){

+ 1 - 1
src/js/roleManager.js

@@ -189,7 +189,7 @@ $(function(){
                                 ++num
                             }
                         }
-                        if(num == tmpPer.length){//内层全部都取消了,父级取消选中
+                        if(num == tmpPer.length&&tmpPer.length>0){//内层全部都取消了,父级取消选中
                             tmpDataLis[i].haveMenu = '0'
                         }else{
                             tmpDataLis[i].haveMenu = '1'

+ 1 - 1
src/js/singleVeto.js

@@ -134,7 +134,7 @@ function getTabData(activePage){
         deptName: deptId, //科室名
         size: 15
     }
-    // console.log(isReject)
+    console.log(isReject,from)
     post(from == 1?api.entryGroupByEntryInnerPage:api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records