From 0704b79b3202b1a768ae7aa40ed37a12c567c64d Mon Sep 17 00:00:00 2001
From: RISE <joeldecode@gmail.com>
Date: Fri, 6 Feb 2026 10:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/purchasingrequisition/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/finance/purchasingrequisition/index.vue b/src/views/finance/purchasingrequisition/index.vue
index 0895c09..8e440f8 100644
--- a/src/views/finance/purchasingrequisition/index.vue
+++ b/src/views/finance/purchasingrequisition/index.vue
@@ -375,7 +375,7 @@ const handleIframeMessage = (event: MessageEvent) => {
 };
 
 /**
-<<<<<<< HEAD
+/**
  * 打开查看对话框
  * @param row - 当前行数据
  */
@@ -389,13 +389,15 @@ const handleView = (row: any) => {
  */
 const handleEdit = (row: any) => {
   formDialogRef.value?.openDialog('edit', row);
-=======
+};
+
+/**
  * 履约验收
+ * @param row - 当前行数据
  */
 const handleAccept = (row: any) => {
   acceptModalRef.value?.open(row);
->>>>>>> 61380fa2bca0fe9fd37af1c494a51ba523501f7d
-};
+}; 
 
 /**
  * 删除当前行