From 46a060328f12a190210aee20583e4042fa6b6e1c Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Wed, 10 Mar 2021 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Development/DevelopmentDate.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/Development/DevelopmentDate.vue b/src/components/Development/DevelopmentDate.vue
index 82b6f05..c8b1855 100644
--- a/src/components/Development/DevelopmentDate.vue
+++ b/src/components/Development/DevelopmentDate.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import DevelopmentEdit from "components/Development/DevelopmentEdit.vue";
+import DevelopmentEdit from 'components/Development/DevelopmentEdit.vue';
 import { selResDelete } from 'config/api';
 
 const columns = [
@@ -118,14 +118,11 @@ export default {
       this.editVisible = true;
     },
 
-<<<<<<< HEAD
-    closeModal() {
-=======
-    async closeModal(){
-    },
+    async closeModal() {},
+
     // 删除
     async onDelete(id) {
-        console.log(id);
+      console.log(id);
       try {
         const params = { param: { id } };
         const res = await selResDelete(params);