huangyw 2 years ago
parent
commit
17567a6435

+ 24 - 19
src/xt_pages/Pharmacy/DrugDispensing.vue View File

56
             highlight-current-row
56
             highlight-current-row
57
             ref="table01"
57
             ref="table01"
58
             @current-change="handleCurrentChange"
58
             @current-change="handleCurrentChange"
59
-             :row-style="{ color: '#303133' }"
59
+            :row-style="{ color: '#303133' }"
60
             :header-cell-style="{
60
             :header-cell-style="{
61
               backgroundColor: 'rgb(245, 247, 250)',
61
               backgroundColor: 'rgb(245, 247, 250)',
62
               color: '#606266',
62
               color: '#606266',
87
             style="width: 100%"
87
             style="width: 100%"
88
             highlight-current-row
88
             highlight-current-row
89
             @current-change="handleCurrentChange"
89
             @current-change="handleCurrentChange"
90
-             :row-style="{ color: '#303133' }"
90
+            :row-style="{ color: '#303133' }"
91
             :header-cell-style="{
91
             :header-cell-style="{
92
               backgroundColor: 'rgb(245, 247, 250)',
92
               backgroundColor: 'rgb(245, 247, 250)',
93
               color: '#606266',
93
               color: '#606266',
532
         return;
532
         return;
533
       }
533
       }
534
       var tmp = "";
534
       var tmp = "";
535
-      console.log("初始值", tmp);
536
       for (var i = 0; i < this.multipleSelection.length; i++) {
535
       for (var i = 0; i < this.multipleSelection.length; i++) {
537
         tmp = tmp + this.multipleSelection[i].id + ",";
536
         tmp = tmp + this.multipleSelection[i].id + ",";
538
       }
537
       }
540
         creater: this.admin_user_id,
539
         creater: this.admin_user_id,
541
         ids: tmp,
540
         ids: tmp,
542
       };
541
       };
543
-      medicinedeparture(params).then((res) => {
544
-        if (res.data.state == 1) {
545
-          this.$message.success("操作成功");
546
-          this.getdruglist();
547
-          //刷新列表
548
-          this.handleCurrentChange(this.currentRow);
549
-          this.fun4(tps);
550
-          this.state = 2;
551
-          this.multipleSelection = [];
552
-        } else {
553
-          this.$message.error("操作失败:" + res.data.msg);
554
-          //刷新列表
555
-          this.handleCurrentChange(this.currentRow);
556
-          this.fun5(tps);
557
-          this.state = 1;
558
-        }
542
+      this.$confirm("确定是否对该药品进行发药?", "患者发药", {
543
+        confirmButtonText: "确 定",
544
+        cancelButtonText: "取 消",
545
+        type: "warning",
546
+      }).then(() => {
547
+        medicinedeparture(params).then((res) => {
548
+          if (res.data.state == 1) {
549
+            this.$message.success("操作成功");
550
+            this.getdruglist();
551
+            //刷新列表
552
+            this.handleCurrentChange(this.currentRow);
553
+            this.fun4(tps);
554
+            this.state = 2;
555
+            this.multipleSelection = [];
556
+          } else {
557
+            this.$message.error("操作失败:" + res.data.msg);
558
+            //刷新列表
559
+            this.handleCurrentChange(this.currentRow);
560
+            this.fun5(tps);
561
+            this.state = 1;
562
+          }
563
+        });
559
       });
564
       });
560
     },
565
     },
561
     //获取药品列表
566
     //获取药品列表

+ 2 - 2
src/xt_pages/Pharmacy/PatientDispensing.vue View File

474
         patient_id: this.currentRow.PatientID,
474
         patient_id: this.currentRow.PatientID,
475
         time: this.start_time,
475
         time: this.start_time,
476
       };
476
       };
477
-      this.$confirm("确定是否对该药品进行发药?", "患者发药", {
477
+      this.$confirm("确定是否对该患者进行发药?", "患者发药", {
478
         confirmButtonText: "确 定",
478
         confirmButtonText: "确 定",
479
         cancelButtonText: "取 消",
479
         cancelButtonText: "取 消",
480
         type: "warning",
480
         type: "warning",
533
         patient_id: this.currentRow.PatientID,
533
         patient_id: this.currentRow.PatientID,
534
         time: this.start_time,
534
         time: this.start_time,
535
       };
535
       };
536
-      this.$confirm("确定是否对该药品进行退药?", "患者退药", {
536
+      this.$confirm("确定是否对该患者进行退药?", "患者退药", {
537
         confirmButtonText: "确 定",
537
         confirmButtonText: "确 定",
538
         cancelButtonText: "取 消",
538
         cancelButtonText: "取 消",
539
         type: "warning",
539
         type: "warning",