Merge branch 'version1.4.1' into test

src/html/qcListCopy.html

@@ -103,7 +103,7 @@
                         <span  class="divide fl">-</span>
                         <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
                     </span>
-                    <span class="filterItem doctorFilter">
+                    <span class="filterItem doctorFilter defectItem">
                         <span>缺陷名称：</span>
                         <span class="selectDefect"> 
                         

src/js/qcList.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcList.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = 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")
@@ -1129,8 +1129,8 @@ $((function($){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
-        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)});
+        if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTimeLimit.normalTime){
+            $.alerModal({"message":`最多只能导出${exportTimeLimit.normalTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
         const param = {

src/js/qcListCopy.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListCopy.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = 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")
@@ -63,6 +63,8 @@ if(chengdu){
 if (defectName && defectName !== 'undefined'){
     casesEntryName=defectName
     $('.selectDefect').html(casesEntryName)
+}else{
+    $('.defectItem').css("display","none")
 }
 if(docName){
     doctorNameTemp = docName
@@ -1260,12 +1262,13 @@ $(function($){
     $('.export').click(function(){
         const behosDateStartTime = new Date(behosDateStart).getTime()
         const behosDateEndTime = new Date(behosDateEnd).getTime()
+        const exportTime = defectName && defectName !== 'undefined' ? exportTimeLimit.defectTime :exportTimeLimit.normalTime
         if(behosDateStartTime > behosDateEndTime){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
-        if((behosDateEndTime - behosDateStartTime)/24/60/60/1000 > 7){
-            $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        if((behosDateEndTime - behosDateStartTime)/24/60/60/1000 > exportTime){
+            $.alerModal({"message":`最多只能导出${exportTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
         // 判断是否是 住院超过31日病人数   

src/js/qcListDept.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListDept.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = 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")
@@ -1119,8 +1119,8 @@ $((function($){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
-        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)});
+        if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTimeLimit.normalTime){
+            $.alerModal({"message":`最多只能导出${exportTimeLimit.normalTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
         const param = {

src/js/qcListDocteam.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListDocteam.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = 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")
@@ -1035,8 +1035,8 @@ $((function($){
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
     }
-    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)});
+    if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTimeLimit.normalTime){
+      $.alerModal({"message":`最多只能导出${exportTimeLimit.normalTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
       return
     }
     const param = {

src/js/qcListOutHospital.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListOutHospital.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = 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")
@@ -1236,8 +1236,8 @@ $(function($){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
-        if((end - start)/24/60/60/1000 > 7){
-            $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        if((end - start)/24/60/60/1000 > exportTimeLimit.normalTime){
+            $.alerModal({"message":`最多只能导出${exportTimeLimit.normalTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
         const param = {

src/js/uccDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/uccDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll,exportTimeLimit} = 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")
@@ -1175,12 +1175,13 @@ $(function($){
     $('.export').click(function(){
         const start = new Date(behosDateStart).getTime()
         const end = new Date(behosDateEnd).getTime()
+        const exportTime = defectName && defectName !== 'undefined' ? exportTimeLimit.defectTime :exportTimeLimit.normalTime
         if(start > end){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
-        if((end - start)/24/60/60/1000 > 7){
-            $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        if((end - start)/24/60/60/1000 > exportTime){
+            $.alerModal({"message":`最多只能导出${exportTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
         const param = {

src/js/utils.js

@@ -45,6 +45,12 @@ const pageMap={
   'YH-ZKK-31TZRYRS': 'readmission.html'
 };
 
+//导出时间天数
+const exportTimeLimit = {
+  defectTime: 90, 
+  normalTime: 7
+}
+
 //重写assign方法
 if (typeof Object.assign != 'function') {
   Object.assign = function (target) {
@@ -465,6 +471,7 @@ function listenScroll(dom){
 
 module.exports = {
   pageMap,
+  exportTimeLimit,
   post,
   getUrlArgObject,
   getUrlArgObjectNew,
@@ -484,5 +491,6 @@ module.exports = {
   getPickerDate,
   isMac,
   initScroll,
-  listenScroll
+  listenScroll,
+
 };