bug修改

src/js/console.js

@@ -1962,7 +1962,7 @@ function queList(data){
     let strAll = '',tmp = `mm
         <tr class="thead">
         <td class="td01">排名</td>
-        <td class="td02">缺陷详情</td>
+        <td class="td02">模块名称</td>
         <td class="td04">缺陷占比</td>
         </tr>`
     if(data.length == 0){

src/js/dept/checkControlDept.js

@@ -26,8 +26,10 @@ $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
     deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    let from = getUrlArgObjectNew("from",srcUrl)||""
     let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+
     if(statisticsType == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -54,6 +56,14 @@ $(function(){
     if(!statisticsType){
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
+    console.log(from,1111111)
+    // if(from == 2){
+    //     deptId=deptIdTemp = deptList[0]&&deptList[0].deptName
+    //     $(".selectDept").html(deptId).attr({
+    //         "data-id":deptId,
+    //         "title":deptId
+    //     }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    // }
     if(deptId){
         $(".selectDept").html(deptId).attr({
             "data-id":deptId,

src/js/dept/deptScoreDetailControlDept.js

@@ -250,7 +250,7 @@ function renderTab(data,hisId,activePage){
     for(let i = 0; i <data.length; i++){
         const item = data[i]
         str += `
-            <tr  data-index=${i}>
+            <tr  data-index=${i} data-doc="${item.doctorName}">
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td >${item.doctorName || "-"}</td>
                 <td class="goHomeDetailQuexian goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}">
@@ -308,16 +308,17 @@ function renderTab(data,hisId,activePage){
     $('.deptScoreDetailControlTable table').html(str?tHead+'<tbody>'+str+'</tbody>':tHead+`<tbody>${emptyBox()}</tbody>`)
     bindScoreDetail(hisId)
     $(".goHomeDetailQuexian").click(function(){
-        // let deptName = $(this).attr("data-dept")
+        let doctorName = $(this).parent().attr("data-doc")
         let deptId = $(this).attr("dept-id")
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src", "quexianDetailControlDept.html?deptName=" + deptName+"&deptId=" + deptId +"&from=2"+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
+        $(parent.document).find("#contentIframe").attr("src", "quexianDetailControlDept.html?deptName=" + deptName+"&doctorName="+doctorName+"&deptId=" + deptId +"&from=2"+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
     $(".goHomeDetailB").click(function(){
+        let doctorName = $(this).parent().attr("data-doc")
         let deptC = $(this).attr("data-c")
         let deptIds = $(this).attr("dept-id")
         focusMenuItem("YH-BLZK-ZKPF");
-        $(parent.document).find("#contentIframe").attr("src","qcListDept.html?deptName="+deptName+"&from=2"+"&shijian=3&chengdu="+deptC+"&deptId="+deptIds+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
+        $(parent.document).find("#contentIframe").attr("src","qcListDept.html?deptName="+deptName+"&doctorName="+doctorName+"&from=2"+"&shijian=3&chengdu="+deptC+"&deptId="+deptIds+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
     // initScroll("deptScoreDetailControl","YX",1)
 }

src/js/dept/qcListCopyDept.js

@@ -117,15 +117,15 @@ if(from==2){
     })
 } else if (from == 8 || from == 7) {
     // 来自 质控核查统计的跳转
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="checkControlDept.html?from=1">质控核查统计 / </a>病历列表`)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="checkControlDept.html?from=2">质控核查统计 / </a>病历列表`)
     $(".defectDetail").on("click", function () {
         $(parent.document).find("#contentIframe").attr("src", "checkControlDept.html?deptName=" + `${deptNamePram == "全部" ? "全院" : deptNamePram}` + "&deptId=" + deptIdPram + "&from=1&" + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
     })
 } else if (from == 6) {
     // 来自 质控核查统计的跳转 ---改善数量的跳转
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台 / </a><a class="consoleP" href="checkControlDept.html?from=1">质控核查统计 / </a>病历列表`)
-    $(".defectDetail").on("click", function () {
-        $(parent.document).find("#contentIframe").attr("src", "checkControlDept.html?deptName=" + `${deptNamePram == "全部" ? "全院" : deptNamePram}` + "&deptId=" + deptIdPram + "&from=1&" + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP initCheckControlDept" href="checkControlDept.html?from=2">质控核查统计 / </a>病历列表`)
+    $(".initCheckControlDept").on("click", function () {
+        $(parent.document).find("#contentIframe").attr("src", "checkControlDept.html?&from=2")
     })
 }else{
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>病历列表`)
@@ -368,7 +368,7 @@ $(".abnormalClear").on("click", function(e){
         deptName=deptListDept[0]&&deptListDept[0].deptName;
         deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
         deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
-        $('.selectDept').html('全部').append(`<img class="arrow" src=${iconDown} alt="下拉">`);
+        $('.selectDept').html(deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`);
     }
     if (from == 4 || from == 9 || from == 8){
         deptIdTemp = deptIdPram = deptIdPram
@@ -417,7 +417,7 @@ $(".abnormalClear").on("click", function(e){
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
-    if(from == 2||from==3){
+    if(from == 2||from==3||from==10){
         $('.selectDept ').html(deptListDept[0].deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`);
         deptName = deptNameTemp = deptListDept[0].deptName
     } else if (from == 4 || from == 9 || from == 8){

src/js/dept/qcListCopyUnqualifiedDept.js

@@ -353,7 +353,7 @@ $(".abnormalClear").on("click", function(e){
     }).datepicker( "setDate","");
     if(from == 2){
         deptName = deptNameTemp = deptListDept[0].deptName
-        $('.selectDept ').val(deptListDept[0].deptName)
+        $('.selectDept ').html(deptName)
     } else if (from == 4 || from == 9){
         deptName = deptNameTemp = deptNamePram
         $('.selectDept').val(deptNamePram)
@@ -699,9 +699,23 @@ function bindDeptSelect(){
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         
         $(".deptList").css("display", "none")
-        getmoduleTypeList('',deptItemId)
+        // getmoduleTypeList('',deptItemId)
     })
 }
+getDeptList()
+function getDeptList(){
+    let str = ``
+    if(deptListDept.length<=0)return
+    deptName = deptNameTemp = deptListDept[0].deptName
+    $(".selectDept ").attr("data-id",deptName).find("i").html(deptName)
+    for(let i = 0;i < deptListDept.length;i++){
+        let tmp = deptListDept[i]
+        str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
+    }
+    $(".deptList").html(str)
+    // getmoduleTypeList('',deptName)
+    getTabData(1)
+}
 function loading(){
     const str = `
     <div class="loadingBox">

src/js/dept/quexianDetailControlDept.js

@@ -11,7 +11,7 @@ const iconUp = require("@images/arrow_up.png")
 const arrowLeft= require("@images/arrow_left.png")
 const arrowRight = require("@images/arrow_right.png")
 listenScroll('.quexianDetailControl')
-let casesId="", name="", isReject ="",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="",deptName="",data_asc=[],data_desc=["casesName"],doctorName="", isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -27,6 +27,7 @@ $(function(){
     deptId = deptIdTemp = getUrlArgObjectNew("caseName",srcUrl)||""
     
     from = getUrlArgObjectNew("from",srcUrl)||""
+    doctorName = getUrlArgObjectNew("doctorName",srcUrl)||""
     isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
@@ -57,7 +58,7 @@ $(function(){
     }
     $(".selectDepts").html(deptName)
     // if(from == 1){
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetailControlDept.html?from=2">科室缺陷占比 / </a>缺陷列表`)
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台(科室) / </a><a class="consoleP" href="deptScoreDetailControlDept.html?from=2">科室缺陷占比 / </a>缺陷列表`)
         $(".partTitle .consoleD").click(function(){
             $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
             $(".container",parent.document).addClass("console-cont");
@@ -169,7 +170,7 @@ function getTabData(activePage){
         current:activePage,
         type: 0,//1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         name: name, //条目名
-        doctorName:"",
+        doctorName:doctorName,
         casesName:deptId,
         deptName:deptName=="全院"?"":(deptName||""),
         casesId:casesIds||"",
@@ -594,7 +595,7 @@ $(function() {
         const param = {
             type: 0,//1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
             name: name, //条目名
-            doctorName:"",
+            doctorName:doctorName,
             casesName:deptId,
             deptName:deptName=="全院"?"":(deptName||""),
             casesId:casesIds||"",

src/js/deptConsole.js

@@ -925,7 +925,7 @@ function queList(data){
     let strAll = '',tmp = `mm
         <tr class="thead">
         <td class="td01">排名</td>
-        <td class="td02">缺陷详情</td>
+        <td class="td02">模块名称</td>
         <td class="td04">缺陷占比</td>
         </tr>`
     if(data.length == 0){