huangyw 2 年 前
コミット
17567a6435
共有2 個のファイルを変更した26 個の追加21 個の削除を含む
  1. 24 19
      src/xt_pages/Pharmacy/DrugDispensing.vue
  2. 2 2
      src/xt_pages/Pharmacy/PatientDispensing.vue

+ 24 - 19
src/xt_pages/Pharmacy/DrugDispensing.vue ファイルの表示

@@ -56,7 +56,7 @@
56 56
             highlight-current-row
57 57
             ref="table01"
58 58
             @current-change="handleCurrentChange"
59
-             :row-style="{ color: '#303133' }"
59
+            :row-style="{ color: '#303133' }"
60 60
             :header-cell-style="{
61 61
               backgroundColor: 'rgb(245, 247, 250)',
62 62
               color: '#606266',
@@ -87,7 +87,7 @@
87 87
             style="width: 100%"
88 88
             highlight-current-row
89 89
             @current-change="handleCurrentChange"
90
-             :row-style="{ color: '#303133' }"
90
+            :row-style="{ color: '#303133' }"
91 91
             :header-cell-style="{
92 92
               backgroundColor: 'rgb(245, 247, 250)',
93 93
               color: '#606266',
@@ -532,7 +532,6 @@ export default {
532 532
         return;
533 533
       }
534 534
       var tmp = "";
535
-      console.log("初始值", tmp);
536 535
       for (var i = 0; i < this.multipleSelection.length; i++) {
537 536
         tmp = tmp + this.multipleSelection[i].id + ",";
538 537
       }
@@ -540,22 +539,28 @@ export default {
540 539
         creater: this.admin_user_id,
541 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 ファイルの表示

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