6932/6880

src/html/singleVeto.html

@@ -24,6 +24,13 @@
         <div class="partTitleT"></div>
         <div class="main-body">
             <div class="filterBox">
+                <span class="filterItem typeFilter typeFilterDept">
+                    <span style="overflow:hidden">科室：</span>
+                    <span class="selectDept ellipsis" data-id=""><i>--</i></span>
+                    <ul class="deptList filterDropList">
+                        
+                    </ul>
+                </span>
                 <span class="filterItem">
                     <span>缺陷名称：</span>
                     <span class="">

src/js/dept/keyItemFlawControlDept.js

@@ -169,7 +169,6 @@ function renderTab(data,hisId,activePage){
 }
 //科室相关
 bindDeptSelect()
-//科室选择
 function bindDeptSelect(){
     $(document).on("click",'.deptItem',function(){
         const deptItemName = $(this).attr("data-name")||''

src/js/singleVeto.js

@@ -25,7 +25,7 @@ $(function(){
     listenScroll('.singleVeto')
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    let deptNameParam = getUrlArgObjectNew("deptName",srcUrl)||""
     isRejectTemp = isReject = getUrlArgObjectNew("shijian",srcUrl)||""
     selectReject = getUrlArgObjectNew("selectReject",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
@@ -51,17 +51,27 @@ $(function(){
     }
     // YH-ZKK-TMQXZB_XQ
     $(".menu .page", parent.document).removeClass("active")
+    if(deptNameParam){
+        deptName = deptNameTemp = deptNameParam
+        if(from == 2){
+            $(".selectDept").attr({'title':deptName,'data-id':''}).html(deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        }
+    }
     if(from == 2){
+        getDeptList()
+        $(".typeFilterDept").css("display","inline-block")
         $(parent.document).find(".menu .page[code=YH-KSZR-TMQXZB_XQ]").addClass("active")
         $(".partTitle a").attr("href","deptConsole.html").html("控制台(科室) / ")
         $(".partTitle .pices span").html("条目缺陷占比")
     }else{
+        $(".typeFilterDept").css("display","none")
         $(parent.document).find(".menu .page[code=YH-ZKK-TMQXZB_XQ]").addClass("active")
         $(".partTitle a").attr("href","console.html").html("控制台 / ")
         $(".partTitle .pices span").html("条目缺陷占比")
     }
     if(from == 2&&fromThree == 3){
         deptName =  deptList[0]&&deptList[0].deptName||'';
+        $(".selectDept").attr({'title':deptName,'data-id':''}).html(deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }
     $(".partTitle a").click(function(){
         //初始菜单选中
@@ -115,25 +125,53 @@ $(function(){
       }
     getTabData(1)//条目缺陷
 })
+//科室相关
 bindDeptSelect()
-//科室选择
 function bindDeptSelect(){
     $(document).on("click",'.deptItem',function(){
-        const deptItemName = $(this).attr("data-name")
+        const deptItemName = $(this).attr("data-name")||''
         const deptItemId = $(this).attr("data-id")
-        deptIdTemp =deptItemId
+        deptName =deptNameTemp=deptItemName
         if(deptItemName.length > 10){
             $('.selectDept').html(deptItemName.substring(0,8)+'...')
         }else{
             $('.selectDept').html(deptItemName)
         }
-        $('.selectDept ').attr('title',deptItemName)
+        $('.selectDept ').attr({'title':deptItemName,'data-id':deptItemName})
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
+        getmoduleTypeList('',deptItemName)
         $(".deptList").css("display", "none")
     })
 }
-
+$('.selectDept').on("click", function(e){
+  e.stopPropagation()
+  $(".levelList ").css("display","none")
+  $(".selectLevel .arrow").attr("src",iconDown)
+  const showList =  $(".deptList ").css("display")
+  console.log(showList=="none")
+  if(showList == "none" ||!showList){
+      console.log($(".deptList"))
+      $(".deptList").css("display","block")
+      $(".selectDept .arrow").attr("src",iconUp)
+  }else{
+      $(".deptList ").css("display", "none")
+      $(".selectDept .arrow").attr("src",iconDown)
+  }
+})
+function getDeptList(){
+  let str = ``
+  if(deptList.length<=0)return
+  deptName = deptNameTemp = deptList[0].deptName
+  $(".selectDept").attr("data-id",deptName).find("i").html(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>`
+  }
+  getmoduleTypeList('',deptName)
+  getTabData(1)
+  $(".deptList").html(str)
+}
 $("th[code]").on("click",function(e){
     const code=$(this).attr("code");
     if(data_asc[0]==code){
@@ -149,34 +187,9 @@ $("th[code]").on("click",function(e){
     }
     getTabData(1);
 });
-//全选绑定
 
-$('.selectDept').on("click", function(e){
-    e.stopPropagation()
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    const showList =  $(".deptList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".deptList ").css("display","block")
-        $(".selectDept .arrow").attr("src",iconUp)
-    }else{
-        $(".deptList ").css("display", "none")
-        $(".selectDept .arrow").attr("src",iconDown)
-    }
-})
 
-//科室处理
-// getDeptList()
-function getDeptList(){
-    let str = ``
-    if(deptList.length<=0)return
-    // $(".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]
-        str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
-    }
-    $(".singleVeto .filterDropList").html(str)
-}
+
 function getTabData(activePage){
     const dateStatrt = getPickerDate($("#datepicker"),1)
     const dateEnd = getPickerDate($("#datepicker2"),2)
@@ -606,8 +619,8 @@ function renderPagination(totalPage,activePage,totalNum){
 }
 
 $(document).on("click", function(){
-    // $(".moduleTypeList ").css("display", "none")
-    // $(".selectModuleType .arrow").attr("src",iconDown)
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
     $(".rejectList ").css("display","none")
     $(".usedList ").css("display", "none")
     $(".selectReject .arrow").attr("src",iconDown)
@@ -642,7 +655,7 @@ $(function() {
       casesName:casesName=='全部'?'':casesName, //模块Id
       isReject:isSingleReject, //是否单项否决
       name: name, //条目名
-      deptName: deptId, //科室名
+      deptName: deptName, //科室名
       "startDate":startDateParam,
       "endDate":endDateParam
     };