Merge branch 'version1.3.4' into test

src/html/qcListPerson.html

@@ -73,7 +73,7 @@
                             </td> -->
                         </tr>
                         <tr class="tabTitle">
-                            <th class="textCenter" ></th>
+                            <!-- <th class="textCenter" ></th>
                             <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
                             <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                             <th class="patientNo textCenter" code="file_code">病案号</th>
@@ -90,7 +90,7 @@
                             <th class="deptName textCenter" code="beh_dept_name">科室</th>
                             <th class="recordLevel textCenter" code="level">病历等级</th>
                             <th class="recordScore textCenter" code="score_res">病历得分</th>
-                            <th class="scoreTime textCenter" code="grade_time">评分时间</th>   
+                            <th class="scoreTime textCenter" code="grade_time">评分时间</th>    -->
                         </tr> 
                     </thead>
                     <tbody>

src/js/qcList.js

@@ -177,7 +177,7 @@ $(".abnormalClear").on("click", function(e){
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-1w");
+    }).datepicker( "setDate", "-6d");
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -649,7 +649,7 @@ function bindSaveColSet(){
                 }
         }
         if(showNumSet === 0){
-            $.alerModal({"message":'最低显示1列',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});  
+            $.alerModal({"message":'最少显示一列',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});  
             return
         }
         return post(api.saveQcListPageSet,{pageType:1,sysUserPagesetVOList:sysUserPagesetVOList}).then(res =>{
@@ -757,7 +757,7 @@ $(function() {
     }else if(statisticsType == '2'){
         startDate = new Date(`${year}-01-01`)
     } else {
-        startDate = "-1w"
+        startDate = "-6d"
     }
     $( "#datepicker" ).datepicker({
         changeMonth: true,
@@ -854,9 +854,9 @@ $((function($){
             "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,
+            "leaveHosDateEnd": behosDateEnd,
+            "leaveHosDateStart": behosDateStart,
+            "level": level,
             "name": name
         }
         expJson(api.exportQcList,param).then(res =>{

src/js/qcListDept.js

@@ -178,7 +178,7 @@ $(".abnormalClear").on("click", function(e){
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-1w");
+    }).datepicker( "setDate", "-6d");
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -644,7 +644,7 @@ function bindSaveColSet(){
             }
         }
         if(showNumSet === 0){
-            $.alerModal({"message":'最低显示1列',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});  
+            $.alerModal({"message":'最少显示一列',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});  
             return
         }
         return post(api.saveQcListPageSet,{pageType:1,sysUserPagesetVOList:sysUserPagesetVOList}).then(res =>{
@@ -752,7 +752,7 @@ $(function() {
     }else if(statisticsType == '2'){
         startDate = new Date(`${year}-01-01`)
     } else {
-        startDate = "-1w"
+        startDate = "-6d"
     }
     $( "#datepicker" ).datepicker({
         changeMonth: true,
@@ -853,7 +853,7 @@ $((function($){
             "level": level,
             "name": name
         }
-        expJson(api.exportQcList,param).then(res =>{
+        expJson(api.exportQcListDept,param).then(res =>{
             downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")
         })
       

src/js/qcListPerson.js

@@ -181,7 +181,7 @@ $(".abnormalClear").on("click", function(e){
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-1w");
+    }).datepicker( "setDate", "-6d");
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -628,6 +628,7 @@ function bindCloseColSet(){
 }
 function bindSaveColSet(){
     $(".saveColSet", parent.document ).off("click").on("click", function(){
+        let showNumSet = 0
         let sysUserPagesetVOList = []
         for(let i = 0; i < pageSetCopy.length; i++){
             const item = pageSetCopy[i]
@@ -642,7 +643,7 @@ function bindSaveColSet(){
             }
         }
         if(showNumSet === 0){
-            $.alerModal({"message":'最低显示1列',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});  
+            $.alerModal({"message":'最少显示一列',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});  
             return
         }
         return post(api.saveQcListPageSet,{pageType:1,sysUserPagesetVOList:sysUserPagesetVOList}).then(res =>{
@@ -746,7 +747,7 @@ $(function() {
     }else if(statisticsType == '2'){
         startDate = new Date(`${year}-01-01`)
     } else {
-        startDate = "-1w"
+        startDate = "-6d"
     }
     $( "#datepicker" ).datepicker({
         changeMonth: true,

src/js/utils.js

@@ -2,7 +2,7 @@ const qs = require('qs');
 const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.121:5858"
+const baseUrl = "http://192.168.2.241:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',