From 2062ffd1df185a2bd7b2908cc6544866c3a8fd25 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 17 Feb 2022 14:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B0=8F=E5=8C=BA=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9E=9C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildTable.vue     | 19 ++++++++++----
 .../modules/base/community/communityTable.vue | 26 +++++++++----------
 .../modules/base/community/roomTable.vue      | 20 ++++++++++----
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 1c85aae0..07c7eb0d 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -468,12 +468,12 @@ export default {
             //   type: "success",
             //   message: "导入成功"
             // });
-            this.$message.success(rspMsg)
-            this.$emit('refreshTree')
-            this.loadTable()
-          } else {
-            this.$message.error(rspMsg)
+            // this.$message.success(rspMsg)
+
+            // this.$emit('refreshTree')
+            // this.loadTable()
           }
+          this.showMessage(rspMsg)
         },
         (rspMsg, data) => {
           this.endLoading()
@@ -482,6 +482,15 @@ export default {
 
     },
 
+    showMessage (msg) {
+      this.$alert(msg, '操作结果', {
+        confirmButtonText: '关闭',
+        callback: action => {
+          this.$emit('refreshTree')
+          this.loadTable()
+        }
+      });
+    },
 
     handleSizeChange (val) {
       this.pageSize = val
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index e475a5c0..c33c0246 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -470,9 +470,6 @@ export default {
       fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
       fileFormData.append('orgType', this.agencyObj.level === 'grid' ? 'grid' : 'agency');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
-
-
-
       if (type === 'community') {
         this.$refs['upload_community'].clearFiles()
         url = '/gov/org/icneighborhood/neighborhoodimport'
@@ -493,16 +490,11 @@ export default {
         (data, rspMsg) => {
           this.endLoading()
           if (data.code === 0 || data.code > 8000) {
-            // this.$message({
-            //   type: "success",
-            //   message: "导入成功"
-            // });
-            this.$message.success(rspMsg)
-            this.$emit('refreshTree')
-            this.loadTable()
-          } else {
-            this.$message.error(rspMsg)
+
+
+
           }
+          this.showMessage(rspMsg)
         },
         (rspMsg, data) => {
           this.endLoading()
@@ -510,9 +502,17 @@ export default {
         }, { headers: { 'Content-Type': 'multipart/form-data' } })
 
 
-
     },
 
+    showMessage (msg) {
+      this.$alert(msg, '操作结果', {
+        confirmButtonText: '关闭',
+        callback: action => {
+          this.$emit('refreshTree')
+          this.loadTable()
+        }
+      });
+    },
     handleSizeChange (val) {
       this.pageSize = val
       this.pageNo = 1
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 7addb7cf..ac654ced 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -433,12 +433,11 @@ export default {
             //   type: "success",
             //   message: "导入成功"
             // });
-            this.$message.success(rspMsg)
-            this.$emit('refreshTree')
-            this.loadTable()
-          } else {
-            this.$message.error(rspMsg)
+
+            // this.$emit('refreshTree')
+            // this.loadTable()
           }
+          this.showMessage(rspMsg)
         },
         (rspMsg, data) => {
           this.endLoading()
@@ -448,6 +447,17 @@ export default {
 
     },
 
+    showMessage (msg) {
+      this.$alert(msg, '操作结果', {
+        confirmButtonText: '关闭',
+        callback: action => {
+          this.$emit('refreshTree')
+          this.loadTable()
+
+        }
+      });
+    },
+
     handleSizeChange (val) {
       this.pageSize = val
       this.pageNo = 1