合并

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -133,7 +133,7 @@
             </el-option>
           </el-select>
           给药途径：
-          <el-select v-model="deliveryway" placeholder="请选择" @change="getdruglist">
+          <el-select v-model="deliveryway" placeholder="请选择" @change="getdruglist02">
             <el-option
               v-for="item in routeofadministration"
               :key="item.name"
@@ -347,7 +347,8 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>合计  {{total}}</div>
+        <div style="background-color: #f5f7fa;display:flex;padding: 10px;justify-content:space-around;position:fixed;width:66.2%;margin-top: 24%;
+"><div style="width: 40%;padding-left:3%">合计 </div> <div style="width: 40%;display: flex;justify-content:center;padding-left: 37%">{{total}}</div></div>
         <div style="margin-top: 25px" v-if="state == 1">
           领药人：
           <el-select v-model="admin_user_id" placeholder="请选择">
@@ -806,6 +807,33 @@ export default {
       });
     },
     //获取药品列表
+    getdruglist02() {
+      var tps = this.currentRow.id;
+      this.tableData = [];
+      var params = {
+        keyword: this.keywords,
+        time: this.start_time,
+        deliveryway: this.deliveryway,
+      };
+      waitingmedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.waiting_drug = res.data.data.list;
+        }
+      });
+      dispensemedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.issued_drug = res.data.data.list;
+        }
+      });
+      if(this.state == 2){
+        this.handleCurrentChange(this.currentRow);
+        this.fun5(tps);
+      }else{
+        this.handleCurrentChange(this.currentRow);
+        this.fun4(tps);
+      }
+    },
+    //获取药品列表
     getdruglist() {
       var params = {
         keyword: this.keywords,