From 51bd7f8bda618188000dbf5fc866736eedb5cd1a Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 16 Jun 2022 17:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=BF=E5=B1=8B=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      |  4 ++++
 .../modules/base/community/communityTable.vue |  2 +-
 src/views/modules/base/community/roomForm.vue |  1 +
 .../modules/base/community/roomTable.vue      | 24 +++++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index c19f811c..03b19b0d 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -234,6 +234,10 @@ export default {
           value: '0',
           label: '自住'
         },
+        {
+          value: '3',
+          label: '未出售'
+        },
       ],
       ownerName: '',
       ownerPhone: '',
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 5f4a3c76..19736156 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -197,7 +197,7 @@
         <div>
           <el-button class="diy-button--reset"
                  size="small"
-                 @click="handleExport">导出房屋数据</el-button>
+                 @click="handleExport">导出小区数据</el-button>
           <el-button class="diy-button--export"
                  size="small"
                  :disabled="yihuyidangDisabled"
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index bc9194c8..2433e227 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -96,6 +96,7 @@
             <el-radio :label="1">出租</el-radio>
             <el-radio :label="2">闲置</el-radio>
             <el-radio :label="0">自住</el-radio>
+            <el-radio :label="3">未出售</el-radio>
 
           </el-radio-group>
         </el-form-item>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 7fd7efe6..8be48e23 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -571,6 +571,30 @@ export default {
         buildingId: this.agencyObj.id
       }
 
+
+      if (this.agencyObj.level === 'grid') {
+        params.gridId = this.agencyObj.id
+        params.agencyId = ''
+        params.buildingId = ''
+        params.neighborHoodId = ''
+      } else if (this.agencyObj.level === 'neighborHood') {
+        params.neighborHoodId = this.agencyObj.id
+        params.agencyId = ''
+        params.buildingId = ''
+        params.gridId = ''
+      } else if (this.agencyObj.level === 'building') {
+        params.buildingId = this.agencyObj.id
+        params.agencyId = ''
+        params.neighborHoodId = ''
+        params.gridId = ''
+      } else {
+
+        params.agencyId = this.agencyObj.id
+        params.buildingId = ''
+        params.neighborHoodId = ''
+        params.gridId = ''
+      }
+
       app.ajax.exportFilePost(
         url,
         params,