代码提交

3 months ago · 5fab6cdd98
parent 7a03181d04
commit 5fab6cdd98
1 changed files with 0 additions and 10 deletions
--- 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) => {