Merge branch 'lcq' into test

src/js/deptScoreDetailControl.js

@@ -200,7 +200,7 @@ function renderTab(data,hisId,activePage){
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 ${hospital=='台州市立'?('<td >'+(item.deptClass?(item.deptClass+'系统'):"-")+'</td>'):''}
                 <td >${item.deptName || "-"}</td>
-                <td class="goHomeDetailQuexian goHomeDetail" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
+                <td class="goHomeDetailQuexian goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}">${item.entryNum || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
                 <td >${item.mrNum || "-"}</td>
                 <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="甲">${item.firstLevelNum+'' || "-"}</td>
@@ -216,8 +216,9 @@ function renderTab(data,hisId,activePage){
     bindScoreDetail(hisId)
     $(".goHomeDetailQuexian").click(function(){
         let deptName = $(this).attr("data-dept")
+        let deptId = $(this).attr("dept-id")
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
+        $(parent.document).find("#contentIframe").attr("src", "quexianDetailControl.html?deptName=" + deptName+"&deptId=" + deptId +"&from=2"+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
     $(".goHomeDetailB").click(function(){
         let deptName = $(this).attr("data-dept")

src/js/qcListCopy.js

@@ -219,7 +219,10 @@ function getTabData(activePage){
         mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     if (from == 9) {
-        param = { ...param, behDeptName: deptNamePram}
+        if (deptName ==="全部"){
+            deptName = ''
+        }
+        param = { ...param, behDeptName: deptName}
     }
     if (from == 7) {
         param = { ...param, checkStatus: 1 }
@@ -346,7 +349,7 @@ $(".abnormalClear").on("click", function(e){
         deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
         deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
     }
-    if(from == 4){
+    if (from == 4 || from == 9){
         deptIdTemp = deptIdPram = deptIdPram
         deptName = deptNameTemp = deptNamePram
     }
@@ -394,7 +397,7 @@ $(".abnormalClear").on("click", function(e){
     }).datepicker( "setDate","");
     if(from == 2){
         $('.selectDept ').html(deptListDept[0].deptName)
-    }else if(from == 4){
+    } else if (from == 4 || from == 9){
         if(deptNamePram.length > 10){
             $('.selectDept').html(deptNamePram.substring(0,8)+'...')
         }else{
@@ -1300,7 +1303,10 @@ $(function($){
         let exportURL = formatExportUrl(from)
         // console.log(exportURL,'exportURL导出接口');
         if (from == 9) {
-            param = { ...param, behDeptName: deptNamePram }
+            if (deptName === "全部") {
+                deptName = ''
+            }
+            param = { ...param, behDeptName: deptName }
         }
         if (from == 7) {
             param = { ...param, checkStatus: 1 }

src/js/quexianDetailControl.js

@@ -16,14 +16,16 @@ $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+let srcUrl = $("#contentIframe", parent.document).attr("src")
 let deptList = []
 let isPlacefile = getCookie('isPlacefile')||1
-
+let deptPushId = getUrlArgObjectNew("deptId", srcUrl) || ""
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     deptId = deptIdTemp = getUrlArgObjectNew("caseName",srcUrl)||""
+    
     from = getUrlArgObjectNew("from",srcUrl)||""
     isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
@@ -316,7 +318,7 @@ function renderTab(data,activePage){
         let index = $(this).parent().attr("data-index")
         let casesId = $(this).attr("data-id")
         let defectName = data[index].name
-        $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=9&casesId=" + casesId + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
+        $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptPushId + "&from=9&casesId=" + casesId + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
         // $(parent.document).find("#contentIframe").attr("src", "uccDetail.html?from=3&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam)
     })
 }