From bc91eb7cdc936cedb652ed5ae05f199dbd3e67d1 Mon Sep 17 00:00:00 2001
From: suizihe <2958847195@qq.com>
Date: Mon, 3 Nov 2025 11:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=9A=84=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=AE=8C=E6=88=90=E8=8D=AF=E5=93=81=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E7=94=B3=E8=AF=B7=E9=80=80=E8=B4=A7=E7=9A=84=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=A1=AE=E8=AE=A4=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medicationmanagement/billapproval/index.vue  | 16 ++++++++++++++++
 .../returnedPurchase/index.vue                   |  1 +
 2 files changed, 17 insertions(+)

diff --git a/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
index 3d0a10c6..20de7283 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
@@ -185,6 +185,7 @@ import {
   getpurchaseInventoryDetail,
   getpurchaseInventoryDetailReturn
 } from "./components/api";
+import { purchaseInventoryApproved as purchaseReturnApproved } from '../returnedPurchase/components/api';
 import { useStore } from '@/store/store';
 import { formatDate } from "@/utils/index";
 import useTagsViewStore from '@/store/modules/tagsView';
@@ -260,6 +261,21 @@ function handelApply(row) {
         getList();
       }
     })
+  }else if(row.typeEnum == 5){ // 采购退货审批通过
+    console.log("采购退货审批通过，typeEnum:", row.typeEnum);
+    console.log("供应单据号:", row.supplyBusNo);
+    purchaseReturnApproved(row.supplyBusNo).then((res) => {
+      console.log("采购退货审批结果:", res);
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess("操作成功");
+        getList();
+      } else {
+        proxy.$modal.msgError("操作失败: " + (res.msg || "未知错误"));
+      }
+    }).catch((error) => {
+      console.error("采购退货审批错误:", error);
+      proxy.$modal.msgError("操作异常: " + error.message);
+    });
   }else{
     purchaseInventoryApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue
index 090af94a..6bac0fe3 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue
@@ -693,6 +693,7 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const visible = ref(false);
+const pageLoading = ref(false);
 const row = ref({});
 const rowIndex = ref(-1);
 const totalAmount = ref(0);