Merge branch 'version1.3.8' into test

src/js/qcListCopy.js

@@ -92,7 +92,7 @@ if(from==2){
     // $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷详情 / </a>病历详情`)
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html?from=1">病案首页合格率占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷详情 / </a>病历详情`)
     $(".defectDetail").on("click",function(){
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptNamePram+"&deptId="+deptIdPram+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam) 
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+`${deptNamePram=="全部" ?"全院":deptNamePram}`+"&deptId="+deptIdPram+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam) 
     })
 }else{
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
@@ -143,7 +143,8 @@ function getTabData(activePage){
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
         endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
         casesEntryName: casesEntryName,
-        casesEntryId:casesEntryId,
+        casesEntryId:"",
+        casesId:casesId,
         size: 15,
         ruleType:ruleType,
         isReject: isSingleReject,
@@ -1151,7 +1152,8 @@ $(function($){
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             casesEntryName: casesEntryName,
-            casesEntryId:casesEntryId,
+            casesEntryId:"",
+            casesId:casesId,
             isReject: isSingleReject,
             doctorName: doctorName,
             doctorId: doctorNum,

src/js/singleVeto.js

@@ -302,12 +302,12 @@ function renderTab(data,activePage){
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         str += `
-            <tr data-id=${item.id} data-index=${i}>
+            <tr data-id=${item.id} data-caseId=${item.caseId} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td class="textCenter">${item.casesName||'-'}</td>
                 <td data-name=${item.name} class="goDetail">${item.name||'-'}</td>
                 <td  class="textCenter">${item.score+''||'-'}</td>
-                <td  class="textCenter">${item.isReject == '1'?'是':'否'}</td>
+                <td  class="textCenter" >${item.isReject == '1'?'是':'否'}</td>
                 <td data-name=${item.name} class="textCenter goDetail">${item.num+''||'-'}</td>
                 <td  class="textCenter">${item.percentStr||'-'}</td>
             </tr>
@@ -324,9 +324,10 @@ function goDetail(data){
         const index = $(this).parent().attr("data-index")
         let defectName = $(this).attr("data-name")
          let defectId = $(this).parent().attr("data-id")
+         let caseId = $(this).parent().attr("data-caseId")
         const item = data[index]
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src",`./qcListCopy.html?defectName=${defectName}&defectId=${defectId}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}&deptName=${deptName}&deptId=${deptName}`)
+        $(parent.document).find("#contentIframe").attr("src",`./qcListCopy.html?defectName=${defectName}&caseId=${caseId} &defectId=${defectId}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}&deptName=${deptName}&deptId=${deptName}`)
     })
 }