11

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -49,7 +49,7 @@
 
           <el-table
             v-if="state == 1"
-            :height="tableHeight"
+            height="60vh"
             :data="waiting_drug"
             border
             style="width: 100%"
@@ -127,6 +127,8 @@
           <el-table
             :height="tableHeight"
             :data="tableData"
+            :summary-method="getSummaries"
+            show-summary
             border
             highlight-current-row
             style="width: 1328px"
@@ -455,6 +457,34 @@ export default {
         }
       });
     },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        console.log(data, "合计data1");
+        const values = data.map((item) => Number(item[column.property]));
+        
+        if (!values.every((value) => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] += " 元";
+        } else {
+          sums[index] = "N/A";
+        }
+      });
+
+      return sums;
+    },
     changeTimes() {
       // alert("aa")
       // this.getdruglist();
@@ -759,7 +789,8 @@ export default {
 }
 
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {
-  overflow: auto;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 /deep/ .gutter {
   width: 15px !important;

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -53,7 +53,7 @@
           </div>
 
           <el-table
-            :height="tableHeight"
+            height="60vh"
             ref="table01"
             :data="waitmount_data"
             highlight-current-row
@@ -612,6 +612,7 @@ export default {
 
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {
   overflow: auto;
+  overflow-x: hidden;
 }
 /deep/ .gutter {
   width: 15px !important;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -772,18 +772,18 @@
                   </td>
                   <td
                     style="height: 20px"
-                    width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    width="80"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <p style="height: 20px; line-height: 20px">开嘱医生</p>
                   </td>
-                  <td style="height: 20px" width="420">
+                  <td style="height: 20px" width="360">
                     <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
                   </td>
                   <td
                     style="height: 20px"
                     width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <p style="height: 20px; line-height: 20px">执行时间</p>
                   </td>
@@ -796,7 +796,7 @@
                   <td style="height: 20px" width="145">
                     <p style="height: 20px; line-height: 20px">上次透后体重</p>
                   </td>
-                  <td style="height: 20px">
+                  <td style="height: 20px" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -822,30 +822,20 @@
                   </td>
                   <td
                     style="line-height: 30px"
-                    width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    width="80"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                       {{ getAdminUser(advice.advice_doctor) }}
                     </span>
-                    <span
-                      v-else
-                      style="
-                        display: flex;
-                        align-items: center;
-                        justify-content: space-around;
-                        height: 36px;
-                      "
-                    >
-                      <img
-                        style="height: 30px"
-                        :src="setAdminUserES(advice.advice_doctor)"
-                        alt
-                        srcset
-                      />
-                    </span>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.advice_doctor)"
+                      alt=""
+                      srcset=""
+                    />
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="415">
+                  <td style="text-align: left; padding-left: 5px" width="360">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -872,7 +862,7 @@
                   <td
                     style="line-height: 30px"
                     width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
@@ -887,7 +877,6 @@
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
-                      v-else
                     />
                   </td>
                   <td style="line-height: 30px" width="85">
@@ -904,7 +893,7 @@
                   </td>
 
                   <td v-if="advice_index === 0" width="145">透前体重:</td>
-                  <td v-if="advice_index === 0">
+                  <td v-if="advice_index === 0" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -914,7 +903,7 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 1" width="145">体重增加量:</td>
-                  <td v-if="advice_index === 1">
+                  <td v-if="advice_index === 1" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -927,7 +916,7 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 2" width="145">干体重(DW):</td>
-                  <td v-if="advice_index === 2">
+                  <td v-if="advice_index === 2" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -937,7 +926,7 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
-                  <td v-if="advice_index === 3">
+                  <td v-if="advice_index === 3" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -949,7 +938,7 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 4" width="145">净脱水量:</td>
-                  <td v-if="advice_index === 4">
+                  <td v-if="advice_index === 4" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -959,7 +948,7 @@
                     }}ml
                   </td>
                   <td v-if="advice_index === 5" width="145">透后体重:</td>
-                  <td v-if="advice_index === 5">
+                  <td v-if="advice_index === 5" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -971,7 +960,7 @@
                   <td v-if="advice_index === 6" width="145">
                     本次透析体重下降量:
                   </td>
-                  <td v-if="advice_index === 6">
+                  <td v-if="advice_index === 6" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -984,7 +973,7 @@
                     }}kg
                   </td>
                   <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6"></td>
+                  <td v-if="advice_index > 6" width="60"></td>
                 </tr>
               </table>
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -628,7 +628,7 @@
                   <table class="inside_table">
                     <tbody>
                       <tr>
-                        <td colspan="11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
+                        <td colspan="12" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
                           监测记录
                         </td>
                       </tr>
@@ -680,7 +680,7 @@
                         </td>
                       </tr>
                       <tr>
-                        <td colspan="11" style="line-height:25px;text-align:left;">
+                        <td colspan="12" style="line-height:25px;text-align:left;">
                           医师记录：{{ summary.special_record ? summary.special_record : '' }}
                         </td>
                       </tr>

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -1776,6 +1776,7 @@ export default {
   height: 36px;
   display: flex;
   align-items: center;
+  padding-top: 10px;
 }
 
 .fixedCell {

src/xt_pages/outpatientDoctorStation/batch_delete.vue

@@ -1,6 +1,7 @@
 <template>
   <!--批量删除-->
-  <div class="main-contain new-main-contain">
+  <div class="main-contain">
+    <div class="app-container">
     <div class="bannar_list">
       <div class="banner_left">
         <div>
@@ -76,13 +77,14 @@
     </div>
 
     <el-container>
-      <div class="mainLeft">
+      <div style="width: 211px;height: 70vh;border: 1px solid #DCDFE6;box-shadow: 0 2px 4px 0 rgb(0 0 0 / 12%), 0 0 6px 0 rgb(0 0 0 / 4%);">
         <el-table
           border
+          height="70vh"
           ref="multipleTable"
           :data="tableData"
           tooltip-effect="dark"
-          style="width: 100%; min-height: 70vh"
+          style="width: 100%;"
           @selection-change="handleSelectionChange"
           @current-change="test"
           :row-style="{ color: '#303133' }"
@@ -97,7 +99,9 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-tabs type="border-card" v-if="isshow == 1 && list.length > 0">
+
+      <el-main>
+        <el-tabs type="border-card" v-if="isshow == 1 && list.length > 0" style="min-height: 70vh;">
         <el-tab-pane
           v-for="(item, index) in list"
           :key="index"
@@ -258,7 +262,11 @@
           </el-table>
         </el-tab-pane>
       </el-tabs>
+      </el-main>
+      
     </el-container>
+  
+  </div>
   </div>
 </template>
 <script>
@@ -595,23 +603,44 @@ export default {
 
 
 <style lang="scss" scoped>
+::v-deep .el-tabs__content {
+  padding: 8px;
+}
+
+/deep/ .el-table__fixed {
+  bottom: 0px !important;
+}
+.app-container {
+  padding: 10px;
+  background: #f6f8f9;
+  .el-container {
+  }
+}
+::v-deep .el-table__body-wrapper {
+  height: 500px;
+  overflow-y: scroll;
+}
 .bannar_list {
-  width: 97%;
   margin-bottom: 10px;
   display: flex;
   justify-content: space-between;
   .banner_left {
-    width: 1000px;
+    width: 960px;
     display: flex;
     justify-content: space-around;
     div {
+      white-space: nowrap;
       font-size: 14px;
       color: #606266;
-      white-space: nowrap;
     }
   }
 }
-
+.frequence {
+  text-align: center;
+}
+/deep/ .el-button--small {
+  padding: 9px 6px;
+}
 .zone {
   //  margin-left: 30px;
   //  text-align: left;
@@ -730,7 +759,21 @@ export default {
 }
 .el-main {
   padding-top: 0px;
+  padding-left: 18px;
+  padding-right: 0px;
+  .el-tabs{
+    .el-tabs__content{
+      padding: 12px;
+      .el-table .el-table__header-wrapper table{
+        width: 100% !important;
+      }
+      .el-table .el-table__body-wrapper table{
+        width: 100% !important;
+      }
+    }
+  }
 }
+
 .newMain {
   .el-form-item__label {
     width: 104px;
@@ -738,7 +781,8 @@ export default {
 }
 .newDisinfectOne {
   .el-input--prefix .el-input__inner {
-    padding-left: 15px;
+    // padding-left: 15px;
+    padding-right: 0px !important;
   }
 }
 .stoppage {
@@ -767,291 +811,12 @@ export default {
 }
 
 .el-table td .cell {
-  padding: 0 10px;
-}
-</style>
-
-<style lang="scss" scoped>
-.new-main-contain {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  padding: 10px;
-}
-
-.app-container {
-  height: 100%;
-}
-
-.mainCell {
-  height: 36px;
-  display: flex;
-  align-items: center;
-}
-
-.mainLeft {
-  width: 211px;
-  margin:0 20px;
-  /deep/ .el-table__body-wrapper {
-    height: 65vh;
-    overflow-y: scroll !important;
-  }
-}
-.mainRight {
-  margin-left: 10px;
-  flex: 1;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-  .cellSpan {
-    min-width: 80px;
-    display: inline-block;
-    margin-right: 10px;
-  }
-  /deep/ .el-table {
-    .el-table__header-wrapper {
-      .el-table__header {
-        width: 100% !important;
-      }
-    }
-
-    .el-table__body-wrapper {
-      height: auto !important;
-      .el-table__body {
-        width: 100% !important;
-      }
-    }
-  }
-}
-
-/deep/ .el-table__fixed {
-  bottom: 0 !important;
+  padding: 0 5px !important;
 }
-.mainCenter {
-  display: flex;
-  flex: 1;
-}
-
-.centerLeft {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  position: relative;
-
-  .el-form-item {
-    width: 32%;
-    margin-right: 1%;
-    float: left;
-  }
-
-  .el-form-item__label {
-    text-align: left;
-  }
-}
-.backColor {
-  background: #f6f8f9;
-  height: 5px;
-  margin-bottom: 5px;
-}
-.el-tabs {
-  min-width: 1373px;
-  height: 70vh;
-}
-
-.tabsBox {
-  position: relative;
-  height: 76%;
-  overflow-y: auto;
-  margin-bottom: 60px;
-
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-}
-.preTabs {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .el-tabs__content {
-    flex: 1;
-    overflow-y: auto;
-  }
-}
-
-.costBox {
-  width: 100%;
-  height: 60px;
-  background: #fff;
-  position: absolute;
-  bottom: 0;
-  display: flex;
-  align-items: center;
-}
-
 .addTab {
   position: absolute;
-  right: 0;
-  top: 14px;
+  right: 8px;
+  top: 3px;
   z-index: 20;
 }
-
-.centerRight {
-  width: 300px;
-  margin-left: 10px;
-  display: flex;
-  flex-direction: column;
-  position: relative;
-}
-
-.rightTab {
-  height: 40px;
-  width: 100%;
-  border: 1px solid #d2d2d2;
-  box-sizing: border-box;
-
-  p {
-    width: 50%;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    background: #eee;
-    float: left;
-  }
-
-  > p:last-child {
-    border-left: 1px solid #d2d2d2;
-    float: right;
-  }
-
-  .activeP {
-    background: #409eff;
-    color: #fff;
-  }
-}
-.comfirmBox {
-  width: 100%;
-  height: 60px;
-  background: #fff;
-  position: absolute;
-  bottom: 0;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.mainHeader {
-  width: 100%;
-  background: #fff;
-  position: fixed;
-  z-index: 100;
-  height: 36px;
-}
-
-.titleBox {
-  position: fixed;
-  z-index: 99;
-  background: #fff;
-}
-
-.fixedCell {
-  position: fixed;
-  z-index: 99;
-  right: 30px;
-  background: #fff;
-  width: 300px;
-  display: flex;
-  justify-content: space-between;
-}
-.btn_crumbs {
-  .el-button {
-    text-align: center;
-    font-size: 12px;
-    padding: 10px 11px;
-  }
-}
-</style>
-
-<style lang="scss">
-.centerLeft {
-  .el-form-item__label {
-    text-align: left;
-  }
-}
-.tabsBox {
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-
-  .el-tabs--bottom
-    .el-tabs--left
-    > .el-tabs__header
-    .el-tabs__item:nth-child(2),
-  .el-tabs--bottom
-    .el-tabs--right
-    > .el-tabs__header
-    .el-tabs__item:nth-child(2),
-  .el-tabs--bottom.el-tabs--border-card
-    > .el-tabs__header
-    .el-tabs__item:nth-child(2),
-  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2),
-  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2),
-  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2),
-  .el-tabs--top.el-tabs--border-card
-    > .el-tabs__header
-    .el-tabs__item:nth-child(2),
-  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
-    padding: 0 10px;
-  }
-
-  .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
-  .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
-  .el-tabs--bottom.el-tabs--border-card
-    > .el-tabs__header
-    .el-tabs__item:last-child,
-  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child,
-  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
-  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
-  .el-tabs--top.el-tabs--border-card
-    > .el-tabs__header
-    .el-tabs__item:last-child,
-  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
-    padding: 0 10px;
-  }
-
-  .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
-    padding: 0 10px;
-  }
-}
-.centerRight {
-  .el-tabs__nav-scroll {
-    display: flex;
-  }
-
-  .el-tabs__nav {
-    margin: 0 auto;
-  }
-
-  .el-table th .cell,
-  .el-table td .cell {
-    padding: 0 2px;
-  }
-}
-.preTabs {
-  .el-tabs__content {
-  }
-}
-.rightTabs {
-  height: 100%;
-
-  .el-tabs__content {
-  }
-}
-.centerDialog {
-  .el-dialog__body {
-    max-height: calc(100vh - 100px) !important;
-    padding: 0 20px;
-  }
-}
 </style>

src/xt_pages/outpatientDoctorStation/batch_replacement.vue

@@ -107,8 +107,6 @@
         <el-table
           :data="tableDatas"
           style="width: 100%"
-          :height="tableHeight"
-          max-height="70vh"
           border
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
@@ -125,7 +123,6 @@
           >
             <template slot-scope="scope">
               <el-select
-                filterable
                 v-model="scope.row.drug_name"
                 placeholder="请选择"
                 @change="changeid(scope.row, scope.$index)"
@@ -240,8 +237,6 @@
         <el-table
           :data="project"
           style="width: 100%"
-          :height="tableHeight"
-          max-height="70vh"
           border
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
@@ -1080,7 +1075,7 @@ export default {
 .mainRight {
   margin-left: 10px;
   flex: 1;
-  height: 100%;
+  height: 70vh;
   display: flex;
   flex-direction: column;
   overflow-y: auto;
@@ -1106,7 +1101,7 @@ export default {
 }
 
 /deep/ .el-table__fixed {
-  // height: 101px;
+  height: 101px !important;
   bottom: 0 !important;
   .el-table__fixed-body-wrapper {
     top: 45px !important;