首页 发现 帮助
注册 登录
front
/
AIPlatform
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'version1.3.5_zxc' into test

zhangxc 5 年之前
父节点
4facd85573 87d52782cf
当前提交
195465aac2
共有 6 个文件被更改，包括 60 次插入 和 30 次删除
合并视图 显示文件统计
  1. 2 2
      src/html/quexianDetail.html
  2. 1 1
      src/html/singleVeto.html
  3. 1 1
      src/js/api.js
  4. 1 1
      src/js/assertTypeDetail.js
  5. 44 21
      src/js/itemDefectDetail.js
  6. 11 4
      src/js/singleVeto.js

+ 2 - 2
src/html/quexianDetail.html
查看文件 

@@ -13,10 +13,10 @@
 
     <div class="managerContainer quexianDetail">
 
     <div class="managerContainer quexianDetail">
 
         <div class="partTitle">
 
         <div class="partTitle">
 
           <p class="titlePic"></p>
 
           <p class="titlePic"></p>
 
-          <div class="monthYear">
 
+          <!-- <div class="monthYear">
 
             <span class="mon">本月</span>
 
             <span class="mon">本月</span>
 
             <span class="year">本年</span>
 
             <span class="year">本年</span>
 
-          </div> 
+          </div>  -->
 
           <div class="dateDetail fr">
 
           <div class="dateDetail fr">
 
             
             
           </div>
 
           </div>

+ 1 - 1
src/html/singleVeto.html
查看文件 

@@ -12,7 +12,7 @@
 
 <body>
 
 <body>
 
     <div class="managerContainer tiaomu singleVeto">
 
     <div class="managerContainer tiaomu singleVeto">
 
         <div class="partTitle">
 
         <div class="partTitle">
 
-          <p class="pices"><a href="console.html">控制台 / </a><span>条目缺陷占比</span></p>
 
+          <p class="pices"><a > </a><span></span></p>
 
           <!-- <div class="monthYear">
 
           <!-- <div class="monthYear">
 
             <span class="mon">本月</span>
 
             <span class="mon">本月</span>
 
             <span class="year">本年</span>
 
             <span class="year">本年</span>

+ 1 - 1
src/js/api.js
查看文件 

@@ -87,7 +87,7 @@ const api = {
 
     entryRejectPercent:'/console/entryRejectPercent',//单项否决占比
 
     entryRejectPercent:'/console/entryRejectPercent',//单项否决占比
 
     qcResultLevelPercent:'/console/qcResultLevelPercent',//各科室甲乙丙级占比
 
     qcResultLevelPercent:'/console/qcResultLevelPercent',//各科室甲乙丙级占比
 
     qcResultDefectList:'/console/qcResultShortPage',//条目缺陷质控评分
 
     qcResultDefectList:'/console/qcResultShortPage',//条目缺陷质控评分
 
-
 
+    qcResultDefectListDept:'/consoleByDept/qcResultShortByDeptPage',//条目缺陷质控评分(科室)
 
     getQcListPageSet:'/sys/user/pageset/getPageSet',
 
     getQcListPageSet:'/sys/user/pageset/getPageSet',
 
     saveQcListPageSet:'/sys/user/pageset/savePageSet',
 
     saveQcListPageSet:'/sys/user/pageset/savePageSet',
 
 }
 
 }

+ 1 - 1
src/js/assertTypeDetail.js
查看文件 

@@ -18,7 +18,7 @@ $(function(){
 
 })
 
 })
 
 function setInpWidth(){
 
 function setInpWidth(){
 
     const winWidth = $(window).width()
 
     const winWidth = $(window).width()
 
-    $('.patientNumInp').css('width', winWidth-153-15 +'px')
 
+    $('.patientNumInp').css('width', winWidth-155-15 +'px')
 
 }
 
 }
 
 setInpWidth()
 
 setInpWidth()
 
 $(window).resize(function(){
 
 $(window).resize(function(){

+ 44 - 21
src/js/itemDefectDetail.js
查看文件 

@@ -24,6 +24,9 @@ let docName = getUrlArgObjectNew("docName",srcUrl)||""
 
 let startDateParam =  getUrlArgObjectNew("startDate",srcUrl)||""
 
 let startDateParam =  getUrlArgObjectNew("startDate",srcUrl)||""
 
 let endDateParam =  getUrlArgObjectNew("endDate",srcUrl)||""
 
 let endDateParam =  getUrlArgObjectNew("endDate",srcUrl)||""
 
 let defectName = getUrlArgObjectNew("defectName",srcUrl)||""
 
 let defectName = getUrlArgObjectNew("defectName",srcUrl)||""
 
+let from = getUrlArgObjectNew("from",srcUrl)||""
 
+let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||""
 
+let deptList = JSON.parse(getCookie("deptList"))||[]
 
 
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
@@ -46,16 +49,20 @@ if(defectName){
 
     casesEntryName=defectName
 
     casesEntryName=defectName
 
     $('.selectDefect').html(casesEntryName)
 
     $('.selectDefect').html(casesEntryName)
 
 }
 
 }
 
-if(deptIdPram&&deptNamePram){
 
+if(deptIdPram&&deptNamePram || from == 2 &&deptList.length > 0  ){
 
     deptIdTemp = deptIdPram
 
     deptIdTemp = deptIdPram
 
     deptId = deptIdPram
 
     deptId = deptIdPram
 
     deptName = deptNamePram
 
     deptName = deptNamePram
 
-    if(deptNamePram.length > 10){
 
-        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
 
+    if(from == 2){
 
+        deptId =  deptIdTemp = deptList[0].deptId
 
+        deptName = deptNameTemp = deptList[0].deptName
 
+    }
 
+    if(deptName.length > 10){
 
+        $('.selectDept').html(deptName.substring(0,8)+'...')
 
     }else{
 
     }else{
 
-        $('.selectDept').html(deptNamePram)
 
+        $('.selectDept').html(deptName)
 
     }
 
     }
 
-    $('.selectDept ').attr('title',deptNamePram)
 
+    $('.selectDept ').attr('title',deptName)
 
     $(".deptList").css("display", "none")
 
     $(".deptList").css("display", "none")
 
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
 }
 
 }
 
@@ -101,8 +108,9 @@ function getTabData(activePage){
 
         endDate: behosDateEnd, //出院日期--结束时间
 
         endDate: behosDateEnd, //出院日期--结束时间
 
         casesEntryName: casesEntryName,
 
         casesEntryName: casesEntryName,
 
         size: pageSize,
 
         size: pageSize,
 
+        isReject: isSingleReject
 
     }
 
     }
 
-    post(api.qcResultDefectList,param).then(res =>{
 
+    post(from==2?api.qcResultDefectListDept:api.qcResultDefectList,param).then(res =>{
 
         if(res.data.code == '0'){
 
         if(res.data.code == '0'){
 
             const data = res.data.data;
 
             const data = res.data.data;
 
             currentPage = data.current;
 
             currentPage = data.current;
 
@@ -168,8 +176,12 @@ $(".abnormalClear").on("click", function(e){
 
     doctorNum=""; 
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
     doctorNumTemp=""; 
-    data_desc=[]; 
+    data_desc=["leaveHospitalDate"];
 
     data_asc=[];
 
     data_asc=[];
 
+    if(from == 2){
 
+        deptId =  deptIdTemp = deptList[0].deptId
 
+        deptName = deptNameTmp = deptList[0].deptName
 
+    }
 
     $('.patientNumInp').val('')
 
     $('.patientNumInp').val('')
 
     $('.patientNameInp').val('')
 
     $('.patientNameInp').val('')
 
     $('.doctorInp').val('')
 
     $('.doctorInp').val('')
 
@@ -178,17 +190,12 @@ $(".abnormalClear").on("click", function(e){
 
     // $('#datepicker').val('')
 
     // $('#datepicker').val('')
 
     // $('#datepicker2').val('')
 
     // $('#datepicker2').val('')
 
     //默认日期为近一个月
 
     //默认日期为近一个月
 
-    $( "#datepicker" ).datepicker({
 
-        changeMonth: true,
 
-        changeYear: true,
 
-        dateFormat:"yy/mm/dd",
 
-    }).datepicker( "setDate", "-6d");
 
-    $( "#datepicker2" ).datepicker({
 
-        changeMonth: true,
 
-        changeYear: true,
 
-        dateFormat:"yy/mm/dd"
 
-    }).datepicker( "setDate",new Date());
 
-    $('.selectDept ').html('全部')
 
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
 
+    if(from == 2){
 
+        $('.selectDept ').html('全部') 
+    }else{
 
+        $('.selectDept ').html(deptName) 
+    }
 
     $(".deptList").css("display", "none")
 
     $(".deptList").css("display", "none")
 
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
     // $('.selectDept ').addClass('unSelect')
 
     // $('.selectDept ').addClass('unSelect')
 
@@ -352,6 +359,10 @@ $('.selectDept').on("click", function(e){
 
 //获取科室列表
 
 //获取科室列表
 
 getDeptList()
 
 getDeptList()
 
 function getDeptList(){
 
 function getDeptList(){
 
+    if(from == 2){
 
+        rendeDeptList(deptList)
 
+        return
 
+    }
 
     post(api.getDeptList,{inputStr:""}).then(res =>{
 
     post(api.getDeptList,{inputStr:""}).then(res =>{
 
         if(res.data.code == '0'){
 
         if(res.data.code == '0'){
 
            const  deptList = res.data.data
 
            const  deptList = res.data.data
 
@@ -364,7 +375,13 @@ function getDeptList(){
 
 
 
 
 
 function rendeDeptList(deptList){
 
 function rendeDeptList(deptList){
 
-    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
 
+    let str
 
+    if(from == 2){
 
+        str = ``;
 
+    } else{
 
+        str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
 
+    }
 
+     
     for(let i = 0; i < deptList.length; i++){
 
     for(let i = 0; i < deptList.length; i++){
 
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
 
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
 
     }
 
     }
 
@@ -539,13 +556,19 @@ $(function() {
 
         dateFormat:"yy/mm/dd"
 
         dateFormat:"yy/mm/dd"
 
     }).datepicker( "setDate",endDate);
 
     }).datepicker( "setDate",endDate);
 
     $(".filter").click();   //初始查询
 
     $(".filter").click();   //初始查询
 
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?form=1">条目缺陷占比 / </a>缺陷详情`)
 
+    if(from==2){
 
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="singleVeto.html?form=1">条目缺陷占比 / </a>缺陷详情`)
 
+
 
+    }else{
 
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?form=1">条目缺陷占比 / </a>缺陷详情`)
 
+
 
+    }
 
     $(".partTitle .consoleD").click(function(){
 
     $(".partTitle .consoleD").click(function(){
 
         $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
 
         $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
 
         $(".container",parent.document).addClass("console-cont");
 
         $(".container",parent.document).addClass("console-cont");
 
     })
 
     })
 
     $(".partTitle .consoleP").click(function(){
 
     $(".partTitle .consoleP").click(function(){
 
-        $(parent.document).find("#contentIframe").attr("src",`./singleVeto.html?from=1`)
 
+        $(parent.document).find("#contentIframe").attr("src",`./singleVeto.html?from=${form}`)
 
        
        
     })
 
     })
 
 });
 
 });

+ 11 - 4
src/js/singleVeto.js
查看文件 

@@ -46,6 +46,10 @@ $(function(){
 
     }
 
     }
 
     if(from == 2){
 
     if(from == 2){
 
         $(".partTitle a").attr("href","deptConsole.html").html("控制台(科室) / ")
 
         $(".partTitle a").attr("href","deptConsole.html").html("控制台(科室) / ")
 
+        $(".partTitle .pices span").html("条目缺陷占比")
 
+    }else{
 
+        $(".partTitle a").attr("href","console.html").html("控制台 / ")
 
+        $(".partTitle .pices span").html("条目缺陷占比")
 
     }
 
     }
 
     $(".partTitle a").click(function(){
 
     $(".partTitle a").click(function(){
 
         //初始菜单选中
 
         //初始菜单选中
 
@@ -157,6 +161,7 @@ function getTabData(activePage){
 
     }
 
     }
 
     startDateParam=dateStatrt
 
     startDateParam=dateStatrt
 
     endDateParam=dateEnd
 
     endDateParam=dateEnd
 
+    let deptName = from == 2&&deptList.length > 0 ? deptList[0].deptName : '';
 
     const param = {
 
     const param = {
 
         current:activePage,
 
         current:activePage,
 
         type: 0,
 
         type: 0,
 
@@ -164,7 +169,7 @@ function getTabData(activePage){
 
         casesName:casesName=='全部'?'':casesName, //模块Id
 
         casesName:casesName=='全部'?'':casesName, //模块Id
 
         isReject:isSingleReject, //是否单项否决
 
         isReject:isSingleReject, //是否单项否决
 
         name: name, //条目名
 
         name: name, //条目名
 
-        deptName: deptId, //科室名
 
+        deptName: deptName, //科室名
 
         size: 15,
 
         size: 15,
 
         "startDate":dateStatrt,
 
         "startDate":dateStatrt,
 
         "endDate":dateEnd
 
         "endDate":dateEnd
 
@@ -302,14 +307,16 @@ function renderTab(data,activePage){
 
     }
 
     }
 
     $('tbody').html(str?str:emptyBox())
 
     $('tbody').html(str?str:emptyBox())
 
     bindEdit(data,activePage)
 
     bindEdit(data,activePage)
 
-    goDetail()
 
+    goDetail(data)
 
 }
 
 }
 
 
 
-function goDetail(){
 
+function goDetail(data){
 
     $(".goDetail").click(function(){
 
     $(".goDetail").click(function(){
 
+        const index = $(this).parent().attr("data-index")
 
         let defectName = $(this).attr("data-name")
 
         let defectName = $(this).attr("data-name")
 
+        const item = data[index]
 
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
 
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
 
-        $(parent.document).find("#contentIframe").attr("src",`./itemDefectDetail.html?defectName=${defectName}&startDate=${startDateParam}&endDate=${endDateParam}`)
 
+        $(parent.document).find("#contentIframe").attr("src",`./itemDefectDetail.html?defectName=${defectName}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}`)
 
     })
 
     })
 
 }
 
 }