Przeglądaj źródła

Merge branch 'version1.3.5_zxc' into test

zhangxc 5 lat temu
rodzic
commit
c24654ced6

+ 0 - 1
src/css/itemDefectDetail.less

@@ -325,7 +325,6 @@ table{
 .selectDefect{
     min-width: 120px;
     width: auto;
-    color: #ccc;
     display: inline-block;
     position: relative;
     padding: 0 10px;

+ 1 - 0
src/html/itemDefectDetail.html

@@ -94,6 +94,7 @@
                     </tr> -->
                     <!-- <th class="textCenter" ></th> -->
                     <!-- <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th> -->
+                           <th class="orderNum textCenter">序号</th>
                     <th class="beHospitalId textCenter" code="behospitalCode">病人住院序号</th>
                     <th class="recordLevel textCenter" code="level">病历等级</th>
                     <th class="recordScore textCenter" code="scoreRes">病历得分</th>

+ 4 - 2
src/js/itemDefectDetail.js

@@ -29,7 +29,7 @@ $(".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,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="",deptName="",deptNameTemp ="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",casesEntryName=""
-  data_desc=["leaveHospitalDate"],data_asc=[];
+  data_desc=["leaveHospitalDate"],data_asc=[],pageSize = 15,currentPage = 1;
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -100,11 +100,12 @@ function getTabData(activePage){
         startDate: behosDateStart, //出院日期--开始时间
         endDate: behosDateEnd, //出院日期--结束时间
         casesEntryName: casesEntryName,
-        size: 15,
+        size: pageSize,
     }
     post(api.qcResultDefectList,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
+            currentPage = data.current;
             tabList = data.records;
             const totalPage = data.pages;
             const totalNum = data.total;
@@ -221,6 +222,7 @@ function renderTab(data,hisId){
         }
         str += `
             <tr  data-index=${i}>
+                <td class="textCenter">${pageSize * (currentPage-1) + i + 1}</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td  class="textCenter">${item.level || "-"}</td>
                 <td  class="textCenter">${item.scoreRes || "-"}</td>