Merge remote-tracking branch 'origin/test'

src/js/itemDefectDetail.js

@@ -52,8 +52,8 @@ if(defectName){
 if(deptIdPram&&deptNamePram || from == 2 &&deptList.length > 0  ){
     deptIdTemp = deptIdPram
     deptId = deptIdPram
-    deptName = deptNamePram
-    if(from == 2){
+    deptName = deptNameTemp = deptNamePram
+    if(from == 2&&!deptNamePram){
         deptId =  deptIdTemp = deptList[0].deptId
         deptName = deptNameTemp = deptList[0].deptName
     }
@@ -95,13 +95,14 @@ $("#filterToggler").click(function(){
     }
     return false;
 }
-function getTabData(activePage){
+function getTabData(activePage,nameDe){
+    // console.log(activePage,nameDe,787878)
     const param = {
         current:activePage,
         behospitalCode: behospitalCode,
         patName: name, //病人姓名
         level:level,//病历等级
-        behDeptName: deptName,
+        behDeptName: nameDe||deptName,
         ascs:data_asc,     //升序
         descs:data_desc,       //降序
         startDate: behosDateStart, //出院日期--开始时间
@@ -149,7 +150,7 @@ $(".filter").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
-    console.log('deptNameTemp',deptNameTemp)
+    // console.log('deptNameTemp',deptNameTemp,deptName)
     name = nameTemp
     behospitalCode = behospitalCodeTemp
     level = levelTemp==="全部"?"":levelTemp
@@ -157,7 +158,7 @@ $(".filter").on("click", function(e){
     deptName = deptNameTemp==="全部"?"":deptNameTemp 
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
-    getTabData(1)
+    getTabData(1,deptName)
 })
 $(".abnormalClear").on("click", function(e){
     tabList = []; 
@@ -558,17 +559,15 @@ $(function() {
     $(".filter").click();   //初始查询
     if(from==2){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
-
     }else{
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
-
     }
     $(".partTitle .consoleD").click(function(){
         $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
         $(".container",parent.document).addClass("console-cont");
     })
     $(".partTitle .consoleP").click(function(){
-        $(parent.document).find("#contentIframe").attr("src",`./singleVeto.html?from=${from}`)
+        $(parent.document).find("#contentIframe").attr("src",`./singleVeto.html?from=${from}&fromThree=3`)
        
     })
 });

src/js/singleVeto.js

@@ -34,6 +34,7 @@ $(function(){
     casesName =casesNameTemp = getUrlArgObjectNew("model",srcUrl)||""
     let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+    let fromThree = getUrlArgObjectNew("fromThree",srcUrl)||""
     if(name){
         $(".moduleItemInp").attr("title",name).val(name)
         selectReject=1
@@ -55,6 +56,9 @@ $(function(){
         $(".partTitle a").attr("href","console.html").html("控制台 / ")
         $(".partTitle .pices span").html("条目缺陷占比")
     }
+    if(fromThree == 3){
+        deptName = deptList[0].deptName||'';
+    }
     $(".partTitle a").click(function(){
         //初始菜单选中
         $(".managerContainer").remove()
@@ -164,8 +168,7 @@ function getTabData(activePage){
         return
     }
     startDateParam=dateStatrt
-    endDateParam=dateEnd
-    // let deptName = from == 2&&deptList.length > 0 ? deptList[0].deptName : '';                                                                                                                                                                                                                                                                                                                                   
+    endDateParam=dateEnd                                                                                                                                                                                                                                                                                                                                  
     const param = {
         current:activePage,
         type: 0,
@@ -236,6 +239,7 @@ $(".moduleItemInp").on("input", function(e){
     nameTemp = val
 })
 $(".filter").on("click", function(e){
+    console.log(deptName,848654165456456)
     casesId = casesIdTemp, name = nameTemp, isReject = isRejectTemp, isUsed = isUsedTemp,deptId = deptIdTemp,isSingleReject = isSingleRejectTemp,casesName = casesNameTemp 
     getTabData(1)
 })
@@ -320,7 +324,7 @@ function goDetail(data){
         let defectName = $(this).attr("data-name")
         const item = data[index]
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src",`./itemDefectDetail.html?defectName=${defectName}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}`)
+        $(parent.document).find("#contentIframe").attr("src",`./itemDefectDetail.html?defectName=${defectName}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}&deptName=${deptName}&deptId=${deptName}`)
     })
 }