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) => {