luolei 5 rokov pred
rodič
commit
e4c499b9fe

+ 17 - 0
src/css/common.less

@@ -20,6 +20,23 @@ input:disabled {
     box-sizing: border-box;
 }
 
+.exportData{
+    display: inline-block;
+    width:60px;
+    height:34px;
+    line-height: 34px;
+    background: #fff;
+    border-radius: 4px;
+    color: #777;
+    text-align: center;
+    border: 1px solid #777;
+    box-sizing: border-box;
+    cursor: pointer;
+    margin-left: 10px;
+    float: left;
+    top: 0px;
+}
+
 th[code]{
     cursor: pointer;
     &:after{

+ 1 - 0
src/html/dayDetail.html

@@ -46,6 +46,7 @@
                 </span> -->
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
+                <span class="exportData">导出</span>
             </div>
             <div>
                 <table class="tableDay">

+ 1 - 1
src/html/itemDefectDetail.html

@@ -51,8 +51,8 @@
                         </ul>
                     </span>
                     <span class="filter">查询</span>
-                    <!-- <span class="export">导出</span> -->
                     <span class="filterclear abnormalClear filterclearT">重置</span>
+                    <span class="exportData">导出</span>
                 </div>
                 <a href="javascript:void(0);" class="filter-toggler down" id="filterToggler">收起筛选</a>
                 <div class="toggle-item clearfix">

+ 1 - 0
src/html/jiaji.html

@@ -35,6 +35,7 @@
                 </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
+                <span class="exportData">导出</span>
             </div>
             <div>
                 <table>

+ 1 - 0
src/html/mukuaiControl.html

@@ -45,6 +45,7 @@
                 </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
+                <span class="exportData">导出</span>
             </div>
             <table>
                 <thead>

+ 1 - 0
src/html/payDetail.html

@@ -47,6 +47,7 @@
                 
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
+                <span class="exportData">导出</span>
             </div>
             <div>
                 <table class="tableDay">

+ 1 - 0
src/html/quexianDetailControl.html

@@ -52,6 +52,7 @@
                 </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
+                <span class="exportData">导出</span>
             </div>
             <table>
                 <thead>

+ 1 - 0
src/html/quexianDetailControlHome.html

@@ -48,6 +48,7 @@
                 </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
+                <span class="exportData">导出</span>
             </div>
             <table>
                 <thead>

+ 9 - 0
src/js/api.js

@@ -92,6 +92,15 @@ const api = {
     qcResultDefectListDept:'/consoleByDept/qcResultShortByDeptPage',//条目缺陷质控评分(科室)
     getQcListPageSet:'/sys/user/pageset/getPageSet',
     saveQcListPageSet:'/sys/user/pageset/savePageSet',
+
+    //导出接口
+    exportMukuai:'/qc/behospitalInfo/exportQcresult',//各模块缺陷占比导出
+    exportHomeAverage:'/qc/behospitalInfo/exportQcresult',//病案首页合格率占比-缺陷详情
+    exportTiaomuDetail:'/qc/behospitalInfo/exportQcresult',//条目缺陷占比-缺陷详情
+    getAverageDayNumExport:'/console/export/getAverageDayNumExport',//科室平均住院天数
+    getAverageFeeExport:'/console/export/getAverageFeeExport',//科室平均住院花费
+    levelPercentGroupByDeptExport:'/console/export/levelPercentGroupByDeptExport',//各科室甲级占比
+    entryCountGroupByEntryExport:'/console/export/entryCountGroupByEntryExport',//各科室缺陷详情,病案首页详情
 }
 module.exports = {
     api

+ 1 - 3
src/js/console.js

@@ -270,10 +270,8 @@ function getAverageScoreLis(){
     let url = ''
     if(hospital=="台州市立"&&hasData('FUNC000091')){
         url = api.getAverageScoreByDeptClass
-    }else if(hospital=="长兴医院"&&hasData('FUNC000047')){
-        url = api.getAverageScore
     }else{
-        return
+        url = api.getAverageScore
     }
     post(url,{//各科室质控平均分
         "type": dateType||1,//1月2年

+ 13 - 3
src/js/dayDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/dayDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,expJson,downloadExportedData} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -566,5 +566,15 @@ $(document).on("click", function(){
     
 })
 
-$((function($){
-})($));
+$(function($){
+    $('.exportData').click(function(){
+        const param = {
+            name: behospitalCode||"",
+            type: statisticsType||2, //1-本月,2-本年
+            dateType: "",//(3-上月,4-去年本月,5-去年(必填))
+        }
+        expJson(api.getAverageDayNumExport,param).then(res =>{
+            downloadExportedData(res.data, "科室平均住院天数.xls")
+        })
+    })
+});

+ 5 - 8
src/js/deptScoreDetailControl.js

@@ -585,10 +585,8 @@ $(function() {
         $(this).parent().find("input").focus()
     });
   $('.export').click(function(){
-    const dateStatrt = getPickerDate($("#datepicker"),1)
-    const dateEnd = getPickerDate($("#datepicker2"),2)
-    const start = new Date(dateStatrt).getTime()
-    const end = new Date(dateEnd).getTime()
+    const start = new Date(startDateParam).getTime()
+    const end = new Date(endDateParam).getTime()
     if(start > end){
       $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
       return
@@ -599,13 +597,12 @@ $(function() {
       "name": behospitalCode||"",
       "deptClass": deptId||'',
       "type": statisticsType||2, //1-本月,2-本年
-      "startDate":dateStatrt,
-      "endDate":dateEnd
+      "startDate":startDateParam,
+      "endDate":endDateParam
     };
     const url = hospital == '台州市立'?api.exportDeptFlawsTz:api.exportDeptFlaws;
     expJson(url,param).then(res =>{
-      downloadExportedData(res.data, dateStatrt.slice(0,10).replace(/-/g,"")+"-"+dateEnd.slice(0,10).replace(/-/g,"")+"各科室缺陷占比.xls")
+      downloadExportedData(res.data, "各科室缺陷占比.xls")
     })
-
   })
 });

+ 23 - 20
src/js/itemDefectDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/itemDefectDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker,getPickerDate } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -177,7 +177,7 @@ $(".abnormalClear").on("click", function(e){
     deptId=""; 
     deptIdTemp="";  
     deptName="";
-    deptNameTmp="";
+    deptNameTemp="";
     doctorName=""; 
     doctorNum=""; 
     doctorNameTemp=""; 
@@ -186,7 +186,7 @@ $(".abnormalClear").on("click", function(e){
     data_asc=[];
     if(from == 2){
         deptId =  deptIdTemp = deptList[0].deptId
-        deptName = deptNameTmp = deptList[0].deptName
+        deptName = deptNameTemp = deptList[0].deptName
     }
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -646,26 +646,29 @@ $(document).on("click", function(){
     $(".selectLevel .arrow").attr("src",iconDown)
     
 })
-$((function($){
-
-    $('.export').click(function(){
-        if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > 7){
-            $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+$(function(){
+    $('.exportData').click(function(){
+        const start = new Date(behosDateStart).getTime()
+        const end = new Date(behosDateEnd).getTime()
+        if(start > end){
+            $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
         const param = {
-            "behospitalCode": behospitalCode,
-            "deptId": deptId,
-            "doctorCode":doctorNum,
-            "doctorName": doctorName,
-            "leaveHosDateEnd": '2020-04-03 00:00:00'||behosDateEnd,
-            "leaveHosDateStart": '2020-04-01 00:00:00'||behosDateStart,
-            "level": 2||level,
-            "name": name
+            behospitalCode: behospitalCode,
+            patName: name, //病人姓名
+            level:level,//病历等级
+            behDeptName: deptName,
+            ascs:data_asc,     //升序
+            descs:data_desc,       //降序
+            startDate: behosDateStart, //出院日期--开始时间
+            endDate: behosDateEnd, //出院日期--结束时间
+            casesEntryName: casesEntryName,
+            casesEntryId:casesId,
+            isReject: isSingleReject
         }
-        expJson(api.exportQcList,param).then(res =>{
-            downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")
+        expJson(api.exportTiaomuDetail,param).then(res =>{
+            downloadExportedData(res.data, $(".consoleP").html()+"缺陷详情.xls")
         })
-      
     })
-})($));
+});

+ 22 - 2
src/js/jiaji.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/jiaji.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate,expJson,downloadExportedData} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -17,7 +17,7 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",startDateParam="",endDateParam="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -128,6 +128,8 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(api.levelPercentGroupByDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
@@ -577,4 +579,22 @@ $(function() {
     $('.iconCalen').on("click", function(e){
         $(this).parent().find("input").focus()
     })
+    $('.exportData').click(function(){
+        const start = new Date(startDateParam).getTime()
+        const end = new Date(endDateParam).getTime()
+        if(start > end){
+            $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
+        }
+        const param = {
+            name: behospitalCode||"",
+            type: 0, //1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
+            dateType: level||"",//(3-上月,4-去年本月,5-去年(必填))
+            "startDate":startDateParam,
+            "endDate":endDateParam
+        }
+        expJson(api.levelPercentGroupByDeptExport,param).then(res =>{
+            downloadExportedData(res.data, "各科室甲级病历占比.xls")
+        })
+    })
 });

+ 21 - 2
src/js/mukuaiControl.js

@@ -3,7 +3,7 @@ require("../css/mukuai.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate,expJson } = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -389,7 +389,6 @@ function editItem(item,activePage){
             return 
         }else{
             $("#mainBox .itemMsgBox .itemMsgInfoTips", parent.document).css("display","block")
-            
             return
         }
       
@@ -563,4 +562,24 @@ $(function() {
     $('.iconCalen').on("click", function(e){
         $(this).parent().find("input").focus()
     })
+    $('.exportData').click(function(){
+        const start = new Date(startDateParam).getTime()
+        const end = new Date(endDateParam).getTime()
+        if(start > end){
+            $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
+        }
+        const param = {
+            type: 0,
+            name: name, //条目名
+            deptName: deptId, //科室名
+            asc:data_asc,     //升序
+            desc: data_desc,       //降序
+            "startDate":startDateParam,
+            "endDate":endDateParam
+        }
+        expJson(api.exportMukuai,param).then(res =>{
+            downloadExportedData(res.data, "模块缺陷占比.xls")
+        })
+    })
 });

+ 20 - 22
src/js/partDetailControl.js

@@ -547,27 +547,25 @@ $(function() {
     $('.iconCalen').on("click", function(e){
         $(this).parent().find("input").focus()
     })
-  $('.export').click(function(){
-    const dateStatrt = getPickerDate($("#datepicker"),1)
-    const dateEnd = getPickerDate($("#datepicker2"),2)
-    const start = new Date(dateStatrt).getTime()
-    const end = new Date(dateEnd).getTime()
-    if(start > end){
-      $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-      return
-    }
-    const param = {
-      "level": deptId||"",
-      "name": behospitalCode||"",
-      "asc":data_asc,     //升序
-      "desc":data_desc,       //降序
-      "type": statisticsType||2, //1-本月,2-本年
-      "startDate":dateStatrt,
-      "endDate":dateEnd
-    }
-    expJson(api.exportIndexQualified,param).then(res =>{
-      downloadExportedData(res.data, dateStatrt.slice(0,10).replace(/-/g,"")+"-"+dateEnd.slice(0,10).replace(/-/g,"")+"病案首页.xls")
-    })
+    $('.export').click(function(){
+        const start = new Date(startDateParam).getTime()
+        const end = new Date(endDateParam).getTime()
+        if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+        }
+        const param = {
+        "level": deptId||"",
+        "name": behospitalCode||"",
+        "asc":data_asc,     //升序
+        "desc":data_desc,       //降序
+        "type": statisticsType||2, //1-本月,2-本年
+        "startDate":startDateParam,
+        "endDate":endDateParam
+        }
+        expJson(api.exportIndexQualified,param).then(res =>{
+        downloadExportedData(res.data,"病案首页合格率占比.xls")
+        })
 
-  })
+    })
 });

+ 13 - 4
src/js/payDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/payDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,expJson,downloadExportedData} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -569,6 +569,15 @@ $(document).on("click", function(){
     $(".selectLevel .arrow").attr("src",iconDown)
     
 })
-
-$((function($){
-})($));
+$(function($){
+    $('.exportData').click(function(){
+        const param = {
+            name: behospitalCode||"",
+            type: statisticsType||2, //1-本月,2-本年
+            dateType: "",//(3-上月,4-去年本月,5-去年(必填))
+        }    
+        expJson(api.getAverageFeeExport,param).then(res =>{
+            downloadExportedData(res.data, "科室平均住院花费.xls")
+        })
+    })
+});

+ 27 - 1
src/js/quexianDetailControl.js

@@ -3,7 +3,7 @@ require("../css/quexianDetailControl.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate,expJson,downloadExportedData} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -176,6 +176,8 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(api.entryCountGroupByEntryPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
@@ -563,4 +565,28 @@ $(function() {
     $('.iconCalen').on("click", function(e){
         $(this).parent().find("input").focus()
     })
+    $('.exportData').click(function(){
+        const start = new Date(startDateParam).getTime()
+        const end = new Date(endDateParam).getTime()
+        if(start > end){
+            $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
+        }
+        const param = {
+            type: 0,//1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
+            name: name, //条目名
+            doctorName:"",
+            casesName:deptId,
+            deptName:deptName=="全院"?"":(deptName||""),
+            casesId:casesIds||"",
+            globalType:1,
+            ascs:data_asc,
+            descs:data_desc,
+            "startDate":startDateParam,
+            "endDate":endDateParam
+        }
+        expJson(api.entryCountGroupByEntryExport,param).then(res =>{
+            downloadExportedData(res.data, "各科室缺陷占比 / 缺陷详情.xls")
+        })
+    })
 });

+ 31 - 4
src/js/quexianDetailControlHome.js

@@ -3,7 +3,7 @@ require("../css/quexianDetailControlHome.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate,expJson,downloadExportedData} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",ruleType="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="",startDateParam='',endDateParam='',deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",ruleType="",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,8 +27,8 @@ $(function(){
     isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     ruleType = getUrlArgObjectNew("ruleType",srcUrl)||""
-    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
-    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+    startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     $('.selectDept').html(deptName).attr("title",deptName)
     if(isReject == 1){
         $(".monthYear .mon").css({
@@ -178,6 +178,8 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(api.entryCountGroupByEntryPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
@@ -565,4 +567,29 @@ $(function() {
     $('.iconCalen').on("click", function(e){
         $(this).parent().find("input").focus()
     })
+    $('.exportData').click(function(){
+        const start = new Date(startDateParam).getTime()
+        const end = new Date(endDateParam).getTime()
+        if(start > end){
+            $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
+        }
+        const param = {
+            type: 0,
+            name: name, //条目名
+            doctorName:"",
+            casesName:deptId,
+            ruleType:ruleType||null,
+            deptName:deptName=="全院"?"":(deptName||""),
+            casesId:casesIds||"",
+            globalType:1,
+            ascs:data_asc,
+            descs:data_desc,
+            "startDate":startDateParam,
+            "endDate":endDateParam
+        }
+        expJson(api.entryCountGroupByEntryExport,param).then(res =>{
+            downloadExportedData(res.data, "病案首页合格率占比 / 缺陷详情.xls")
+        })
+    })
 });

+ 8 - 10
src/js/singleVeto.js

@@ -16,7 +16,7 @@ if(currentPage==="YH-ZKK-TMQXZB_XQ"){
   $(".export").css("display","inline-block");
 }
 
-let casesId="", name="", isReject ="",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
+let casesId="", name="", isReject ="",deptName="",startDateParam="",endDateParam="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -32,8 +32,8 @@ $(function(){
     special = getUrlArgObjectNew("special",srcUrl)||""
     name=nameTemp = getUrlArgObjectNew("qxName",srcUrl)||""
     casesName =casesNameTemp = getUrlArgObjectNew("model",srcUrl)||""
-    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
-    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+    startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     let fromThree = getUrlArgObjectNew("fromThree",srcUrl)||""
     if(name){
         $(".moduleItemInp").attr("title",name).val(name)
@@ -592,10 +592,8 @@ $(function() {
         $(this).parent().find("input").focus()
     })
   $('.export').click(function(){
-    const dateStatrt = getPickerDate($("#datepicker"),1)
-    const dateEnd = getPickerDate($("#datepicker2"),2)
-    const start = new Date(dateStatrt).getTime()
-    const end = new Date(dateEnd).getTime()
+    const start = new Date(startDateParam).getTime()
+    const end = new Date(endDateParam).getTime()
     if(start > end){
       $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
       return
@@ -607,11 +605,11 @@ $(function() {
       isReject:isSingleReject, //是否单项否决
       name: name, //条目名
       deptName: deptId, //科室名
-      "startDate":dateStatrt,
-      "endDate":dateEnd
+      "startDate":startDateParam,
+      "endDate":endDateParam
     };
     expJson(api.exportItemFlaw,param).then(res =>{
-      downloadExportedData(res.data, dateStatrt.slice(0,10).replace(/-/g,"")+"-"+dateEnd.slice(0,10).replace(/-/g,"")+"条目缺陷.xls")
+      downloadExportedData(res.data,"条目缺陷占比.xls")
     })
   })
 });

+ 2 - 1
src/js/utils.js

@@ -121,6 +121,7 @@ const post = function (url, data) {
       },
       error: function (error) {
         if(error.status===403||error.status===401){
+          return
           setCookie('behosDateStart','')
           setCookie('behosDateEnd','')
           const wd = window.parent.window||window;
@@ -174,7 +175,7 @@ const post = function (url, data) {
 // }
 // 导出
 const expJson = (url,data) =>{
-  const token = getCookie('accessToken')
+  const token = getCookie('accessToken') || localStorage.getItem('accessToken')
   if(!token&&window.location.href.indexOf('login')==-1){
     setCookie('behosDateStart','')
     setCookie('behosDateEnd','')