药房

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -114,34 +114,34 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-<!--          班次：-->
-<!--          <el-select v-model="shift" placeholder="请选择" @change="getdrugsdetails02">-->
-<!--            <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-->
-<!--              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-->
-<!--              v-for="item in routeofadministration"-->
-<!--              :key="item.name"-->
-<!--              :label="item.name"-->
-<!--              :value="item.name">-->
-<!--            </el-option>-->
-<!--          </el-select>-->
-<!--          <el-button type="primary" @click="toExport" v-if="state == 2">导出</el-button>-->
+          班次：
+          <el-select v-model="shift" placeholder="请选择" @change="getdrugsdetails02">
+            <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
+              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
+              v-for="item in routeofadministration"
+              :key="item.name"
+              :label="item.name"
+              :value="item.name">
+            </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
@@ -347,8 +347,8 @@
             </el-table-column>
           </el-table>
         </div>
-<!--        <div style="background-color: #f5f7fa;display:flex;padding: 10px;justify-content:space-around;position:absolute;width:75.6%;margin-top: 27.5%;-->
-<!--"><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="background-color: #f5f7fa;display:flex;padding: 10px;justify-content:space-around;position:absolute;width:75.6%;margin-top: 27.5%;
+"><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="请选择">
@@ -808,7 +808,7 @@ export default {
     },
     //获取药品列表
     getdruglist02() {
-      var tps = this.currentRow.id;
+      // var tps = this.currentRow.id;
       this.tableData = [];
       var params = {
         keyword: this.keywords,
@@ -827,10 +827,10 @@ export default {
       });
       if(this.state == 2){
         this.handleCurrentChange(this.currentRow);
-        this.fun5(tps);
+        // this.fun5(tps);
       }else{
         this.handleCurrentChange(this.currentRow);
-        this.fun4(tps);
+        // this.fun4(tps);
       }
     },
     //获取药品列表
@@ -938,6 +938,11 @@ export default {
       });
     },
     getdrugsdetails(val) {
+      if(this.state == 1){
+        val = 0
+      }else{
+        val = 1
+      }
       var params = {
         drug_id: this.currentRow.id,
         is_medicine: val,

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -112,25 +112,25 @@
       </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-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
           >
@@ -322,7 +322,12 @@ export default {
       })
     },
     tiaoshi() {
+      console.log("this.shift", this.shift);
       console.log("this.partition", this.partition);
+      console.log("this.waitmount_data", this.waitmount_data);
+      console.log("this.alreadmount_data", this.alreadmount_data);
+      console.log("this.waitmount", this.waitmount);
+      console.log("this.alreadmount", this.alreadmount);
     },
     async fun3() {
       console.log("fun3");
@@ -443,11 +448,25 @@ 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
+            }
+          }
         }
       });
       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
+            }
+          }
         }
       });
     },
@@ -560,6 +579,10 @@ export default {
     searchAction() {
       this.tableData = null;
       this.getwaitmount();
+      if(this.shift != 0 || this.partition != 0){
+      }else{
+        this.gettodaynumber();
+      }
     },
 
     // 药品发药