11

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -114,7 +114,7 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <!-- <div>
+          <div>
             班次：
             <el-select
               v-model="shift"
@@ -157,11 +157,11 @@
               >
               </el-option>
             </el-select>
-          </div> -->
+          </div>
           <div>
-            <!-- <el-button type="primary" @click="toExport" v-if="state == 2"
+            <el-button type="primary" @click="toExport" v-if="state == 2"
               >导出</el-button
-            > -->
+            >
             <!-- <el-button type="primary" @click="tt">调试</el-button>-->
             <el-button type="primary" @click="dispense" v-if="state == 1"
               >发药</el-button
@@ -173,13 +173,12 @@
 
         <el-divider></el-divider>
         <div class="right_table">
-          <!-- :summary-method="getSummaries"
-            show-summary -->
           <el-table
             ref="table_01"
             :height="tableHeight"
             :data="tableData"
-            
+            :summary-method="getSummaries_t1"
+            show-summary
             border
             highlight-current-row
             style="width: 100%"
@@ -272,15 +271,13 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
-          <!-- :summary-method="getSummaries"
-            show-summarys -->
+        <div class="right_table">
           <el-table
             ref="table_01"
-            v-if="state == 2"
             :height="tableHeight"
             :data="tableData"
-            
+            :summary-method="getSummaries_t2"
+            show-summary
             border
             highlight-current-row
             style="width: 100%"
@@ -290,7 +287,7 @@
               color: '#606266',
             }"
             @selection-change="handleSelectionChange"
-            
+            v-if="state == 2"
           >
             <!-- <el-table-column type="selection" width="55"> </el-table-column>-->
             <el-table-column
@@ -502,21 +499,14 @@ export default {
   },
 
   methods: {
-    tt() {
-      console.log("this.state", this.state);
-      console.log("this.tableData", this.tableData);
-      console.log("this.deliveryway", this.deliveryway);
-    },
+    tt() {},
     async fun3() {
-      console.log("fun3");
       this.fun1().then((val) => {
         this.fun2();
       });
     },
     async fun4(tps) {
-      console.log("fun3", tps);
       this.fun1().then((val) => {
-        console.log("this.issued_drug", this.issued_drug);
         for (let i = 0; i < this.issued_drug.length; i++) {
           if (tps == this.issued_drug[i].id) {
             this.$refs.table02.setCurrentRow(this.issued_drug[i]);
@@ -528,7 +518,6 @@ export default {
     async fun5(tps) {
       console.log("fun3", tps);
       this.fun1().then((val) => {
-        console.log("this.issued_drug", this.waiting_drug);
         for (let i = 0; i < this.waiting_drug.length; i++) {
           if (tps == this.waiting_drug[i].id) {
             this.$refs.table01.setCurrentRow(this.waiting_drug[i]);
@@ -537,8 +526,7 @@ export default {
         }
       });
     },
-    getSummaries(param) {
-      console.log(param, "pram");
+    getSummaries_t1(param) {
       const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
@@ -555,6 +543,22 @@ export default {
       return sums;
     },
 
+    getSummaries_t2(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (index === 6) {
+          sums[index] = this.total;
+          return;
+        }
+      });
+      return sums;
+    },
+
     changeTimes() {
       // alert("aa")
       // this.getdruglist();
@@ -1033,7 +1037,11 @@ export default {
   },
   updated() {
     this.$nextTick(() => {
-      this.$refs["table_01"].doLayout();
+      if (this.$refs["table_01"]) {
+        this.$refs["table_01"].doLayout();
+      } else if (this.$refs["table_02"]) {
+        this.$refs["table_02"].doLayout();
+      }
     });
   },
 };
@@ -1076,6 +1084,10 @@ export default {
     white-space: nowrap;
     color: #909399;
     font-size: 14px;
+
+    /deep/ .el-input__inner {
+      font-size: 13px !important;
+    }
   }
   .el-button {
     height: 34px;
@@ -1094,10 +1106,10 @@ export default {
   overflow-y: auto;
   overflow-x: hidden;
 }
-.right_table {
-  /deep/ .el-table--scrollable-x .el-table__body-wrapper {
+/deep/ .right_table {
+  .el-table__body-wrapper {
     overflow-y: auto;
-    overflow-x: scroll;
+    overflow-x: scroll !important;
   }
   // /deep/ .el-table__footer-wrapper {
   //   margin-top: -2px !important;

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -112,7 +112,7 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <!-- <div>
+          <div>
             班次：
             <el-select
               v-model="shift"
@@ -141,12 +141,12 @@
               >
               </el-option>
             </el-select>
-          </div> -->
+          </div>
 
           <div>
-            <!-- <el-button type="primary" @click="toExport" v-if="state == 2"
+            <el-button type="primary" @click="toExport" v-if="state == 2"
               >导出</el-button
-            > -->
+            >
 
             <el-button type="primary" @click="dispense" v-if="state == 1"
               >发药</el-button
@@ -729,6 +729,9 @@ export default {
     white-space: nowrap;
     color: #909399;
     font-size: 14px;
+    /deep/ .el-input__inner {
+      font-size: 13px !important;
+    }
   }
   .el-table {
     margin-top: -13px;