Explorar o código

Merge remote-tracking branch 'origin/qc_zn' into test

# Conflicts:
#	src/js/qcList.js
zhouna %!s(int64=5) %!d(string=hai) anos
pai
achega
73e1d84245
Modificáronse 4 ficheiros con 6 adicións e 5 borrados
  1. 3 2
      src/css/qcList.less
  2. 1 1
      src/html/itemManager.html
  3. 1 1
      src/html/qcList.html
  4. 1 1
      src/js/qcList.js

+ 3 - 2
src/css/qcList.less

@@ -23,7 +23,7 @@ h2{
     margin: 20px 40px;
 }
 table{
-     width: 100%;
+    width: 100%;
     border:1px solid #E2E5EF;
     border-collapse: collapse;
     thead{
@@ -43,7 +43,8 @@ table{
     }
     td{
         font-size: 14px;
-        font-weight: 400 
+        font-weight: 400;
+        white-space: nowrap;
     }
     .moduleNumber{
         text-align: center;

+ 1 - 1
src/html/itemManager.html

@@ -48,7 +48,7 @@
             <table>
                 <thead>
                     <th class="moduleName">序号</th>
-                    <th class="moduleType">模块名称</th>
+                    <th class="moduleType" width="80">模块名称</th>
                     <th class="moduleItemName">条目名称</th>
                     <th class="moduleTipsMsg">提示信息</th>
                     <th class="moduleScore">分值</th>

+ 1 - 1
src/html/qcList.html

@@ -44,6 +44,7 @@
             <table>
                 <thead>
                     <th class="textCenter" ></th>
+                    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
                     <th class="beHospitalId textCenter">病历号</th>
                     <th class="patientNo textCenter">病案号</th>
                     <th class="patientName textCenter" style="width: 100px;">病人姓名</th>
@@ -57,7 +58,6 @@
                     <th class="recordLevel textCenter">病历等级</th>
                     <th class="recordScore textCenter">病历得分</th>
                     <th class="scoreTime textCenter">评分时间</th>
-                    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
                 </thead>
                 <tbody>
     

+ 1 - 1
src/js/qcList.js

@@ -89,6 +89,7 @@ function renderTab(data){
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
+                <td  class="recordScoreOperaBtn textCenter">评分</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -102,7 +103,6 @@ function renderTab(data){
                 <td  class="textCenter">${item.level || "-"}</td>
                 <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
-                <td  class="recordScoreOperaBtn textCenter">评分</td>
             </tr>
         `
     }