From 5fab6cdd9880a13ba9a15a30ed8651e25885ae42 Mon Sep 17 00:00:00 2001
From: taozi <1362265981@qq.com>
Date: Wed, 7 Jan 2026 18:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/secondOrder/components/outDialog.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index 9c85f00..c36aa3e 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -521,15 +521,6 @@ export default {
     },
     handleCloseDetail() {
       this.outDialogVisible = false;
-<<<<<<< HEAD
-      
-      this.$emit("handleCloseDetail");
-    },
-    //关闭新增弹窗
-    closeDialog() {
-      this.categoryVisible = false
-    },
-=======
       this.$emit("handleCloseDetail");
     },
 
@@ -537,7 +528,6 @@ export default {
       this.categoryVisible = false;
     },
 
->>>>>>> 94e2170923f61585374217a741bc58b7f0790b1e
     inInit() {
       if (this.outDialogType != "add") {
         getDetails({ twoOutStorageId: this.rowData.id }).then((res) => {