From b81efdce84ad137eabbc0ed35a48a97cba7f7225 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 31 Jul 2024 09:50:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E9=87=8D=E6=96=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 306e11b9c..c53791e5f 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1638,7 +1638,6 @@ export default {
     },
     // 添加网格
     async submitGrid () {
-        debugger
         this.$refs.addGridForm.validate(async (result) => {
             if (result === true) {
                 const url = "/gov/org/grid/addgrid";
@@ -1661,7 +1660,7 @@ export default {
                 if (code === 0) {
                     this.$message.success("添加成功");
                     this.dialogVisibleGrid = false;
-                    this.GridForm = [];
+                    this.GridFormRest();
                     this.getAgencyList();
                     this.getDepartmentList();
                     this.getGridList();

From 11a94b7ae5e6f6732cf82ccaff1bccb05fb051fd Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 1 Aug 2024 09:25:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8B=E5=B1=85=E6=B0=91=E5=AF=BC=E5=87=BAgridType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/diyInfo.vue     | 7 +++++++
 src/views/modules/base/virtualResi.vue | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index f848ca7a2..34cce9089 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -141,6 +141,10 @@ export default {
     search: {
       type: Object,
       default: () => {}
+    },
+    virtualResi:{
+      type:Boolean,
+      default:false
     }
   },
   components: {
@@ -331,6 +335,9 @@ export default {
           })
         }
       }
+      if(this.virtualResi){
+        params.gridType = 'virtual'
+      }
       await this.$http({
         method: 'POST',
         url,
diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue
index 58e9418dd..bc9a2096c 100644
--- a/src/views/modules/base/virtualResi.vue
+++ b/src/views/modules/base/virtualResi.vue
@@ -302,7 +302,7 @@
         <el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
             top="5vh" class="dialog-h">
             <diy-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="searchForm"
-                @close="handleDiyClose"></diy-info>
+                @close="handleDiyClose" :virtualResi="true"></diy-info>
         </el-dialog>
 
         <baobiao ref="baobiao" />