sumdoctor

src/assets/css/global_table.css

@@ -29,6 +29,6 @@
 .cell {
   padding-left: 2px;
   padding-right: 2px;  
-  line-height: 20px;  /* 表格size="small"时 默认值 23px*/
+  line-height: 20px;   /*表格size="small"时 默认值 23px*/
 }
 

src/components/doctorCheck/ButtonList.vue

@@ -312,7 +312,8 @@ export default {
                 }   
             }).catch((err) => {
                 if (err == "cancel") {
-                this.$message.info("已取消删除");
+                    // this.$message.info("已取消删除");
+                    console.log('已取消删除')
                 }
             });
 

src/components/doctorCheck/CheckSumSug.vue

@@ -176,14 +176,38 @@ export default {
       });
     }, 
 
-    //删除诊断明细
+    //删除小结
     delSum(index) {
-      this.doctorCheck.checkSummaryList.splice(index, 1);
+      this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() => {
+        this.doctorCheck.checkSummaryList.splice(index, 1);
+      }).catch(err => {
+        if (err == "cancel") {
+            // this.$message.info("已取消删除");
+          console.log('已取消删除')
+        }
+      });
+
+      
     },
     
     //删除建议明细
     delSug(index) {
-      this.doctorCheck.checkSuggestionList.splice(index, 1);
+      this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() => {
+        this.doctorCheck.checkSuggestionList.splice(index, 1);
+      }).catch((err) => {
+        if (err == "cancel") {
+            // this.$message.info("已取消删除");
+          console.log('已取消删除')
+        }
+      });      
     },
     
   },

src/components/doctorCheck/RegisterCheckList.vue

@@ -9,13 +9,13 @@
         <template slot-scope="scope">
             <div>
               <el-tooltip class="item" effect="dark" content="未检" placement="top">
-                <i v-show="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 16px;color: red;"></i>
+                <i v-show="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 18px;color: red;"></i>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="已检" placement="top">
-                <i v-show="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 16px;color: green;"></i>
+                <i v-show="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 18px;color: green;"></i>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="弃检" placement="top">
-                <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 16px;"></i>
+                <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 18px;"></i>
               </el-tooltip>
               {{scope.row.asbitemName}}
             </div>

src/components/sumDoctorCheck/CheckDetails.vue

@@ -1,42 +1,35 @@
 <template>  
   <div :style="'overflow: scroll;width:100%;height:'+(window.pageHeight < 600 ? 330:window.pageHeight-270)+'px;'">
-    <table width="100%" >   
+    <table width="100%" style="font-size:14px;">   
       <tbody v-for="(item,index) of tableData" :key="index">  
         <tr height="30"><td style="text-align: center;font-weight: bolder;">{{item.itemTypeName}}</td></tr>
         <tr>
-          <table v-for="(item2,index2) in item.asbitems" :key="index + '-' + index2" width="100%" border="1" cellspacing="0" bordercolor="#000000" style="border-collapse:collapse;">
-            <tr height="30">
-              <td width="299">{{item2.asbitemName}}</td>
-              <td width="701">{{ '检查日期：' + item2.checkDate + ' 检查医生：' + item2.checkDoctorName }}</td>
+          <table v-for="(item2,index2) in item.asbitems" :key="index + '-' + index2" width="100%" border="1" cellspacing="0" bordercolor="#909399" style="border-collapse:collapse;">
+            <tr height="24">
+              <td width="200">{{item2.asbitemName}}</td>
+              <td width="604" colspan="5">{{ '检查日期：' + item2.checkDate + ' 检查医生：' + item2.checkDoctorName }}</td>
             </tr>
-            <tr>
-              <td colspan="2">              
-                <table width="100%" border="1" cellspacing="0" bordercolor="#000000" style="border-collapse:collapse;">
-                  <thead>
-                    <tr style="text-align: center;" height="30">
-                      <td width="300">项目</td>
-                      <td width="300">结果</td>
-                      <td width="130">参考值</td>
-                      <td width="130">警告参考值</td>
-                      <td width="90">单位</td>
-                      <td width="50">提示</td>
-                    </tr>
-                  </thead>
-                  <tbody v-for="(item3,index3) in item2.items" :key="index + '-' + index2 + '-' + index3">
-                    <tr height="30">
-                      <td>{{item3.itemName}}</td>
-                      <td>{{item3.itemResult}}</td>
-                      <td>{{item3.referenceRangeValue}}</td>
-                      <td>{{item3.criticalRangeValue}}</td>
-                      <td>{{item3.unit}}</td>
-                      <td>{{item3.resultStatusName}}</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </td>
+            
+            <tr style="text-align: center;" height="24">
+              <td width="200">项目</td>
+              <td width="270">结果</td>
+              <td width="100">参考值</td>
+              <td width="100">警告参考值</td>
+              <td width="80">单位</td>
+              <td width="50">提示</td>
+            </tr>                 
+                  
+            <tr height="24" v-for="(item3,index3) in item2.items" :key="index + '-' + index2 + '-' + index3">
+              <td>{{item3.itemName}}</td>
+              <td>{{item3.itemResult}}</td>
+              <td>{{item3.referenceRangeValue}}</td>
+              <td>{{item3.criticalRangeValue}}</td>
+              <td>{{item3.unit}}</td>
+              <td>{{item3.resultStatusName}}</td>
             </tr>
-            <tr height="30">
-              <td colspan="2">小结：{{ mergeSummarys(item2.summarys,'summary') }}</td>
+                  
+            <tr height="24">
+              <td colspan="6">小结：{{ mergeSummarys(item2.summarys,'summary') }}</td>
             </tr>
           </table>
         </tr>

src/components/sumDoctorCheck/SumItems.vue

@@ -1,21 +1,37 @@
 <template>
   <div style="display: flex;width:100%;">  
     <div style="width:180;">
+      <!-- :row-class-name="tableRowClassName" -->
       <el-table :data="RegisterCheckList" width="180" 
         :height="window.pageHeight < 600 ? 330:window.pageHeight-270"
         border highlight-current-row
-        :row-style="{ height: '40px' }" :row-class-name="tableRowClassName" @row-click="rowClick">
-        <el-table-column prop="asbitemName" label="组合项目" width="180" />
+        @row-click="rowClick">
+        <el-table-column prop="asbitemName" label="组合项目" width="180">
+          <template slot-scope="scope">
+              <div>
+                <el-tooltip class="item" effect="dark" content="未检" placement="top">
+                  <i v-show="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 18px;color: red;"></i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="已检" placement="top">
+                  <i v-show="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 18px;color: green;"></i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="弃检" placement="top">
+                  <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 18px;"></i>
+                </el-tooltip>
+                {{scope.row.asbitemName}}
+              </div>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div :style="'width:' + (window.pageWidth - 180 - 110 - 45) + 'px;'">
       <el-table :data="tableData" :width="(window.pageWidth - 330 - 80)" 
         :height="window.pageHeight < 600 ? 330:window.pageHeight-270"
-        border :row-style="{ height: '40px' }">
+        border highlight-current-row>
         <el-table-column prop="itemName" label="项目" width="150" />
-        <el-table-column prop="unitName" label="单位" width="90" />
-        <el-table-column prop="referenceRangeValue" label="参考范围" width="120" />
-        <el-table-column v-for="(item, index) of tableCols" :label="item" :prop="item" :key="index" width="150">
+        <el-table-column prop="unitName" label="单位" width="80" align="center"/>
+        <el-table-column prop="referenceRangeValue" label="参考范围" width="80" align="center"/>
+        <el-table-column v-for="(item, index) of tableCols" :label="item" :prop="item" :key="index" min-width="150" align="center">
         </el-table-column>
       </el-table>
     </div>
@@ -116,7 +132,7 @@ export default {
       this.tableRows = []   //动态行
       this.tableCols = []   //动态列
 
-      console.log('tableData', tableData)
+      // console.log('tableData', tableData)
       tableData.forEach(e => {
         if (this.tableRows.indexOf(e.itemName) == - 1) this.tableRows.push(e.itemName)
         if (this.tableCols.indexOf(e.checkDate) == - 1) this.tableCols.push(e.checkDate)
@@ -142,9 +158,9 @@ export default {
         });
         this.tableData.push(item)
       });
-      console.log('this.tableRows', this.tableRows)
-      console.log('this.tableCols', this.tableCols)
-      console.log('this.tableData', this.tableData)
+      // console.log('this.tableRows', this.tableRows)
+      // console.log('this.tableCols', this.tableCols)
+      // console.log('this.tableData', this.tableData)
     },
 
 
@@ -165,9 +181,7 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-table td.el-table__cell,
-.el-table th.el-table__cell.is-leaf {
-  padding: 0;
-}
+@import  '../../assets/css/global_table.css';
+
 </style>
   

src/components/sumDoctorCheck/SumItemsType.vue

@@ -2,7 +2,7 @@
   <div :style="'width:100%;height:'+(window.pageHeight < 600 ? 330:window.pageHeight-270)+'px;'">
     <el-table :data="tableData" 
       :height="window.pageHeight < 600 ? 330:window.pageHeight-270" 
-      border :row-style="{ height: '40px' }" >
+      border highlight-current-row >
       <el-table-column prop="itemTypeName" label="项目" width="180"/>
       <el-table-column v-for="(item,index) of tableCols" :label="item" :prop="item" :key="index" width="200">
       </el-table-column>
@@ -110,9 +110,6 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-table td.el-table__cell,
-.el-table th.el-table__cell.is-leaf {
-  padding: 0;
-}
+@import  '../../assets/css/global_table.css';
 </style>