11

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -114,68 +114,75 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <!-- 班次：
-          <el-select
-            v-model="shift"
-            placeholder="请选择"
-            @change="getdrugsdetails"
-          >
-            <el-option
-              v-for="item in banshift"
-              :key="item.value"
-              :label="item.text"
-              :value="item.value"
+          <div>
+            班次：
+            <el-select
+              v-model="shift"
+              placeholder="请选择"
+              @change="getdrugsdetails"
             >
-            </el-option>
-          </el-select>
-          分区：
-          <el-select
-            v-model="partition"
-            placeholder="请选择"
-            @change="getdrugsdetails"
-          >
-            <el-option
-              v-for="item in fen"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+              <el-option
+                v-for="item in banshift"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            分区：
+            <el-select
+              v-model="partition"
+              placeholder="请选择"
+              @change="getdrugsdetails"
             >
-            </el-option>
-          </el-select>
-          给药途径：
-          <el-select
-            v-model="deliveryway"
-            placeholder="请选择"
-            @change="getdruglist02"
-          >
-            <el-option
-              v-for="item in routeofadministration"
-              :key="item.name"
-              :label="item.name"
-              :value="item.name"
+              <el-option
+                v-for="item in fen"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+            给药途径：
+            <el-select
+              v-model="deliveryway"
+              placeholder="请选择"
+              @change="getdruglist02"
             >
-            </el-option>
-          </el-select> -->
-          <!-- <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
-          >
-          <el-button type="primary" @click="toPrint">打印</el-button>
-          <!--                    <el-button @click="tt">调试</el-button>-->
+              <el-option
+                v-for="item in routeofadministration"
+                :key="item.name"
+                :label="item.name"
+                :value="item.name"
+              >
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            <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
+            >
+            <el-button type="primary" @click="toPrint">打印</el-button>
+            <!--                    <el-button @click="tt">调试</el-button>-->
+          </div>
         </div>
+
         <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"
-            show-summary
+            
             border
             highlight-current-row
-            style="width: 1328px"
+            style="width: 100%"
             :row-style="{ color: '#303133' }"
             :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
@@ -266,14 +273,26 @@
           </el-table>
         </div>
         <div>
+          <!-- :summary-method="getSummaries"
+            show-summarys -->
           <el-table
+            ref="table_01"
+            v-if="state == 2"
             :height="tableHeight"
             :data="tableData"
+            
             border
-            style="width: 1328px"
-            v-if="state == 2"
+            highlight-current-row
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            @selection-change="handleSelectionChange"
+            
           >
-            <!--            <el-table-column type="selection" width="55"> </el-table-column>-->
+            <!-- <el-table-column type="selection" width="55"> </el-table-column>-->
             <el-table-column
               type="index"
               label="序号"
@@ -519,6 +538,7 @@ export default {
       });
     },
     getSummaries(param) {
+      console.log(param, "pram");
       const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
@@ -526,7 +546,7 @@ export default {
           sums[index] = "合计";
           return;
         }
-       if (index === 7) {
+        if (index === 7) {
           sums[index] = this.total;
           return;
         }
@@ -833,7 +853,7 @@ export default {
       if (this.state == 2) {
         this.handleCurrentChange(this.currentRow);
         // this.fun5(tps);
-      }else{
+      } else {
         this.handleCurrentChange(this.currentRow);
         // this.fun4(tps);
       }
@@ -920,10 +940,10 @@ export default {
       }
     },
     getdrugsdetails(val) {
-      if(this.state == 1){
-        val = 0
-      }else{
-        val = 1
+      if (this.state == 1) {
+        val = 0;
+      } else {
+        val = 1;
       }
       var params = {
         drug_id: this.currentRow.id,
@@ -1011,6 +1031,11 @@ export default {
     this.getrouteofadministration();
     this.getgetpartitionlist();
   },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs["table_01"].doLayout();
+    });
+  },
 };
 </script>
 
@@ -1044,10 +1069,13 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-  overflow-y: auto;
+  overflow-y: hidden;
   .titlelist {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    white-space: nowrap;
+    color: #909399;
+    font-size: 14px;
   }
   .el-button {
     height: 34px;
@@ -1066,11 +1094,14 @@ export default {
   overflow-y: auto;
   overflow-x: hidden;
 }
-.right_table{
+.right_table {
   /deep/ .el-table--scrollable-x .el-table__body-wrapper {
-  overflow-y: auto;
-  overflow-x: scroll;
-}
+    overflow-y: auto;
+    overflow-x: scroll;
+  }
+  // /deep/ .el-table__footer-wrapper {
+  //   margin-top: -2px !important;
+  // }
 }
 /deep/ .gutter {
   width: 15px !important;

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -61,7 +61,7 @@
             border
             style="width: 100%"
             v-if="state == 1"
-             :row-style="{ color: '#303133' }"
+            :row-style="{ color: '#303133' }"
             :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
               color: '#606266',
@@ -87,7 +87,7 @@
             highlight-current-row
             @current-change="handleCurrentChange"
             border
-             :row-style="{ color: '#303133' }"
+            :row-style="{ color: '#303133' }"
             :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
               color: '#606266',
@@ -112,36 +112,54 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          班次：
-          <el-select v-model="shift" placeholder="请选择" @change="searchAction">
-            <el-option
-              v-for="item in banshift"
-              :key="item.value"
-              :label="item.text"
-              :value="item.value">
-            </el-option>
-          </el-select>
-          分区：
-          <el-select v-model="partition" placeholder="请选择" @change="searchAction">
-            <el-option
-              v-for="item in fen"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-          <el-button type="primary" @click="toExport" v-if="state == 2">导出</el-button>
-          <el-button type="primary" @click="dispense" v-if="state == 1"
-            >发药</el-button
-          >
-          <el-button type="primary" @click="endispense" v-if="state == 2"
-            >退药</el-button
-          >
-          <el-button type="primary" @click="toPrint">打印</el-button>
-<!--                    <el-button @click="tiaoshi">调试</el-button>-->
-          <el-button type="primary" v-if="state == 1" @click="toSetting"
-            >设置</el-button
-          >
+          <div>
+            班次：
+            <el-select
+              v-model="shift"
+              placeholder="请选择"
+              @change="searchAction"
+            >
+              <el-option
+                v-for="item in banshift"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            分区：
+            <el-select
+              v-model="partition"
+              placeholder="请选择"
+              @change="searchAction"
+            >
+              <el-option
+                v-for="item in fen"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+
+          <div>
+            <el-button type="primary" @click="toExport" v-if="state == 2"
+              >导出</el-button
+            >
+
+            <el-button type="primary" @click="dispense" v-if="state == 1"
+              >发药</el-button
+            >
+            <el-button type="primary" @click="endispense" v-if="state == 2"
+              >退药</el-button
+            >
+            <el-button type="primary" @click="toPrint">打印</el-button>
+            <!--                    <el-button @click="tiaoshi">调试</el-button>-->
+            <el-button type="primary" v-if="state == 1" @click="toSetting"
+              >设置</el-button
+            >
+          </div>
         </div>
         <el-divider style="margin-top: 10px"></el-divider>
         <div>
@@ -292,15 +310,15 @@ export default {
       currentRow: null,
       dialogVisible: false,
       is_open: "2",
-      banshift:[
-        {value:0,text:'全部班'},
-        {value:1,text:'上午'},
-        {value:2,text: '下午'},
-        {value:3,text: '晚上'}
-        ],
-      shift:0,//班次
-      fen:[],
-      partition:0,//分区
+      banshift: [
+        { value: 0, text: "全部班" },
+        { value: 1, text: "上午" },
+        { value: 2, text: "下午" },
+        { value: 3, text: "晚上" },
+      ],
+      shift: 0, //班次
+      fen: [],
+      partition: 0, //分区
     };
   },
   watch: {},
@@ -313,13 +331,13 @@ export default {
     // this.selectedbydefault();
   },
   methods: {
-    getgetpartitionlist(){
-      var params = {}
-      getpartitionlist(params).then((res) =>{
-        if(res.data.state == 1){
-          this.fen = res.data.data.list
+    getgetpartitionlist() {
+      var params = {};
+      getpartitionlist(params).then((res) => {
+        if (res.data.state == 1) {
+          this.fen = res.data.data.list;
         }
-      })
+      });
     },
     tiaoshi() {
       console.log("this.shift", this.shift);
@@ -448,11 +466,11 @@ export default {
       waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
           this.waitmount_data = res.data.data.list;
-          if(this.shift != 0 || this.partition != 0){
-            if(this.waitmount_data == null){
-              this.waitmount = 0
-            }else{
-              this.waitmount = this.waitmount_data.length
+          if (this.shift != 0 || this.partition != 0) {
+            if (this.waitmount_data == null) {
+              this.waitmount = 0;
+            } else {
+              this.waitmount = this.waitmount_data.length;
             }
           }
         }
@@ -460,11 +478,11 @@ export default {
       issueddrugs(params).then((res) => {
         if (res.data.state == 1) {
           this.alreadmount_data = res.data.data.list;
-          if(this.shift != 0 || this.partition != 0){
-            if (this.alreadmount_data == null){
-              this.alreadmount = 0
-            }else{
-              this.alreadmount = this.alreadmount_data.length
+          if (this.shift != 0 || this.partition != 0) {
+            if (this.alreadmount_data == null) {
+              this.alreadmount = 0;
+            } else {
+              this.alreadmount = this.alreadmount_data.length;
             }
           }
         }
@@ -524,52 +542,50 @@ export default {
       );
     },
     toExport() {
-
       import("@/vendor/Export2Excel").then((excel) => {
-          for (let i = 0; i < this.tableData.length; i++) {
-            this.tableData[i].index = i + 1;
-            this.tableData[i].time = this.start_time
-            this.tableData[i].uname = this.currentRow.Name
-          }
+        for (let i = 0; i < this.tableData.length; i++) {
+          this.tableData[i].index = i + 1;
+          this.tableData[i].time = this.start_time;
+          this.tableData[i].uname = this.currentRow.Name;
+        }
 
-          const tHeader = [
-            "序号",
-            "日期",
-            "患者名称",
-            "名称",
-            "单次用量",
-            "用法",
-            "频率",
-            "天数",
-            "总量",
-            "开立医生",
-            "数据来源",
-            "备注",
-          ];
-          const filterVal = [
-            "index",
-            "time",
-            "uname",
-            "Name",
-            "SingleDosage",
-            "Usage",
-            "Frequency",
-            "Days",
-            "Total",
-            "Doctor",
-            "DataSources",
-            "Remarks",
-          ];
+        const tHeader = [
+          "序号",
+          "日期",
+          "患者名称",
+          "名称",
+          "单次用量",
+          "用法",
+          "频率",
+          "天数",
+          "总量",
+          "开立医生",
+          "数据来源",
+          "备注",
+        ];
+        const filterVal = [
+          "index",
+          "time",
+          "uname",
+          "Name",
+          "SingleDosage",
+          "Usage",
+          "Frequency",
+          "Days",
+          "Total",
+          "Doctor",
+          "DataSources",
+          "Remarks",
+        ];
 
-          const data = this.formatJson(filterVal, this.tableData);
-          excel.export_json_to_excel({
-            header: tHeader,
-            data,
-            filename: "领药单",
-          });
-          this.downloadLoading = false;
+        const data = this.formatJson(filterVal, this.tableData);
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: "领药单",
         });
-
+        this.downloadLoading = false;
+      });
     },
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]));
@@ -579,8 +595,8 @@ export default {
     searchAction() {
       this.tableData = null;
       this.getwaitmount();
-      if(this.shift != 0 || this.partition != 0){
-      }else{
+      if (this.shift != 0 || this.partition != 0) {
+      } else {
         this.gettodaynumber();
       }
     },
@@ -709,7 +725,10 @@ export default {
   overflow-y: auto;
   .titlelist {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    white-space: nowrap;
+    color: #909399;
+    font-size: 14px;
   }
   .el-table {
     margin-top: -13px;
@@ -722,6 +741,10 @@ export default {
     height: 2px;
     margin-top: 10px;
   }
+
+  /deep/ .el-table__body-wrapper {
+    overflow-x: scroll !important;
+  }
 }
 
 /deep/ .el-input__inner {