From 7f3942dfd616bf3ac413c9310125e4cdc7e27155 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 3 Nov 2021 16:28:56 +0800
Subject: [PATCH 01/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF222?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue |  6 ------
 src/views/modules/base/resi.vue   | 36 ++++++++++++++++---------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 67c6ef73..6909034a 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -472,7 +472,6 @@ export default {
       this.addList = [...this.mutiList]
       // console.log('addList----111', this.addList)
     }
-    // } this.addList.push(this.addCount++)
     if (this.fixed) {
       this.getGridList()
       this.getValiheList()
@@ -483,11 +482,6 @@ export default {
   },
   methods: {
     initForm () {
-      // console.log('formInfo', this.formInfo)
-      // if (Object.keys(this.formInfo).length > 0) {
-      //   this.form = { ...this.formInfo }
-      //   return
-      // }
       this.formList.forEach(async item => {
         if (item.optionSourceType === 'remote') {
           await this.getOptionsLists(item.optionSourceValue).then(res => {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 2ee44783..7793c065 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -266,8 +266,8 @@ export default {
     },
     async handleEdit (row) {
       this.disabled = false
-      await this.getFormList()
-      this.getrowInfo(row.icResiUserId)
+      await this.getFormList('edit')
+      await this.getrowInfo(row.icResiUserId)
     },
     async handleAdd () {
       await this.getFormList()
@@ -588,7 +588,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getFormList () {
+    async getFormList (type) {
       await this.$http
         .post('/oper/customize/icform/getcustomerform', { formCode: 'resi_base_info', dynamic: true })
         .then(({ data: res }) => {
@@ -598,23 +598,25 @@ export default {
             console.log('获取详情成功getFormList')
             let { itemList, groupList } = res.data
             this.activeName = 'group' + res.data.groupList[0].groupId
-            itemList.forEach(async item => {
-              if (item.optionSourceType === 'remote') {
-                await this.getOptionsList(item.optionSourceValue).then(res => {
-                  item.options = res
-                })
-              }
-            })
-            groupList.forEach(item => {
-              item.itemList.forEach(async n => {
-                n.tableName = item.tableName
-                if (n.optionSourceType === 'remote') {
-                  await this.getOptionsList(n.optionSourceValue).then(res => {
-                    n.options = res
+            if (type !== 'edit') {
+              itemList.forEach(async item => {
+                if (item.optionSourceType === 'remote') {
+                  await this.getOptionsList(item.optionSourceValue).then(res => {
+                    item.options = res
                   })
                 }
               })
-            })
+              groupList.forEach(item => {
+                item.itemList.forEach(async n => {
+                  n.tableName = item.tableName
+                  if (n.optionSourceType === 'remote') {
+                    await this.getOptionsList(n.optionSourceValue).then(res => {
+                      n.options = res
+                    })
+                  }
+                })
+              })
+            }
             this.formList = itemList
             this.tabsList = groupList
           }

From 6e0f9885d65d38d2224324418a9541e0d1a5baeb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 3 Nov 2021 16:50:37 +0800
Subject: [PATCH 02/26] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF444?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue   |  1 +
 src/views/components/resiSearch.vue |  1 +
 src/views/modules/base/resi.vue     | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 6909034a..0170b276 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -569,6 +569,7 @@ export default {
         // console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
         arr.push([ ...this.$refs['baseForms' + item.row][0].handleForm() ])
       })
+      if (arr.length === 0) return arr
       let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
       let hash = {}
       let i = 0
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 2a0bf6aa..f4c5b830 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -516,6 +516,7 @@ export default {
   margin-bottom: 20px;
 }
 .resi-search {
+  padding-right: 140px;
   .el-col {
     text-align: right;
   }
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 7793c065..55b0e6df 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -85,7 +85,7 @@
       </div>
       <div class="resi-btns">
         <el-button size="small" @click="handlerCancle">取消</el-button>
-        <el-button type="primary" size="small" @click="handleSUbmit">提交</el-button>
+        <el-button type="primary" size="small" :loading="btnLoading" @click="handleSUbmit">提交</el-button>
       </div>
     </el-dialog>
 
@@ -111,7 +111,7 @@
       </div>
       <div class="resi-btns">
         <el-button size="small" @click="handlerEditCancle">取消</el-button>
-        <el-button v-if="!disabled" type="primary" size="small" @click="handleEditSUbmit">提交</el-button>
+        <el-button v-if="!disabled" type="primary" size="small" :loading="btnLoading" @click="handleEditSUbmit">提交</el-button>
       </div>
     </el-dialog>
 
@@ -130,6 +130,7 @@ export default {
   },
   data () {
     return {
+      btnLoading: false,
       disabled: false,
       pageLoading: false,
       dialogEditVisible: false,
@@ -400,8 +401,9 @@ export default {
       })
       this.dialogVisible = false
     },
-    submitAdd (arr) {
-      this.$http
+    async submitAdd (arr) {
+      this.btnLoading = true
+      await this.$http
         .post('/epmetuser/icresiuser/add', arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -420,12 +422,15 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
+        this.btnLoading = false
     },
-    submitEdit (arr) {
-      this.$http
+    async submitEdit (arr) {
+      this.btnLoading = true
+      await this.$http
         .post('/epmetuser/icresiuser/edit', arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
+            
             return this.$message.error(res.msg)
           } else {
             this.$message.success('提交成功')
@@ -441,6 +446,7 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
+        this.btnLoading = false
     },
     getTableHeader () {
       this.$http

From 26edc30f444bae085ebeea6a75bc5843a420928d Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 3 Nov 2021 16:55:30 +0800
Subject: [PATCH 03/26] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF555?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 55b0e6df..1e4571c4 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -25,7 +25,7 @@
           :prop="item.columnName"
           :label="item.label"
           align="center"
-          width="180">
+          :width="item.itemType === 'radio' ? 80 : 180">
           <template slot-scope="scope">
             <span>{{ handleFilterSpan(scope.row, item)}}</span>
           </template>

From 2d53279d11bc950d81c543e2d90a138b551413df Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 3 Nov 2021 16:58:42 +0800
Subject: [PATCH 04/26] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84666?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 1e4571c4..97833f12 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -11,6 +11,7 @@
       </div>
       <el-table
         :data="tableData"
+        v-loading="tableLoading"
         border
         style="width: 100%"
         class="resi-table">
@@ -130,6 +131,7 @@ export default {
   },
   data () {
     return {
+      tableLoading: false,
       btnLoading: false,
       disabled: false,
       pageLoading: false,
@@ -462,14 +464,15 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getTableData () {
+    async getTableData () {
+      this.tableLoading = true
       let params = {
         formCode: 'resi_base_info',
         pageNo: this.currentPage,
         pageSize: this.pageSize,
         conditions: this.conditions
       }
-      this.$http
+      await this.$http
         .post('/epmetuser/icresiuser/listresi', params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -482,6 +485,7 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
+        this.tableLoading = false
     },
     getrowInfo (id) {
       let params = {

From ad511959fe603f65f8adc22a9d31d2c444e6400a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 4 Nov 2021 10:25:34 +0800
Subject: [PATCH 05/26] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=A2=9E=E5=A4=A7?=
 =?UTF-8?q?=E7=BC=A9=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/mapConfig.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 05a56381..2e41fcfe 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -735,7 +735,9 @@ export default vueGis;
 .div_map {
   width: 100%;
 }
+</style>  
+<style>
 .ol-overlaycontainer-stopevent {
   display: none;
 }
-</style>    
\ No newline at end of file
+</style>  
\ No newline at end of file

From 7fe43a49fe731e35dc5573fe57035c1949b1659e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 4 Nov 2021 13:44:16 +0800
Subject: [PATCH 06/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue   | 38 +++++++++++++-------------
 src/views/components/resiForm.vue   | 40 ++++++++++++++--------------
 src/views/components/resiSearch.vue | 41 +++++++++--------------------
 3 files changed, 51 insertions(+), 68 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 0170b276..e213ffaa 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -18,7 +18,7 @@
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
-                  <el-select v-model="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small"
+                  <el-select v-model.trim="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -35,7 +35,7 @@
           <el-col :span="18">
               <el-form-item :prop="form.VILLAGE_ID" label="所属小区">
                 <div class="resi-cell-value">
-                  <el-select v-model="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
+                  <el-select v-model.trim="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -45,7 +45,7 @@
                       :value="item.value">
                     </el-option>
                   </el-select>
-                  <el-select v-model="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
+                  <el-select v-model.trim="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
                   clearable class="resi-cell-select" @change="handleChangeB"
                   >
                     <el-option
@@ -55,7 +55,7 @@
                       :value="item.value">
                     </el-option>
                   </el-select>
-                  <el-select v-model="form.UNIT_ID" :disabled="disabled" placeholder="请选择单元" size="small"
+                  <el-select v-model.trim="form.UNIT_ID" :disabled="disabled" placeholder="请选择单元" size="small"
                   clearable class="resi-cell-select" @change="handleChangeD"
                   >
                     <el-option
@@ -65,7 +65,7 @@
                       :value="item.value">
                     </el-option>
                   </el-select>
-                  <el-select v-model="form.HOME_ID" :disabled="disabled" placeholder="请选择房号" size="small"
+                  <el-select v-model.trim="form.HOME_ID" :disabled="disabled" placeholder="请选择房号" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -81,7 +81,7 @@
           <!-- <el-col :span="6">
               <el-form-item :prop="form.BUILD_ID" label="所属楼宇">
                 <div class="resi-cell-value">
-                  <el-select v-model="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
+                  <el-select v-model.trim="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -97,7 +97,7 @@
           <el-col :span="6">
               <el-form-item :prop="form.HOME_ID" label="所属家庭">
                 <div class="resi-cell-value">
-                  <el-select v-model="form.HOME_ID" :disabled="disabled" placeholder="请选择" size="small"
+                  <el-select v-model.trim="form.HOME_ID" :disabled="disabled" placeholder="请选择" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -122,7 +122,7 @@
                     <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
                       <el-input
                         v-if="n.validType"
-                        v-model="form[n.columnName]"
+                        v-model.trim="form[n.columnName]"
                         :disabled="disabled"
                         class="resi-cell-input"
                         size="small"
@@ -132,7 +132,7 @@
                       </el-input>
                       <el-input
                         v-else
-                        v-model="form[n.columnName]"
+                        v-model.trim="form[n.columnName]"
                         :disabled="disabled"
                         class="resi-cell-input"
                         size="small"
@@ -143,7 +143,7 @@
                     </template>
                     <!-- <template v-if="n.itemType === 'textarea'">
                       <el-input
-                        v-model="form[n.columnName]"
+                        v-model.trim="form[n.columnName]"
                         class="resi-cell-textarea"
                         size="small"
                         type="textarea"
@@ -154,7 +154,7 @@
                     </template> -->
                     <el-date-picker
                       v-else-if="n.itemType === 'datepicker'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       :disabled="disabled"
                       class="resi-cell-input"
                       type="date"
@@ -166,7 +166,7 @@
                     </el-date-picker>
                     <el-date-picker
                       v-else-if="n.itemType === 'daterange'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       :disabled="disabled"
                       type="daterange"
                       align="right"
@@ -179,13 +179,13 @@
                     </el-date-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timepicker'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       :disabled="disabled"
                       placeholder="任意时间点">
                     </el-time-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timerange'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       :disabled="disabled"
                       is-range
                       range-separator="至"
@@ -193,7 +193,7 @@
                       end-placeholder="结束时间"
                       placeholder="选择时间范围">
                     </el-time-picker>
-                    <el-select v-else-if="n.itemType === 'select'" v-model="form[n.columnName]"
+                    <el-select v-else-if="n.itemType === 'select'" v-model.trim="form[n.columnName]"
                     :multiple="n.multiSelect"
                     :disabled="disabled"
                     placeholder="请选择" size="small" clearable class="resi-cell-select">
@@ -210,7 +210,7 @@
                       clearable></el-cascader> -->
                     <el-cascader
                       v-else-if="n.itemType === 'cascader'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       :options="n.options"
                       :props="{ checkStrictly: true }"
                       :disabled="disabled"
@@ -219,14 +219,14 @@
                       class="resi-cell-select">
                     </el-cascader>
                     <template v-else-if="n.itemType === 'radio'">
-                      <el-radio v-for="ns in n.options" :key="ns.value" v-model="form[n.columnName]" :disabled="disabled"
+                      <el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]" :disabled="disabled"
                       :label="ns.value">
                         {{ ns.label }}
                       </el-radio>
-                      <!-- <el-radio v-model="form[n.columnName]" label="1">备选项</el-radio> -->
+                      <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
                     </template>
                     <template v-else-if="n.itemType === 'checkbox'">
-                      <el-checkbox-group v-model="form[n.columnName]">
+                      <el-checkbox-group v-model.trim="form[n.columnName]">
                         <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value" :disabled="disabled">{{ns.label}}</el-checkbox>
                         <!-- <el-checkbox label="n.la"></el-checkbox> -->
                       </el-checkbox-group>
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 5952b972..495e08ef 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -17,7 +17,7 @@
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
-                  <el-select v-model="form.GRID_ID" placeholder="请选择网格" size="small"
+                  <el-select v-model.trim="form.GRID_ID" placeholder="请选择网格" size="small"
                   clearable class="resi-cell-select" @change="handleChangeGrid"
                   >
                     <el-option
@@ -36,7 +36,7 @@
                 <div class="resi-cell-value">
                   <el-col :span="4">
                     <el-form-item prop="VILLAGE_ID">
-                      <el-select v-model="form.VILLAGE_ID" placeholder="请选择小区" size="small"
+                      <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
                       clearable class="resi-cell-select" @change="handleChangeV"
                       >
                         <el-option
@@ -50,7 +50,7 @@
                   </el-col>
                   <el-col :span="4">
                     <el-form-item prop="BUILD_ID">
-                      <el-select v-model="form.BUILD_ID" placeholder="请选择楼号" size="small"
+                      <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
                       clearable class="resi-cell-select" @change="handleChangeB"
                       >
                         <el-option
@@ -64,7 +64,7 @@
                   </el-col>
                   <el-col :span="4">
                     <el-form-item prop="UNIT_ID">
-                      <el-select v-model="form.UNIT_ID" placeholder="请选择单元" size="small"
+                      <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
                       clearable class="resi-cell-select" @change="handleChangeD"
                       >
                         <el-option
@@ -78,7 +78,7 @@
                   </el-col>
                   <el-col :span="4">
                     <el-form-item prop="HOME_ID">
-                      <el-select v-model="form.HOME_ID" placeholder="请选择房号" size="small"
+                      <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
                       clearable class="resi-cell-select"
                       >
                         <el-option
@@ -96,7 +96,7 @@
           <!-- <el-col :span="6">
               <el-form-item :prop="form.BUILD_ID" label="所属楼宇">
                 <div class="resi-cell-value">
-                  <el-select v-model="form.BUILD_ID" placeholder="请选择楼号" size="small"
+                  <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
                   clearable class="resi-cell-select" @change="handleChangeB"
                   >
                     <el-option
@@ -112,7 +112,7 @@
           <el-col :span="6">
               <el-form-item :prop="form.HOME_ID" label="所属家庭">
                 <div class="resi-cell-value">
-                  <el-select v-model="form.HOME_ID" placeholder="请选择" size="small"
+                  <el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
                   clearable class="resi-cell-select resi-cell-select-small"
                   >
                     <el-option
@@ -122,7 +122,7 @@
                       :value="item.value">
                     </el-option>
                   </el-select>
-                  <el-select v-model="form.HOME_ID" placeholder="请选择" size="small"
+                  <el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
                   clearable class="resi-cell-select-small"
                   >
                     <el-option
@@ -147,7 +147,7 @@
                     <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
                       <el-input
                         v-if="n.validType"
-                        v-model="form[n.columnName]"
+                        v-model.trim="form[n.columnName]"
                         class="resi-cell-input"
                         size="small"
                         clearable
@@ -156,7 +156,7 @@
                       </el-input>
                       <el-input
                         v-else
-                        v-model="form[n.columnName]"
+                        v-model.trim="form[n.columnName]"
                         class="resi-cell-input"
                         size="small"
                         clearable
@@ -166,7 +166,7 @@
                     </template>
                     <!-- <template v-if="n.itemType === 'textarea'">
                       <el-input
-                        v-model="form[n.columnName]"
+                        v-model.trim="form[n.columnName]"
                         class="resi-cell-textarea"
                         size="small"
                         type="textarea"
@@ -177,7 +177,7 @@
                     </template> -->
                     <el-date-picker
                       v-else-if="n.itemType === 'datepicker'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       class="resi-cell-input"
                       type="date"
                       size="small"
@@ -188,7 +188,7 @@
                     </el-date-picker>
                     <el-date-picker
                       v-else-if="n.itemType === 'daterange'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       type="daterange"
                       align="right"
                       unlink-panels
@@ -199,12 +199,12 @@
                     </el-date-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timepicker'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       placeholder="任意时间点">
                     </el-time-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timerange'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       is-range
                       class="resi-cell-range"
                       range-separator="至"
@@ -212,7 +212,7 @@
                       end-placeholder="结束时间"
                       placeholder="选择时间范围">
                     </el-time-picker>
-                    <el-select v-else-if="n.itemType === 'select'" v-model="form[n.columnName]"
+                    <el-select v-else-if="n.itemType === 'select'" v-model.trim="form[n.columnName]"
                     :multiple="n.multiSelect"
                     placeholder="请选择" size="small" clearable class="resi-cell-select">
                       <el-option
@@ -228,7 +228,7 @@
                       clearable></el-cascader> -->
                     <el-cascader
                       v-else-if="n.itemType === 'cascader'"
-                      v-model="form[n.columnName]"
+                      v-model.trim="form[n.columnName]"
                       :options="n.options"
                       :props="{ checkStrictly: true }"
                       clearable
@@ -236,14 +236,14 @@
                       class="resi-cell-select">
                     </el-cascader>
                     <template v-else-if="n.itemType === 'radio'">
-                      <el-radio v-for="ns in n.options" :key="ns.value" v-model="form[n.columnName]"
+                      <el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]"
                       :label="ns.value">
                         {{ ns.label }}
                       </el-radio>
-                      <!-- <el-radio v-model="form[n.columnName]" label="1">备选项</el-radio> -->
+                      <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
                     </template>
                     <template v-else-if="n.itemType === 'checkbox'">
-                      <el-checkbox-group v-model="form[n.columnName]">
+                      <el-checkbox-group v-model.trim="form[n.columnName]">
                         <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
                         <!-- <el-checkbox label="n.la"></el-checkbox> -->
                       </el-checkbox-group>
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index f4c5b830..d20f0a83 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -7,7 +7,7 @@
             <div class="resi-cell">
               <div class="resi-cell-label">所属网格</div>
               <div class="resi-cell-value">
-                <el-select v-model="form.GRID_ID" placeholder="请选择" size="small" clearable class="resi-cell-select"
+                <el-select v-model.trim="form.GRID_ID" placeholder="请选择" size="small" clearable class="resi-cell-select"
                 @change="handleChangeGrid">
                   <el-option
                     v-for="item in optionsG"
@@ -23,7 +23,7 @@
             <div class="resi-cell">
               <div class="resi-cell-label">所属小区</div>
               <div class="resi-cell-value">
-                <el-select v-model="form.VILLAGE_ID" placeholder="请选择小区" size="small"
+                <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
                 clearable class="resi-cell-select"
                 @clear="handleClearVillage" @change="handleChangeV">
                   <el-option
@@ -33,7 +33,7 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-                <el-select v-model="form.BUILD_ID" placeholder="楼号" size="small" clearable
+                <el-select v-model.trim="form.BUILD_ID" placeholder="楼号" size="small" clearable
                 class="resi-cell-select" :disabled="changeVDisabled" @clear="handleClearBuild" @change="handleChangeB">
                   <el-option
                     v-for="item in optionsB"
@@ -42,7 +42,7 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-                <el-select v-model="form.UNIT_ID" :disabled="changeBDisabled" placeholder="单元" size="small" clearable class="resi-cell-select" @click="handleClearDan" @change="handleChangeD">
+                <el-select v-model.trim="form.UNIT_ID" :disabled="changeBDisabled" placeholder="单元" size="small" clearable class="resi-cell-select" @click="handleClearDan" @change="handleChangeD">
                   <el-option
                     v-for="item in optionsD"
                     :key="item.value"
@@ -50,7 +50,7 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-                <el-select v-model="form.HOME_ID" :disabled="changeDDisabled" placeholder="楼号" size="small" clearable class="resi-cell-select">
+                <el-select v-model.trim="form.HOME_ID" :disabled="changeDDisabled" placeholder="楼号" size="small" clearable class="resi-cell-select">
                   <el-option
                     v-for="item in optionsH"
                     :key="item.value"
@@ -69,7 +69,7 @@
               <div class="resi-cell-value" :class="n.itemType === 'radio' && 'resi-cell-value-radio'">
                 <el-input
                   v-if="n.itemType === 'input' || n.itemType === 'textarea'"
-                  v-model="form[n.columnName]"
+                  v-model.trim="form[n.columnName]"
                   class="resi-cell-input"
                   size="small"
                   clearable
@@ -79,7 +79,7 @@
                 <template v-else-if="n.itemType === 'datepicker'">
                   <el-date-picker
                     v-if="n.queryType === 'daterange'"
-                    v-model="form[n.columnName]"
+                    v-model.trim="form[n.columnName]"
                     type="daterange"
                     align="right"
                     unlink-panels
@@ -94,7 +94,7 @@
                   </el-date-picker>
                   <el-date-picker
                     v-else
-                    v-model="form[n.columnName]"
+                    v-model.trim="form[n.columnName]"
                     class="resi-cell-input"
                     type="date"
                     size="small"
@@ -104,7 +104,7 @@
                     placeholder="选择日期">
                   </el-date-picker>
                 </template>
-                <el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'" v-model="form[n.columnName]" placeholder="请选择" size="small" clearable class="resi-cell-select">
+                <el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'" v-model.trim="form[n.columnName]" placeholder="请选择" size="small" clearable class="resi-cell-select">
                   <el-option
                     v-for="item in n.options"
                     :key="item.value"
@@ -114,7 +114,7 @@
                 </el-select>
                 <el-cascader
                   v-else-if="n.itemType === 'cascader'"
-                  v-model="form[n.columnName]"
+                  v-model.trim="form[n.columnName]"
                   :options="n.options"
                   :props="{ checkStrictly: true }"
                   clearable
@@ -183,22 +183,6 @@ export default {
       optionsH: [],
       optionsD: [],
       optionsG: [],
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
       value: '',
       fixedList: [],
       fixedForm: {
@@ -218,7 +202,6 @@ export default {
         HOME_ID: ''
       },
       tempFormList,
-      checkList: ['选中且禁用', '复选框 A'],
       pickerOptions: {
         shortcuts: [{
           text: '最近一周',
@@ -317,14 +300,14 @@ export default {
     },
     handleSearch () {
       // console.log('formmmmm---', this.form)
-      const itemTypes = ['cascader', 'daterange', 'timerange']
+      const itemTypes = ['daterange', 'timerange']
       let arr = this.tempFormList.filter(n => n.isChange).map(item => {
         return {
           queryType: item.queryType,
           tableName: item.tableName,
           columnName: item.columnName,
           // columnValue: []
-          columnValue: (itemTypes.includes(item.queryType) || itemTypes.includes(item.itemType)) ? this.form[item.columnName] : [this.form[item.columnName]]
+          columnValue: (itemTypes.includes(item.queryType) || itemTypes.includes(item.itemType)) ? this.form[item.columnName] : [this.form[item.columnName].toString()]
         }
       })
       let arr1 = this.fixedList.filter(n => n.columnValue.length > 0).map(item => {

From 49e99f3dca02d879a552c149a19155bc4c99e248 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 4 Nov 2021 15:17:25 +0800
Subject: [PATCH 07/26] =?UTF-8?q?=E8=A1=A8=E6=98=8E=E4=B8=A2=E5=A4=B1?=
 =?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/resi.vue | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 97833f12..c5251801 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -616,17 +616,18 @@ export default {
                   })
                 }
               })
-              groupList.forEach(item => {
-                item.itemList.forEach(async n => {
-                  n.tableName = item.tableName
-                  if (n.optionSourceType === 'remote') {
-                    await this.getOptionsList(n.optionSourceValue).then(res => {
-                      n.options = res
-                    })
-                  }
-                })
-              })
             }
+            groupList.forEach(item => {
+              item.itemList.forEach(async n => {
+                n.tableName = item.tableName
+                if (n.optionSourceType === 'remote' && type !== 'edit') {
+                  await this.getOptionsList(n.optionSourceValue).then(res => {
+                    n.options = res
+                  })
+                }
+              })
+            })
+            // }
             this.formList = itemList
             this.tabsList = groupList
           }

From b3032648dcbed501aab0c79d74965a8db0abb2c4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 4 Nov 2021 16:18:21 +0800
Subject: [PATCH 08/26] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/communityForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index bce626a3..77323e68 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -383,6 +383,7 @@ export default {
           type: 'success',
           message: '添加物业成功'
         })
+        this.dataForm.propertyId = data.propertyId
         this.propertyForm.name = ''
         this.propertyFormShow = false
         this.loadProperty()

From e6d5424295f9a0c5b4a7788bcabd94c89076ff0b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Nov 2021 15:44:55 +0800
Subject: [PATCH 09/26] ff

---
 src/views/components/resiSearch.vue | 278 ++++++++++++++++++----------
 1 file changed, 179 insertions(+), 99 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index d20f0a83..41c00cf2 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -7,13 +7,20 @@
             <div class="resi-cell">
               <div class="resi-cell-label">所属网格</div>
               <div class="resi-cell-value">
-                <el-select v-model.trim="form.GRID_ID" placeholder="请选择" size="small" clearable class="resi-cell-select"
-                @change="handleChangeGrid">
+                <el-select
+                  v-model.trim="form.GRID_ID"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @change="handleChangeGrid"
+                >
                   <el-option
                     v-for="item in optionsG"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </div>
@@ -23,50 +30,91 @@
             <div class="resi-cell">
               <div class="resi-cell-label">所属小区</div>
               <div class="resi-cell-value">
-                <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
-                clearable class="resi-cell-select"
-                @clear="handleClearVillage" @change="handleChangeV">
+                <el-select
+                  v-model.trim="form.VILLAGE_ID"
+                  placeholder="请选择小区"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @clear="handleClearVillage"
+                  @change="handleChangeV"
+                >
                   <el-option
                     v-for="item in optionsV"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
-                <el-select v-model.trim="form.BUILD_ID" placeholder="楼号" size="small" clearable
-                class="resi-cell-select" :disabled="changeVDisabled" @clear="handleClearBuild" @change="handleChangeB">
+                <el-select
+                  v-model.trim="form.BUILD_ID"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  :disabled="changeVDisabled"
+                  @clear="handleClearBuild"
+                  @change="handleChangeB"
+                >
                   <el-option
                     v-for="item in optionsB"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
-                <el-select v-model.trim="form.UNIT_ID" :disabled="changeBDisabled" placeholder="单元" size="small" clearable class="resi-cell-select" @click="handleClearDan" @change="handleChangeD">
+                <el-select
+                  v-model.trim="form.UNIT_ID"
+                  :disabled="changeBDisabled"
+                  placeholder="单元"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @click="handleClearDan"
+                  @change="handleChangeD"
+                >
                   <el-option
                     v-for="item in optionsD"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
-                <el-select v-model.trim="form.HOME_ID" :disabled="changeDDisabled" placeholder="楼号" size="small" clearable class="resi-cell-select">
+                <el-select
+                  v-model.trim="form.HOME_ID"
+                  :disabled="changeDDisabled"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                >
                   <el-option
                     v-for="item in optionsH"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </div>
             </div>
           </el-col>
         </el-row>
-        <el-row v-for="(item, index) in sliceList(formList, 4)" :key="index" class="resi-row">
+        <el-row
+          v-for="(item, index) in sliceList(formList, 4)"
+          :key="index"
+          class="resi-row"
+        >
           <el-col v-for="n in item" :key="n.id" :span="6">
             <div class="resi-cell">
-              <div class="resi-cell-label">{{n.label}}</div>
-              <div class="resi-cell-value" :class="n.itemType === 'radio' && 'resi-cell-value-radio'">
+              <div class="resi-cell-label">{{ n.label }}</div>
+              <div
+                class="resi-cell-value"
+                :class="n.itemType === 'radio' && 'resi-cell-value-radio'"
+              >
                 <el-input
                   v-if="n.itemType === 'input' || n.itemType === 'textarea'"
                   v-model.trim="form[n.columnName]"
@@ -74,7 +122,7 @@
                   size="small"
                   clearable
                   placeholder="请输入内容"
-                  >
+                >
                 </el-input>
                 <template v-else-if="n.itemType === 'datepicker'">
                   <el-date-picker
@@ -90,7 +138,8 @@
                     size="small"
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
-                    :picker-options="pickerOptions">
+                    :picker-options="pickerOptions"
+                  >
                   </el-date-picker>
                   <el-date-picker
                     v-else
@@ -101,15 +150,24 @@
                     clearable
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
-                    placeholder="选择日期">
+                    placeholder="选择日期"
+                  >
                   </el-date-picker>
                 </template>
-                <el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'" v-model.trim="form[n.columnName]" placeholder="请选择" size="small" clearable class="resi-cell-select">
+                <el-select
+                  v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
+                  v-model.trim="form[n.columnName]"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                >
                   <el-option
                     v-for="item in n.options"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
                 <el-cascader
@@ -119,20 +177,22 @@
                   :props="{ checkStrictly: true }"
                   clearable
                   size="small"
-                  class="resi-cell-select">
+                  class="resi-cell-select"
+                >
                 </el-cascader>
               </div>
             </div>
           </el-col>
-          
         </el-row>
       </el-row>
       <el-row class="resi-search">
         <!-- <el-col :span="20">
           <el-button type="primary" size="mini">查询</el-button>
         </el-col> -->
-         <el-col :span="24">
-          <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+        <el-col :span="24">
+          <el-button type="primary" size="mini" @click="handleSearch"
+            >查询</el-button
+          >
         </el-col>
       </el-row>
       <div class="resi-down" @click="handleOpenSearch">
@@ -152,7 +212,7 @@ export default {
       default: () => []
     }
   },
-  data () {
+  data() {
     let initForm = (arr) => {
       let _form = {}
       // console.log('formInfo', obj)
@@ -160,13 +220,13 @@ export default {
       //   _form = { ...obj }
       //   return _form
       // }
-      arr.forEach(item => {
+      arr.forEach((item) => {
         _form[item.columnName] = ''
       })
       return _form
     }
     let form = initForm(this.formList)
-    let tempFormList = [ ...this.formList ]
+    let tempFormList = [...this.formList]
     let constForm = {
       ...form,
       GRID_ID: '',
@@ -203,36 +263,40 @@ export default {
       },
       tempFormList,
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick (picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick (picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick (picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
+        shortcuts: [
+          {
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+              picker.$emit('pick', [start, end])
+            }
           }
-        }]
+        ]
       }
     }
   },
   computed: {
-    sliceList () {
+    sliceList() {
       return function (data, count) {
         if (data !== undefined) {
           let index = 0
@@ -248,19 +312,19 @@ export default {
         }
       }
     },
-    changeVDisabled () {
+    changeVDisabled() {
       return !this.form.VILLAGE_ID
     },
-    changeBDisabled () {
+    changeBDisabled() {
       return !this.form.BUILD_ID
     },
-    changeDDisabled () {
+    changeDDisabled() {
       return !this.form.UNIT_ID
     }
   },
   watch: {
     form: {
-      handler (val, val2) {
+      handler(val, val2) {
         // console.log('valpppp----', val, val2)
         for (let n in val) {
           if (this.constForm[n] !== val[n]) {
@@ -273,55 +337,64 @@ export default {
       deep: true
     }
   },
-  created () {
+  created() {
     // this.initForm()
     // console.log('formcccc---', this.form)
     this.getGridList()
+    this.getValiheList()
   },
   methods: {
-    initForm () {
-      this.formList.forEach(item => {
+    initForm() {
+      this.formList.forEach((item) => {
         this.$set(this.form, item.columnName, '')
       })
       console.log('formcccc---', this.form)
     },
-    handleClearVillage () {
+    handleClearVillage() {
       this.form.BUILD_ID = ''
       this.form.HOME_ID = ''
     },
-    handleClearBuild () {
+    handleClearBuild() {
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
     },
-    handleClearDan () {
+    handleClearDan() {
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
     },
-    handleSearch () {
+    handleSearch() {
       // console.log('formmmmm---', this.form)
       const itemTypes = ['daterange', 'timerange']
-      let arr = this.tempFormList.filter(n => n.isChange).map(item => {
-        return {
-          queryType: item.queryType,
-          tableName: item.tableName,
-          columnName: item.columnName,
-          // columnValue: []
-          columnValue: (itemTypes.includes(item.queryType) || itemTypes.includes(item.itemType)) ? this.form[item.columnName] : [this.form[item.columnName].toString()]
-        }
-      })
-      let arr1 = this.fixedList.filter(n => n.columnValue.length > 0).map(item => {
-        return {
-          ...item
-        }
-      })
-      let arr3 = [ ...arr1, ...arr ]
+      let arr = this.tempFormList
+        .filter((n) => n.isChange)
+        .map((item) => {
+          return {
+            queryType: item.queryType,
+            tableName: item.tableName,
+            columnName: item.columnName,
+            // columnValue: []
+            columnValue:
+              itemTypes.includes(item.queryType) ||
+              itemTypes.includes(item.itemType)
+                ? this.form[item.columnName]
+                : [this.form[item.columnName].toString()]
+          }
+        })
+      let arr1 = this.fixedList
+        .filter((n) => n.columnValue.length > 0)
+        .map((item) => {
+          return {
+            ...item
+          }
+        })
+      let arr3 = [...arr1, ...arr]
       this.$emit('search', arr3)
     },
-    handleOpenSearch () {
+    handleOpenSearch() {
       this.openSearch = !this.openSearch
     },
-    handleChangeGrid (val) {
+    handleChangeGrid(val) {
       console.log('val', val)
       this.form.VILLAGE_ID = ''
       this.form.BUILD_ID = ''
@@ -329,26 +402,26 @@ export default {
       this.form.HOME_ID = ''
       this.getValiheList()
     },
-    handleChangeV (val) {
+    handleChangeV(val) {
       console.log('val', val)
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
       this.getBuildList()
     },
-    handleChangeB (val) {
+    handleChangeB(val) {
       console.log('val', val)
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
       this.getUniList()
     },
-    handleChangeD (val) {
+    handleChangeD(val) {
       console.log('val', val)
       this.form.HOME_ID = ''
       this.getHouseList()
     },
     // 监听基础form
-    handleChangeForm (val) {
+    handleChangeForm(val) {
       for (let n in this.fixedForm) {
         if (n === val) {
           if (this.fixedList.length > 0) {
@@ -378,11 +451,11 @@ export default {
         }
       }
       console.log('fixedList----999', this.fixedList)
-      this.tempFormList.forEach(item => {
+      this.tempFormList.forEach((item) => {
         if (item.columnName === val) item.isChange = true
       })
     },
-    getGridList () {
+    getGridList() {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId })
@@ -398,10 +471,13 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList () {
+    getValiheList() {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, agencyId: user.agencyId })
+        .post('/gov/org/icneighborhood/neighborhoodoption', {
+          gridId: this.form.GRID_ID,
+          agencyId: user.agencyId
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -414,9 +490,11 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList () {
+    getBuildList() {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.VILLAGE_ID })
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.form.VILLAGE_ID
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -429,9 +507,11 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList () {
+    getUniList() {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.BUILD_ID })
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.form.BUILD_ID
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -444,7 +524,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList () {
+    getHouseList() {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
         .then(({ data: res }) => {
@@ -458,7 +538,7 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
-    },
+    }
   }
 }
 </script>
@@ -480,7 +560,7 @@ export default {
   box-sizing: border-box;
   margin-left: -23rpx;
   cursor: pointer;
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 0 0 10px 10px;
   img {
     display: block;
@@ -489,11 +569,11 @@ export default {
 .resi-row-box {
   height: 104px;
   overflow: hidden;
-  transition: height .5s;
+  transition: height 0.5s;
 }
 .resi-row-more {
   height: max-content;
-  transition: height .5s;
+  transition: height 0.5s;
 }
 .resi-row {
   margin-bottom: 20px;

From 1915fd7d0891772156e6647c55b67643742644ee Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Nov 2021 16:18:58 +0800
Subject: [PATCH 10/26] 111

---
 src/views/components/resiSearch.vue |   6 +-
 src/views/modules/base/resi.vue     | 365 +++++++++++++++++-----------
 2 files changed, 228 insertions(+), 143 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 41c00cf2..925367a1 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -134,7 +134,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    class="resi-cell-input"
+                    class="resi-cell--daterange"
                     size="small"
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
@@ -588,6 +588,7 @@ export default {
   display: flex;
   align-items: center;
   .resi-cell-label {
+    flex-shrink: 0;
     width: 70px;
     box-sizing: border-box;
     margin-right: 15px;
@@ -602,6 +603,9 @@ export default {
   .resi-cell-input {
     width: 180px;
   }
+  .resi-cell--daterange {
+    width: 100%;
+  }
   .resi-cell-select {
     width: 180px;
     box-sizing: border-box;
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c5251801..fcd7ed4f 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,11 +1,19 @@
 <template>
   <div v-if="pageLoading">
-    <resi-search v-if="searchList.length > 0" ref="resiSearch" :form-list="searchList" @search="handleSearch" />
+    <resi-search
+      v-if="searchList.length > 0"
+      ref="resiSearch"
+      :form-list="searchList"
+      @search="handleSearch"
+    />
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        
-        <el-button type="success" size="small" @click="handleAdd">新增</el-button>
-        <el-button type="warning" size="small" @click="handleExport">导出</el-button>
+        <el-button type="success" size="small" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button type="warning" size="small" @click="handleExport"
+          >导出</el-button
+        >
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
         <!-- <el-button type="danger" size="small">导入人口数据</el-button> -->
       </div>
@@ -14,11 +22,9 @@
         v-loading="tableLoading"
         border
         style="width: 100%"
-        class="resi-table">
-        <el-table-column
-          type="index"
-          align="center"
-          width="50">
+        class="resi-table"
+      >
+        <el-table-column type="index" align="center" width="50">
         </el-table-column>
         <el-table-column
           v-for="item in tableHeader"
@@ -26,28 +32,42 @@
           :prop="item.columnName"
           :label="item.label"
           align="center"
-          :width="item.itemType === 'radio' ? 80 : 180">
+          :width="item.itemType === 'radio' ? 80 : 180"
+        >
           <template slot-scope="scope">
-            <span>{{ handleFilterSpan(scope.row, item)}}</span>
+            <span>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          fixed="right"
-          label="操作"
-          align="center"
-          width="120">
+        <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">查看</el-button>
+            <el-button
+              @click="handleLook(scope.row)"
+              type="text"
+              size="small"
+              class="btn-color-look"
+              >查看</el-button
+            >
             <template v-if="filterEdit(scope.row.ORG_ID)">
-              <el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">编辑</el-button>
+              <el-button
+                @click="handleEdit(scope.row)"
+                type="text"
+                size="small"
+                class="btn-color-edit"
+                >编辑</el-button
+              >
               <el-popconfirm
                 title="删除之后无法回复，确认删除？"
                 @onConfirm="handleDel(scope.row)"
               >
-                <el-button slot="reference" type="text" size="small" class="btn-color-del">删除</el-button>
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="small"
+                  class="btn-color-del"
+                  >删除</el-button
+                >
               </el-popconfirm>
             </template>
-            
           </template>
         </el-table-column>
       </el-table>
@@ -59,63 +79,112 @@
           :page-sizes="[20, 50, 100, 200]"
           :page-size="pageSize"
           layout="sizes, prev, pager, next"
-          :total="total">
+          :total="total"
+        >
         </el-pagination>
       </div>
     </el-card>
 
     <el-dialog
-      title="新增"
+      :title="formName"
       :visible.sync="dialogVisible"
       width="80%"
       append-to-body
       :close-on-click-modal="false"
-      :before-close="handlerCancle">
-      <resi-form v-if="dialogVisible" ref="baseForm" :fixed="true" :form-list="formList" @changegroup="handleChangeGroup" />
-      <div v-if="dialogVisible"  class="resi-other">
+      :before-close="handlerCancle"
+    >
+      <resi-form
+        v-if="dialogVisible"
+        ref="baseForm"
+        :fixed="true"
+        :form-list="formList"
+        @changegroup="handleChangeGroup"
+      />
+      <div v-if="dialogVisible" class="resi-other">
         <div class="resi-other-title">其他</div>
         <div class="tabs-other-info">
           <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane v-for="item in tabsList" :key="item.columnName"
-            :label="item.label" :name="'group' + item.groupId">
-              <resi-form :ref="'group' + item.groupId" :columns="3" :support-add="item.supportAdd"
-              :form-id="item.columnName" :form-list=" item.itemList" />
+            <el-tab-pane
+              v-for="item in tabsList"
+              :key="item.columnName"
+              :label="item.label"
+              :name="'group' + item.groupId"
+            >
+              <resi-form
+                :ref="'group' + item.groupId"
+                :columns="3"
+                :support-add="item.supportAdd"
+                :form-id="item.columnName"
+                :form-list="item.itemList"
+              />
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <div class="resi-btns">
         <el-button size="small" @click="handlerCancle">取消</el-button>
-        <el-button type="primary" size="small" :loading="btnLoading" @click="handleSUbmit">提交</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleSUbmit"
+          >提交</el-button
+        >
       </div>
     </el-dialog>
 
-     <el-dialog
-      title="编辑"
+    <el-dialog
+      :title="formName"
       :visible.sync="dialogEditVisible"
       width="80%"
       append-to-body
       :close-on-click-modal="false"
-      :before-close="handlerEditCancle">
-      <edit-resi v-if="dialogEditVisible" ref="baseForm" :disabled="disabled" :form-info="editForm" :fixed="true" :form-list="formList" @changegroup="handleChangeGroup" />
-      <div v-if="dialogEditVisible"  class="resi-other">
+      :before-close="handlerEditCancle"
+    >
+      <edit-resi
+        v-if="dialogEditVisible"
+        ref="baseForm"
+        :disabled="disabled"
+        :form-info="editForm"
+        :fixed="true"
+        :form-list="formList"
+        @changegroup="handleChangeGroup"
+      />
+      <div v-if="dialogEditVisible" class="resi-other">
         <div class="resi-other-title">其他</div>
         <div class="tabs-other-info">
           <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane v-for="item in tabsList" :key="item.columnName"
-            :label="item.label" :name="'group' + item.groupId">
-              <edit-resi :ref="'group' + item.groupId" :columns="3" :support-add="item.supportAdd"
-              :form-id="item.columnName" :muti-list="item.mutiList" :form-list=" item.itemList" :disabled="disabled" />
+            <el-tab-pane
+              v-for="item in tabsList"
+              :key="item.columnName"
+              :label="item.label"
+              :name="'group' + item.groupId"
+            >
+              <edit-resi
+                :ref="'group' + item.groupId"
+                :columns="3"
+                :support-add="item.supportAdd"
+                :form-id="item.columnName"
+                :muti-list="item.mutiList"
+                :form-list="item.itemList"
+                :disabled="disabled"
+              />
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <div class="resi-btns">
         <el-button size="small" @click="handlerEditCancle">取消</el-button>
-        <el-button v-if="!disabled" type="primary" size="small" :loading="btnLoading" @click="handleEditSUbmit">提交</el-button>
+        <el-button
+          v-if="!disabled"
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleEditSUbmit"
+          >提交</el-button
+        >
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -129,7 +198,7 @@ export default {
     resiForm,
     editResi
   },
-  data () {
+  data() {
     return {
       tableLoading: false,
       btnLoading: false,
@@ -150,15 +219,14 @@ export default {
         BUILD_ID: '',
         HOME_ID: ''
       },
-      editTableName: {
-
-      },
+      editTableName: {},
+      formName: '',
       formList: [],
       tableHeader: [],
       tabsList: []
     }
   },
-  async created () {
+  async created() {
     await this.getSearchList()
     // await this.getFormList()
     await this.getTableHeader()
@@ -167,38 +235,38 @@ export default {
     console.log('storeoooo----0000', this.$store)
   },
   methods: {
-    filterEdit (id) {
+    filterEdit(id) {
       const { user } = this.$store.state
       return id === user.agencyId
     },
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
       this.getTableData()
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`)
       this.currentPage = val
       this.getTableData()
     },
-    handleFilterSpan (row, item) {
+    handleFilterSpan(row, item) {
       let _val = ''
       if (item.itemType === 'radio' && item.options.length > 0) {
-        item.options.forEach(n => {
+        item.options.forEach((n) => {
           if (n.value === row[item.columnName]) _val = n.label
         })
       }
       return _val || row[item.columnName]
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log('searchhh--', val)
       this.currentPage = 1
       this.conditions = val
       this.getTableData()
     },
     // 下载文件
-    download (data, fileName) {
-      console.log('data',data)
+    download(data, fileName) {
+      console.log('data', data)
       if (!data) {
         return
       }
@@ -206,29 +274,28 @@ export default {
       var csvData = new Blob([data])
 
       if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+        window.navigator.msSaveOrOpenBlob(csvData, fileName)
       }
       // for Non-IE (chrome, firefox etc.)
       else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
+        var a = document.createElement('a')
+        document.body.appendChild(a)
+        a.style = 'display: none'
+        var url = window.URL.createObjectURL(csvData)
+        a.href = url
+        a.download = fileName
+        a.click()
+        a.remove()
+        window.URL.revokeObjectURL(url)
       }
-
     },
-    handleExport () {
+    handleExport() {
       let params = {
         formCode: 'resi_base_info',
         conditions: this.conditions
       }
 
-        // .post('epmetuser/icresiuser/exportExcel', params)
+      // .post('epmetuser/icresiuser/exportExcel', params)
       this.$http({
         url: 'epmetuser/icresiuser/exportExcel',
         method: 'post',
@@ -237,46 +304,47 @@ export default {
           headers: { 'Content-Type': 'application/x-download' }
         },
         responseType: 'blob'
-      }).then(({ data: res }) => {
+      })
+        .then(({ data: res }) => {
           // var headerData = res.headers
           // this.download(res, '人员数据.xlsx')
-          console.log('res',res)
+          console.log('res', res)
           const fileName = '人员数据.xlsx'
-          let blob = new Blob([res], {type: 'application/vnd.ms-excel'})
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
+          let blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
           // window.location.href = res.data
         })
-        .catch(err => {
+        .catch((err) => {
           console.log('获取导出情失败', err)
           return this.$message.error('网络错误')
         })
     },
-    handleClick (tab, event) {
+    handleClick(tab, event) {
       console.log(tab, event)
     },
-    async handleLook (row) {
+    async handleLook(row) {
       this.disabled = true
       await this.getFormList()
       this.getrowInfo(row.icResiUserId)
     },
-    async handleEdit (row) {
+    async handleEdit(row) {
       this.disabled = false
       await this.getFormList('edit')
       await this.getrowInfo(row.icResiUserId)
     },
-    async handleAdd () {
+    async handleAdd() {
       await this.getFormList()
       this.dialogVisible = true
     },
-    async handleChangeGroup (val) {
+    async handleChangeGroup(val) {
       console.log('changeguoprrrrr----', val)
       let { childGroup, value } = val
       let hasT = false
@@ -291,9 +359,9 @@ export default {
       if (value === 1 || value === '1') {
         // console.log('changegroup----999', value)
         if (!hasT) {
-          childGroup.itemList.forEach(async item => {
+          childGroup.itemList.forEach(async (item) => {
             if (item.optionSourceType === 'remote') {
-              await this.getOptionsList(item.optionSourceValue).then(res => {
+              await this.getOptionsList(item.optionSourceValue).then((res) => {
                 item.options = res
               })
               // console.log('')
@@ -306,17 +374,19 @@ export default {
         if (hasT) this.tabsList.splice(i, 1)
       }
     },
-    formetForm () {
+    formetForm() {
       const _baseForm = this.$refs.baseForm.handleForm()
       let arr = []
       if (_baseForm.length === 0) return false
-      arr.push([ ..._baseForm ])
-      this.tabsList.forEach(item => {
-        arr.push([ ...this.$refs['group' + item.groupId][0].handleForm() ])
+      arr.push([..._baseForm])
+      this.tabsList.forEach((item) => {
+        arr.push([...this.$refs['group' + item.groupId][0].handleForm()])
+      })
+      let arr2 = arr.reduce(function (a, b) {
+        return a.concat(b)
       })
-      let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
       let noChange = true
-      arr2.forEach(item => {
+      arr2.forEach((item) => {
         if (item.list.length !== 0) noChange = false
       })
       console.log('arr2', arr2)
@@ -344,11 +414,12 @@ export default {
       })
       console.log('res', res)
       // 多个list合并成一个list子集
-      res.forEach(item => {
+      res.forEach((item) => {
         let _form = {}
-        item.list.length > 0 && item.list.forEach(n => {
-          _form = { ..._form, ...n }
-        })
+        item.list.length > 0 &&
+          item.list.forEach((n) => {
+            _form = { ..._form, ...n }
+          })
         if (item.list.length > 0) {
           finalArr.push({
             tableName: item.tableName,
@@ -359,15 +430,15 @@ export default {
       console.log('finalArr', finalArr)
       return finalArr
     },
-    async handleEditSUbmit () {
+    async handleEditSUbmit() {
       const arr = await this.formetForm()
       if (arr) this.submitEdit(arr)
     },
-    async handleSUbmit () {
+    async handleSUbmit() {
       const arr = await this.formetForm()
       if (arr) this.submitAdd(arr)
     },
-    handleDel (row) {
+    handleDel(row) {
       let params = {
         formCode: 'resi_base_info',
         icResiUserId: row.icResiUserId
@@ -386,24 +457,24 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    handleFormatUrl (url) {
+    handleFormatUrl(url) {
       return url.includes('?')
     },
-    handlerEditCancle () {
+    handlerEditCancle() {
       this.$refs.baseForm.resetForm()
-      this.tabsList.forEach(item => {
+      this.tabsList.forEach((item) => {
         this.$refs['group' + item.groupId][0].resetForm()
       })
       this.dialogEditVisible = false
     },
-    handlerCancle () {
+    handlerCancle() {
       this.$refs.baseForm.resetForm()
-      this.tabsList.forEach(item => {
+      this.tabsList.forEach((item) => {
         this.$refs['group' + item.groupId][0].resetForm()
       })
       this.dialogVisible = false
     },
-    async submitAdd (arr) {
+    async submitAdd(arr) {
       this.btnLoading = true
       await this.$http
         .post('/epmetuser/icresiuser/add', arr)
@@ -414,7 +485,7 @@ export default {
             this.$message.success('提交成功')
             // this.$refs[formName].resetFields();
             this.$refs.baseForm.resetForm()
-            this.tabsList.forEach(item => {
+            this.tabsList.forEach((item) => {
               this.$refs['group' + item.groupId][0].resetForm()
             })
             this.getTableData()
@@ -424,21 +495,20 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
-        this.btnLoading = false
+      this.btnLoading = false
     },
-    async submitEdit (arr) {
+    async submitEdit(arr) {
       this.btnLoading = true
       await this.$http
         .post('/epmetuser/icresiuser/edit', arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            
             return this.$message.error(res.msg)
           } else {
             this.$message.success('提交成功')
             // this.$refs[formName].resetFields();
             this.$refs.baseForm.resetForm()
-            this.tabsList.forEach(item => {
+            this.tabsList.forEach((item) => {
               this.$refs['group' + item.groupId][0].resetForm()
             })
             this.getTableData()
@@ -448,11 +518,13 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
-        this.btnLoading = false
+      this.btnLoading = false
     },
-    getTableHeader () {
+    getTableHeader() {
       this.$http
-        .post('/oper/customize/icform/tableheaders', { formCode: 'resi_base_info' })
+        .post('/oper/customize/icform/tableheaders', {
+          formCode: 'resi_base_info'
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -464,7 +536,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getTableData () {
+    async getTableData() {
       this.tableLoading = true
       let params = {
         formCode: 'resi_base_info',
@@ -485,9 +557,9 @@ export default {
         .catch(() => {
           return this.$message.error('网络错误')
         })
-        this.tableLoading = false
+      this.tableLoading = false
     },
-    getrowInfo (id) {
+    getrowInfo(id) {
       let params = {
         formCode: 'resi_base_info',
         icResiUserId: id
@@ -505,7 +577,7 @@ export default {
             for (let n in list) {
               this.editForm[n] = list[n]
             }
-            this.formList.forEach(item => {
+            this.formList.forEach((item) => {
               if (item.childGroup && info[item.childGroup.tableName]) {
                 // let _info = info[item.childGroup.tableName]
                 // item.childGroup.itemList.forEach(n => {
@@ -516,7 +588,7 @@ export default {
               item.columnValue = list[item.columnName]
               item.ID = list.ID
             })
-            this.tabsList.forEach(item => {
+            this.tabsList.forEach((item) => {
               let _info = info[item.tableName]
               if (item.supportAdd) {
                 // console.log('tabsList---333', item.label)
@@ -527,7 +599,7 @@ export default {
                     // console.log('mutiList----555' + index, mutiList, _list)
                     mutiList.splice(index, 0, {
                       row: index,
-                      itemList: _list.map(m => {
+                      itemList: _list.map((m) => {
                         // console.log('itemList---item' + index, m)
                         return {
                           ...m,
@@ -542,7 +614,7 @@ export default {
                 item.mutiList = mutiList
               } else {
                 if (_info) {
-                  item.itemList.forEach(n => {
+                  item.itemList.forEach((n) => {
                     n.ID = _info[0].ID
                     n.columnValue = _info[0][n.columnName]
                   })
@@ -558,7 +630,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getOptionsList (url) {
+    async getOptionsList(url) {
       let options = []
       // console.log('getOptionsList----', url)
       await this.$http
@@ -575,18 +647,21 @@ export default {
         })
       return options
     },
-    getSearchList () {
+    getSearchList() {
       this.$http
-        .post('/oper/customize/icform/conditionlist', { formCode: 'resi_base_info', dynamic: true })
+        .post('/oper/customize/icform/conditionlist', {
+          formCode: 'resi_base_info',
+          dynamic: true
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
             // console.log('获取查询详情成功', res.data)
             this.searchList = res.data
-            res.data.forEach(item => {
+            res.data.forEach((item) => {
               if (item.optionSourceType === 'remote') {
-                this.getOptionsList(item.optionSourceValue).then(res => {
+                this.getOptionsList(item.optionSourceValue).then((res) => {
                   item.options = res
                 })
                 // console.log('')
@@ -598,30 +673,36 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getFormList (type) {
+    async getFormList(type) {
       await this.$http
-        .post('/oper/customize/icform/getcustomerform', { formCode: 'resi_base_info', dynamic: true })
+        .post('/oper/customize/icform/getcustomerform', {
+          formCode: 'resi_base_info',
+          dynamic: true
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
             console.log('获取详情成功getFormList')
-            let { itemList, groupList } = res.data
+            let { itemList, groupList, formName } = res.data
+            this.formName = formName
             this.activeName = 'group' + res.data.groupList[0].groupId
             if (type !== 'edit') {
-              itemList.forEach(async item => {
+              itemList.forEach(async (item) => {
                 if (item.optionSourceType === 'remote') {
-                  await this.getOptionsList(item.optionSourceValue).then(res => {
-                    item.options = res
-                  })
+                  await this.getOptionsList(item.optionSourceValue).then(
+                    (res) => {
+                      item.options = res
+                    }
+                  )
                 }
               })
             }
-            groupList.forEach(item => {
-              item.itemList.forEach(async n => {
+            groupList.forEach((item) => {
+              item.itemList.forEach(async (n) => {
                 n.tableName = item.tableName
                 if (n.optionSourceType === 'remote' && type !== 'edit') {
-                  await this.getOptionsList(n.optionSourceValue).then(res => {
+                  await this.getOptionsList(n.optionSourceValue).then((res) => {
                     n.options = res
                   })
                 }
@@ -652,20 +733,21 @@ export default {
     font-weight: 500;
     color: #666666;
     line-height: 20px;
-    background: #EBECF1;
+    background: #ebecf1;
     border-radius: 2px;
   }
-  .el-tabs__nav-wrap::after, .el-tabs__active-bar {
+  .el-tabs__nav-wrap::after,
+  .el-tabs__active-bar {
     display: none;
   }
-  .el-tabs__nav-next, .el-tabs__nav-prev {
+  .el-tabs__nav-next,
+  .el-tabs__nav-prev {
     line-height: 20px;
   }
-
 }
 .resi-table {
   .el-button--text {
-      text-decoration: underline;
+    text-decoration: underline;
   }
   .btn-color-del {
     margin-left: 10px;
@@ -711,5 +793,4 @@ export default {
   margin-top: 20px;
   text-align: center;
 }
-
 </style>

From 6fa454244ea2b3c56f136dc6ad59d2ea189819cd Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Nov 2021 16:40:00 +0800
Subject: [PATCH 11/26] 3333

---
 src/views/components/resiSearch.vue |  4 ++--
 src/views/modules/base/resi.vue     | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 925367a1..39c20019 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -65,7 +65,7 @@
                   >
                   </el-option>
                 </el-select>
-                <el-select
+                <!-- <el-select
                   v-model.trim="form.UNIT_ID"
                   :disabled="changeBDisabled"
                   placeholder="单元"
@@ -98,7 +98,7 @@
                     :value="item.value"
                   >
                   </el-option>
-                </el-select>
+                </el-select> -->
               </div>
             </div>
           </el-col>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index fcd7ed4f..b3832659 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -578,15 +578,20 @@ export default {
               this.editForm[n] = list[n]
             }
             this.formList.forEach((item) => {
-              if (item.childGroup && info[item.childGroup.tableName]) {
-                // let _info = info[item.childGroup.tableName]
-                // item.childGroup.itemList.forEach(n => {
-                //   n.columnValue = _info[0][n.columnName]
-                // })
-                this.tabsList.push(item.childGroup)
-              }
               item.columnValue = list[item.columnName]
               item.ID = list.ID
+
+              if (
+                item.columnValue == '1' &&
+                item.itemType === 'radio' &&
+                item.childGroup
+              ) {
+                this.tabsList.push(item.childGroup)
+              }
+
+              // if (item.childGroup && info[item.childGroup.tableName]) {
+
+              // }
             })
             this.tabsList.forEach((item) => {
               let _info = info[item.tableName]

From 5da1e41c27a57342f33d151cffb22691e9ae6dc1 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Nov 2021 16:58:01 +0800
Subject: [PATCH 12/26] =?UTF-8?q?=E9=98=BF=E6=96=AF=E9=A1=BF=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index b3832659..4ca3f937 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -443,17 +443,21 @@ export default {
         formCode: 'resi_base_info',
         icResiUserId: row.icResiUserId
       }
+      console.log('row1', row)
       this.$http
         .post('/epmetuser/icresiuser/delete', params)
         .then(({ data: res }) => {
+          console.log('row2', row)
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
+            console.log('row3', row)
             this.$message.success('删除成功')
             this.getTableData()
           }
         })
-        .catch(() => {
+        .catch((err) => {
+          console.log('row4', err)
           return this.$message.error('网络错误')
         })
     },

From 582ed34615ef110c13d2641c5c3f85f6f1bb03b9 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Nov 2021 17:28:50 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E6=89=93=E5=8F=8D=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 4ca3f937..9f7f2af0 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -55,9 +55,31 @@
                 class="btn-color-edit"
                 >编辑</el-button
               >
+              <!-- <el-popover placement="top" width="160" trigger="manual">
+                <p>删除之后无法回复，确认删除？</p>
+                <div style="text-align: right; margin: 0">
+                  <el-button size="mini" type="text" @click="rowVisible = false"
+                    >取消</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    @click="handleDel(scope.row)"
+                    >确定</el-button
+                  >
+                </div>
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="small"
+                  class="btn-color-del"
+                  @click="rowVisible = true"
+                  >删除</el-button
+                >
+              </el-popover> -->
               <el-popconfirm
                 title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row)"
+                @confirm="handleDel(scope.row)"
               >
                 <el-button
                   slot="reference"
@@ -200,6 +222,7 @@ export default {
   },
   data() {
     return {
+      rowVisible: false,
       tableLoading: false,
       btnLoading: false,
       disabled: false,

From 36b80a1e7b3ff7f1140bf5d1aef4776786eb31fe Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Nov 2021 17:38:06 +0800
Subject: [PATCH 14/26] =?UTF-8?q?=E9=94=81=E5=AE=9A=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json => npm-shrinkwrap.json | 0
 src/views/modules/base/resi.vue          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package-lock.json => npm-shrinkwrap.json (100%)

diff --git a/package-lock.json b/npm-shrinkwrap.json
similarity index 100%
rename from package-lock.json
rename to npm-shrinkwrap.json
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9f7f2af0..1b6d8f20 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -79,7 +79,7 @@
               </el-popover> -->
               <el-popconfirm
                 title="删除之后无法回复，确认删除？"
-                @confirm="handleDel(scope.row)"
+                @onConfirm="handleDel(scope.row)"
               >
                 <el-button
                   slot="reference"

From 8c572f241432213dc1587f91fd553b5f75b9fcf0 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Nov 2021 17:50:12 +0800
Subject: [PATCH 15/26] =?UTF-8?q?=E6=B0=B4=E7=94=B5=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 1b6d8f20..9f7f2af0 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -79,7 +79,7 @@
               </el-popover> -->
               <el-popconfirm
                 title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row)"
+                @confirm="handleDel(scope.row)"
               >
                 <el-button
                   slot="reference"

From b49dbe72e04cf7d890bb21690624dc6a6be7a1ea Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 8 Nov 2021 14:27:47 +0800
Subject: [PATCH 16/26] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildForm.vue      |  1 +
 .../modules/base/community/buildTable.vue     |  1 +
 .../modules/base/community/communityForm.vue  |  4 +-
 .../modules/base/community/communityTable.vue |  1 +
 src/views/modules/workSys/mapConfig.vue       | 56 +++++++++++++------
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index c53b55ce..78ad23e8 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -277,6 +277,7 @@ export default {
       this.setMarker(lat, lng)
     },
     resetData () {
+      this.keyWords = ''
       this.buildingId = '' //楼栋ID
       this.dataForm = {
         agencyId: '', // 所属组织ID
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index a46e9238..eef64ebe 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -207,6 +207,7 @@ export default {
     },
 
     diaClose () {
+      this.$refs.ref_form.resetData()
       this.formShow = false
     },
 
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 77323e68..c4fc2411 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -126,8 +126,7 @@
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                      maxlength="50"
-                      show-word-limit
+                      maxlength="10"
                       placeholder="请输入小区名称"
                       v-model="propertyForm.name">
             </el-input>
@@ -401,6 +400,7 @@ export default {
       }
     },
     resetData () {
+      this.keyWords = ''
       this.neighborHoodId = '' //小区ID
       this.dataForm = {
         neighborHoodName: '', // 小区名称【不超过50字】
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 95fb78b6..3590e919 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -214,6 +214,7 @@ export default {
     },
 
     diaClose () {
+      this.$refs.ref_form.resetData()
       this.formShow = false
     },
 
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 2e41fcfe..a3ff77e4 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -22,11 +22,11 @@
                  type="primary"
                  icon="el-icon-edit"
                  @click="handleEditPolygon">{{method==='mEditPolygon'?'取消绘制':'重新绘制'}}</el-button>
-      <el-button v-if="showBtn&&hasPolygon"
+      <!-- <el-button v-if="showBtn&&hasPolygon"
                  style="margin-left:10px"
                  type="primary"
                  icon="el-icon-delete"
-                 @click="handleDelPolygon">删除区域</el-button>
+                 @click="handleDelPolygon">删除区域</el-button> -->
 
     </div>
     <div class="div_back">
@@ -47,9 +47,6 @@
 <script>
 import 'ol/ol.css'
 import { Map, View } from 'ol'
-import { ZoomSlider, Zoom } from 'ol/control.js';
-import ImageLayer from 'ol/layer/Image.js';
-import Static from 'ol/source/ImageStatic.js';
 import TileLayer from 'ol/layer/Tile.js';
 import XYZ from 'ol/source/XYZ.js';
 import VectorLayer from 'ol/layer/Vector.js';
@@ -64,7 +61,6 @@ import Draw from 'ol/interaction/Draw.js';
 import { mapGetters } from "vuex";
 import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
-import { transform } from 'ol/proj'
 import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
 
 
@@ -192,7 +188,7 @@ const vueGis = {
 
     },
 
-    //刷新地图
+    //刷新地图  isRefreshView:是否需要重置中心点，如果是绘制、删除区域，不需要，如果是下钻或返回需要
     async refreshMap (isRefreshView) {
       //加载组织数据
       await this.loadOrgData()
@@ -326,20 +322,24 @@ const vueGis = {
 
     //选择feature
     selectFeature (e) {
-      console.log(e)
-      this.selAgencyId = e.selected[0].id_
-      this.subAgencyArray.forEach((element, index) => {
-        if (element.id === e.selected[0].id_) {
-          this.selAgencyIndex = index
-          this.orgChange(index)
-        }
+      // console.log(e)
+
+      if (this.method === undefined || this.method === '') {
+        this.selAgencyId = e.selected[0].id_
+        this.subAgencyArray.forEach((element, index) => {
+          if (element.id === e.selected[0].id_) {
+            this.selAgencyIndex = index
+            this.orgChange(index)
+          }
+
+        });
+      }
 
-      });
 
     },
     //下钻到下一级
     toSubAgency (e) {
-      console.log(e)
+
       if (this.method != 'mAddPolygon' && this.level != 'neighborHood') {
         //下钻到下一级
         this.subAgencyArray.forEach(item => {
@@ -580,6 +580,7 @@ const vueGis = {
         type: "Polygon"
       });
       map.addInteraction(draw);
+
       draw.on('drawend', feature => {
         this.polygonCoor = feature.feature.values_.geometry.flatCoordinates
 
@@ -590,10 +591,28 @@ const vueGis = {
         if (this.polygonCoor.length > 0) {
           coorString = coorString.substring(0, coorString.length - 1)
         }
-        console.log(coorString)
+
+        if (this.method === 'mEditPolygon') {
+          this.$confirm("是否确认覆盖原有区域?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              this.addPolygon(coorString)
+            })
+            .catch(err => {
+              this.loadPolygon(this.subAgencyArray)
+
+
+            });
+
+        } else {
+          this.addPolygon(coorString)
+        }
+
         this.method = ""
         map.removeInteraction(draw);
-        this.addPolygon(coorString)
 
       });
     },
@@ -625,6 +644,7 @@ const vueGis = {
 
 
     },
+
     //删除标注
     async delPolygon () {
       const url = "/gov/org/agency/mapdelarea"

From a8f6f62bc042366497ee5f6e88321e985bba556d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 9 Nov 2021 10:52:16 +0800
Subject: [PATCH 17/26] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/buildTable.vue | 2 +-
 src/views/modules/base/community/roomTable.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index eef64ebe..e266053f 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -54,7 +54,7 @@
                  :http-request="uploadFile">
         <el-button style="margin-left:10px"
                    size="small"
-                   type="red">导入小区数据</el-button>
+                   type="red">导入楼宇数据</el-button>
       </el-upload>
     </div>
 
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 88eff4c9..0dcf306a 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -54,7 +54,7 @@
                  :http-request="uploadFile">
         <el-button style="margin-left:10px"
                    size="small"
-                   type="red">导入小区数据</el-button>
+                   type="red">导入房屋数据</el-button>
       </el-upload>
     </div>
 

From 317449d52d4f6730f397c205f9287091ae9c599a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 9 Nov 2021 14:00:31 +0800
Subject: [PATCH 18/26] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildForm.vue      | 63 +++++++++++++------
 .../modules/base/community/buildTable.vue     | 10 ++-
 .../modules/base/community/community.vue      |  7 ++-
 .../modules/base/community/communityForm.vue  | 32 ++++++++--
 .../modules/base/community/communityTable.vue |  4 ++
 src/views/modules/base/community/roomForm.vue | 49 +++++++++------
 .../modules/base/community/roomTable.vue      |  6 +-
 7 files changed, 123 insertions(+), 48 deletions(-)

diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 78ad23e8..e7d957e5 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -2,7 +2,8 @@
   <div>
     <div>
 
-      <el-form :inline="true"
+      <el-form ref="ref_form"
+               :inline="true"
                :model="dataForm"
                :rules="dataRule"
                :disabled="formType === 'detail'"
@@ -18,8 +19,7 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
+                    maxlength="10"
                     placeholder="请输入楼栋名称"
                     v-model="dataForm.buildingName">
           </el-input>
@@ -37,28 +37,36 @@
         </el-form-item>
         <el-form-item label="排序"
                       prop="sort"
+                      style="display: block"
                       label-width="150px">
-          <el-input-number v-model="dataForm.sort"
+          <el-input-number class="item_width_1"
+                           v-model="dataForm.sort"
                            label="排序"></el-input-number>
         </el-form-item>
         <el-form-item label="单元数"
+                      style="display: block"
                       prop="totalUnitNum"
                       label-width="150px">
-          <el-input-number v-model="dataForm.totalUnitNum"
+          <el-input-number class="item_width_1"
+                           v-model="dataForm.totalUnitNum"
                            :min="1"
                            label="单元数"></el-input-number>
         </el-form-item>
         <el-form-item label="层数"
+                      style="display: block"
                       prop="totalFloorNum"
                       label-width="150px">
-          <el-input-number v-model="dataForm.totalFloorNum"
+          <el-input-number class="item_width_1"
+                           v-model="dataForm.totalFloorNum"
                            :min="1"
                            label="层数"></el-input-number>
         </el-form-item>
         <el-form-item label="户数"
+                      style="display: block"
                       prop="totalHouseNum"
                       label-width="150px">
-          <el-input-number v-model="dataForm.totalHouseNum"
+          <el-input-number class="item_width_1"
+                           v-model="dataForm.totalHouseNum"
                            :min="1"
                            label="户数"></el-input-number>
         </el-form-item>
@@ -159,15 +167,26 @@ export default {
 
       this.formType = type
       if (row) {
-        this.buildingId = row.buildingId
-        this.dataForm = row
-        this.buildType = row.buildingTypeKey
+        this.dataForm = JSON.parse(JSON.stringify(row))
+        this.buildingId = this.dataForm.buildingId
+        this.buildType = this.dataForm.buildingTypeKey
       }
-      console.log(row)
+
 
     },
 
     async handleComfirm () {
+      this.dataForm.type = this.buildType
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+        } else {
+          this.addBuild()
+        }
+
+      })
+    },
+    async addBuild () {
       let url = ''
       if (this.formType === 'add') {
         url = '/gov/org/building/buildingadd'
@@ -176,7 +195,7 @@ export default {
 
         this.dataForm.buildingId = this.buildingId
       }
-      this.dataForm.type = this.buildType
+
 
       const { data, code, msg } = await requestPost(url, this.dataForm)
 
@@ -279,6 +298,7 @@ export default {
     resetData () {
       this.keyWords = ''
       this.buildingId = '' //楼栋ID
+      this.buildType = '1'
       this.dataForm = {
         agencyId: '', // 所属组织ID
         agencyName: '',
@@ -289,7 +309,7 @@ export default {
         totalUnitNum: 0,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//户数	
-        type: '1',//房屋类型
+        type: '',//房屋类型
         location: '', //坐标位置
         longitude: '', //经度
         latitude: '' //纬度
@@ -323,16 +343,21 @@ export default {
             trigger: 'blur'
           }
         ],
-        agencyId: [
-          { required: true, message: '所属组织不能为空', trigger: 'blur' }
+        type: [
+          { required: true, message: '楼栋类型不能为空', trigger: 'blur' }
         ],
-        gridId: [
-          { required: true, message: '所属网格不能为空', trigger: 'blur' }
+        totalUnitNum: [
+          { required: true, message: '单元数不能为空', trigger: 'blur' }
+        ],
+        totalFloorNum: [
+          { required: true, message: '层数不能为空', trigger: 'blur' }
+        ],
+        totalHouseNum: [
+          { required: true, message: '户数不能为空', trigger: 'blur' }
         ],
-
         longitude: [
           { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ]
+        ],
       }
     },
 
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index e266053f..651a961c 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -61,18 +61,19 @@
     <div class="div_table">
       <el-table :data="tableData"
                 border
+                v-loading="tableLoading"
                 style="width: 100%">
         <el-table-column prop="buildingName"
                          label="楼栋名称"
-                         width="180">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="neighborHoodName"
                          label="所属小区"
-                         width="160">
+                         min-width="160">
         </el-table-column>
         <el-table-column prop="buildingType"
                          label="楼栋类型"
-                         width="140">
+                         min-width="140">
         </el-table-column>
         <el-table-column prop="totalUnitNum"
                          label="单元数">
@@ -152,6 +153,7 @@ export default {
       total: 0,
       pageSize: 20,
       pageNo: 0,
+      tableLoading: true,
 
       agencyObj: {},//树所选的小区对象
       ownerName: '',
@@ -183,6 +185,7 @@ export default {
     },
 
     async loadTable (fromTree, treeObj) {
+      this.tableLoading = true
       if (fromTree) {
         this.agencyObj = treeObj
       }
@@ -204,6 +207,7 @@ export default {
       } else {
         this.$message.error(msg)
       }
+      this.tableLoading = false
     },
 
     diaClose () {
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index cbefbc81..8a3321e2 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -13,6 +13,7 @@
             </el-input>
 
             <el-tree ref="ref_tree"
+                     v-loading="treeLoading"
                      class="filter-tree"
                      :data="treeData"
                      :props="defaultProps"
@@ -66,6 +67,7 @@ export default {
   data () {
     return {
       filterText: '',
+      treeLoading: true,
       treeData: [],
       defaultProps: {
         children: 'children',
@@ -82,6 +84,7 @@ export default {
     CDialog
   },
   async mounted () {
+    this.treeLoading = true
     await this.loadOrgData()
     await this.loadTree()
     await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
@@ -91,6 +94,7 @@ export default {
         this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
       });
     }
+    this.treeLoading = false
 
   },
   computed: {
@@ -166,12 +170,13 @@ export default {
 
     //添加小区结束
     async refreshTree () {
-
+      this.treeLoading = true
       await this.loadTree(this.selTreeObj.id)
       this.$nextTick(() => {
         // ref_tree 元素的ref   value 绑定的node-key
         this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
       });
+      this.treeLoading = false
     },
 
     //解析树数据
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index c4fc2411..50845fd3 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -2,7 +2,8 @@
   <div>
     <div>
       <div v-show="!propertyFormShow">
-        <el-form :inline="true"
+        <el-form ref="ref_form"
+                 :inline="true"
                  :model="dataForm"
                  :rules="dataRule"
                  :disabled="formType === 'detail'"
@@ -276,10 +277,11 @@ export default {
 
       this.formType = type
       if (row) {
-        this.neighborHoodId = row.neighborHoodId
-        this.dataForm = row
+
+        this.dataForm = JSON.parse(JSON.stringify(row))
+        this.neighborHoodId = this.dataForm.neighborHoodId
       }
-      console.log(row)
+
 
       await this.loadAgency()
       await this.loadGrid()
@@ -332,19 +334,29 @@ export default {
     },
 
     handleAddProperty () {
-
       this.propertyForm.name = ''
       this.propertyFormShow = true
     },
 
     async handleComfirm () {
       if (this.propertyFormShow) {
+
         this.addProperty()
+
       } else {
-        this.addCommunity()
+        this.$refs['ref_form'].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj)
+          } else {
+            this.addCommunity()
+          }
+
+        })
+
       }
     },
     async addCommunity () {
+
       let url = ''
       if (this.formType === 'add') {
         url = '/gov/org/neighborhood/neighborhoodadd'
@@ -367,8 +379,16 @@ export default {
       } else {
         this.$message.error(msg)
       }
+
     },
     async addProperty () {
+      if (!this.propertyForm.name || this.propertyForm.name === '') {
+        this.$message({
+          type: 'error',
+          message: '物业名称不能为空'
+        })
+        return false
+      }
       const url = '/gov/org/propertymanagement/add'
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
       let params = {
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 3590e919..1a8ca199 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -63,6 +63,7 @@
     <div class="div_table">
       <el-table :data="tableData"
                 border
+                v-loading="tableLoading"
                 style="width: 100%">
         <el-table-column prop="neighborHoodName"
                          label="小区名称"
@@ -154,6 +155,7 @@ export default {
       total: 0,
       pageSize: 20,
       pageNo: 0,
+      tableLoading: true,
 
       agencyObj: {},//树所选的组织对象
       ownerName: '',
@@ -188,6 +190,7 @@ export default {
       this.loadTable()
     },
     async loadTable (fromTree, treeObj) {
+      this.tableLoading = true
       if (fromTree) {
         this.agencyObj = treeObj
       }
@@ -211,6 +214,7 @@ export default {
       } else {
         this.$message.error(msg)
       }
+      this.tableLoading = false
     },
 
     diaClose () {
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 620c23f2..781117f2 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -1,7 +1,8 @@
 <template>
   <div>
     <div>
-      <el-form :inline="false"
+      <el-form ref="ref_form"
+               :inline="false"
                :model="dataForm"
                :rules="dataRule"
                :disabled="formType === 'detail'"
@@ -103,7 +104,6 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
-                    type='number'
                     placeholder="请输入房主身份证"
                     v-model="dataForm.ownerIdCard">
           </el-input>
@@ -136,7 +136,7 @@ export default {
       houseId: '', //房屋ID
       houseType: '1',
       purpose: '1',
-      rentFlag: false,
+      rentFlag: 0,
       dataForm: {
         neighborHoodId: '', // 所属小区ID
         buildingId: '',//所属楼栋ID
@@ -169,20 +169,20 @@ export default {
 
       this.formType = type
       if (row) {
-        this.houseId = row.houseId
-        this.dataForm = row
+        this.dataForm = JSON.parse(JSON.stringify(row))
+        this.houseId = this.dataForm.houseId
 
-        this.dataForm.buildingUnitId = row.unitNumKey
-        this.houseType = row.houseTypeKey
-        this.purpose = row.purposeKey
-        if (row.rentFlagKey) {
+        this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        this.houseType = this.dataForm.houseTypeKey
+        this.purpose = this.dataForm.purposeKey
+        if (this.dataForm.rentFlagKey) {
           this.rentFlag = 1
         } else {
           this.rentFlag = 0
         }
 
       }
-      console.log(row)
+
 
       await this.loadUnitList()
 
@@ -206,6 +206,20 @@ export default {
     },
 
     async handleComfirm () {
+      this.dataForm.houseType = this.houseType
+      this.dataForm.purpose = this.purpose
+      this.dataForm.rentFlag = this.rentFlag
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+        } else {
+          this.addRoom()
+        }
+
+      })
+    },
+
+    async addRoom () {
       let url = ''
 
       if (this.formType === 'add') {
@@ -215,9 +229,7 @@ export default {
         this.dataForm.houseId = this.houseId
       }
 
-      this.dataForm.houseType = this.houseType
-      this.dataForm.purpose = this.purpose
-      this.dataForm.rentFlag = this.rentFlag
+
 
       const { data, code, msg } = await requestPost(url, this.dataForm)
 
@@ -242,14 +254,17 @@ export default {
 
     resetData () {
       this.houseId = '' //房屋ID
+      this.houseType = '1'
+      this.purpose = '1'
+      this.rentFlag = 0
       this.dataForm = {
         neighborHoodId: '', // 所属小区ID
         buildingId: '',//所属楼栋ID
-        buildingUnitId: 0,//所属单元ID	
-        doorName: 0,//门牌号	
+        buildingUnitId: '',//所属单元ID	
+        doorName: '',//门牌号	
         houseType: '1',//房屋类型【楼房，平房，别墅】		
         purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: '1',//是否出租【是：1，否：0】		
+        rentFlag: 0,//是否出租【是：1，否：0】		
         ownerPhone: '', //房主电话	
         ownerName: '', //房主名字		
         ownerIdCard: '' //房主身份证	
@@ -277,14 +292,12 @@ export default {
         buildingUnitId: [
           { required: true, message: '所属单元不能为空', trigger: 'blur' },
         ],
-
         doorName: [
           { required: true, message: '门牌号不能为空', trigger: 'blur' }
         ],
         houseType: [
           { required: true, message: '房屋类型不能为空', trigger: 'blur' }
         ],
-
         purpose: [
           { required: true, message: '房屋用途不能为空', trigger: 'blur' }
         ],
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 0dcf306a..f2978907 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -60,6 +60,7 @@
 
     <div class="div_table">
       <el-table :data="tableData"
+                v-loading="tableLoading"
                 border
                 style="width: 100%">
         <el-table-column prop="houseName"
@@ -164,7 +165,7 @@ export default {
       total: 0,
       pageSize: 20,
       pageNo: 0,
-
+      tableLoading: true,
 
       agencyObj: {},//树所选的小区对象
       ownerName: '',
@@ -198,6 +199,7 @@ export default {
     },
 
     async loadTable (fromTree, treeObj) {
+      this.tableLoading = true
       if (fromTree) {
         this.agencyObj = treeObj
       }
@@ -219,9 +221,11 @@ export default {
       } else {
         this.$message.error(msg)
       }
+      this.tableLoading = false
     },
 
     diaClose () {
+      this.$refs.ref_form.resetData()
       this.formShow = false
     },
 

From 210c1a72ab1d52e1386af3e3fcd6d01203961221 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 14:35:43 +0800
Subject: [PATCH 19/26] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 npm-shrinkwrap.json => package-lock.json |  0
 src/views/modules/base/resi.vue          | 72 +++++++++++++++++++++---
 2 files changed, 65 insertions(+), 7 deletions(-)
 rename npm-shrinkwrap.json => package-lock.json (100%)

diff --git a/npm-shrinkwrap.json b/package-lock.json
similarity index 100%
rename from npm-shrinkwrap.json
rename to package-lock.json
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9f7f2af0..5a62eecc 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -8,14 +8,24 @@
     />
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success" size="small" @click="handleAdd"
-          >新增</el-button
-        >
-        <el-button type="warning" size="small" @click="handleExport"
-          >导出</el-button
-        >
+        <el-button type="success" size="small" @click="handleAdd">新增</el-button>
+        <el-button type="warning" size="small" @click="handleExport">导出</el-button>
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
-        <!-- <el-button type="danger" size="small">导入人口数据</el-button> -->
+        <el-upload
+          ref="upload"
+          class="upload-demo"
+          action="uploadUlr"
+          :limit="1"
+          :with-credentials="true"
+          :show-file-list="false"
+          :auto-upload="true"
+          :on-success="handleExcelSuccess"
+          :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest"
+          >
+          <el-button type="danger" size="small">导入人口数据</el-button>
+        </el-upload>
+        
       </div>
       <el-table
         :data="tableData"
@@ -229,6 +239,7 @@ export default {
       pageLoading: false,
       dialogEditVisible: false,
       dialogVisible: false,
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
       currentPage: 1,
       pageSize: 20,
       total: null,
@@ -350,6 +361,49 @@ export default {
           return this.$message.error('网络错误')
         })
     },
+    // 上传大图标成功
+    handleExcelSuccess (res, file) {
+      if (res.code === 0 && res.msg === 'success') {
+
+        console.log('resss---ppp', res)
+
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+
+    beforeExcelUpload (file) {
+      console.log('file', file)
+      const isType = file.type === 'application/vnd.ms-excel'
+      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      const fileType = isType || isTypeComputer
+      const isLt1M = (file.size / 1024 / 1024) < 10
+      if(!fileType) {
+          this.$message.error('上传文件只能是xls/xlsx格式！')
+      }
+      
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 10MB!')
+      }
+      return fileType && isLt1M
+    },
+    uploadHttpRequest(file) {
+        const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+        formData.append('file', file.file) //添加文件对象
+        this.$http
+        .post('/epmetuser/icresiuser/importExcel', formData)
+        .then(({ data: res }) => {
+            if(res.code === 0) {
+              // this.$refs.upload.submit()
+              // file.onSuccess() 
+              console.log('res-ooooo---', res)
+            }
+        })
+        .catch( err => {
+            console.log('失败', err)
+            param.onError() //上传失败的文件会从文件列表中删除
+        })
+    },
     handleClick(tab, event) {
       console.log(tab, event)
     },
@@ -796,7 +850,11 @@ export default {
   margin-top: 20px;
 }
 .resi-row-btn {
+  display: flex;
   margin-bottom: 13px;
+  .el-button {
+    margin-left: 10px;
+  }
 }
 .resi-other {
   width: 100%;

From cc1279755805e65dd0765e3c0b7572de46b9fc3e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 15:16:23 +0800
Subject: [PATCH 20/26] =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 5a62eecc..cc50d488 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -19,6 +19,7 @@
           :with-credentials="true"
           :show-file-list="false"
           :auto-upload="true"
+          :on-progress="handleProgress"
           :on-success="handleExcelSuccess"
           :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
@@ -371,6 +372,9 @@ export default {
         this.$message.error(res.msg)
       }
     },
+    handleProgress(event, file, fileList) {
+      console.log('percentage', file.percentage)
+    },
 
     beforeExcelUpload (file) {
       console.log('file', file)
@@ -393,11 +397,13 @@ export default {
         this.$http
         .post('/epmetuser/icresiuser/importExcel', formData)
         .then(({ data: res }) => {
-            if(res.code === 0) {
-              // this.$refs.upload.submit()
-              // file.onSuccess() 
-              console.log('res-ooooo---', res)
-            }
+            // if(res.code === 0) {
+            //   // this.$refs.upload.submit()
+            //   file.onSuccess() 
+            //   console.log('res-ooooo---', res)
+            // }
+          console.log('res-ooooo---', res)
+          this.download(res, 'info.xlsx')
         })
         .catch( err => {
             console.log('失败', err)

From 7ff2b8c9c049f16835225a093dc5024dd84896bb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 15:20:28 +0800
Subject: [PATCH 21/26] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 42 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index cc50d488..b7f6f7c6 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -24,7 +24,7 @@
           :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
           >
-          <el-button type="danger" size="small">导入人口数据</el-button>
+          <el-button type="danger" size="small" :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
         
       </div>
@@ -233,6 +233,8 @@ export default {
   },
   data() {
     return {
+      importBtnTitle: '导入人员数据',
+      importLoading: false,
       rowVisible: false,
       tableLoading: false,
       btnLoading: false,
@@ -392,23 +394,27 @@ export default {
       return fileType && isLt1M
     },
     uploadHttpRequest(file) {
-        const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
-        formData.append('file', file.file) //添加文件对象
-        this.$http
-        .post('/epmetuser/icresiuser/importExcel', formData)
-        .then(({ data: res }) => {
-            // if(res.code === 0) {
-            //   // this.$refs.upload.submit()
-            //   file.onSuccess() 
-            //   console.log('res-ooooo---', res)
-            // }
-          console.log('res-ooooo---', res)
-          this.download(res, 'info.xlsx')
-        })
-        .catch( err => {
-            console.log('失败', err)
-            param.onError() //上传失败的文件会从文件列表中删除
-        })
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      this.$http
+      .post('/epmetuser/icresiuser/importExcel', formData)
+      .then(({ data: res }) => {
+          // if(res.code === 0) {
+          //   // this.$refs.upload.submit()
+          //   file.onSuccess() 
+          //   console.log('res-ooooo---', res)
+          // }
+        this.importLoading = false
+        this.importBtnTitle = '导入人员数据'
+        console.log('res-ooooo---', res)
+        this.download(res, 'info.xlsx')
+      })
+      .catch( err => {
+          console.log('失败', err)
+          param.onError() //上传失败的文件会从文件列表中删除
+      })
     },
     handleClick(tab, event) {
       console.log(tab, event)

From ccd84c87f6799f9618751673e1d1f78bd4fe2621 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 15:33:26 +0800
Subject: [PATCH 22/26] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 3 ++-
 src/views/components/resiForm.vue | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index e213ffaa..78ca906b 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -175,7 +175,8 @@
                       range-separator="至"
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
-                      :picker-options="pickerOptions">
+                      :picker-options="pickerOptions"
+                      value-format="yyyy-MM-dd">
                     </el-date-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timepicker'"
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 495e08ef..7c51c827 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -195,7 +195,8 @@
                       range-separator="至"
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
-                      :picker-options="pickerOptions">
+                      :picker-options="pickerOptions"
+                      value-format="yyyy-MM-dd">
                     </el-date-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timepicker'"

From 0b96bd39548b98276c91bd56f4445f08ba8ab3d7 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 15:55:26 +0800
Subject: [PATCH 23/26] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 2 +-
 src/views/components/resiForm.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 78ca906b..11ceee46 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -176,7 +176,7 @@
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
                       :picker-options="pickerOptions"
-                      value-format="yyyy-MM-dd">
+                      >
                     </el-date-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timepicker'"
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 7c51c827..12781f2d 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -195,8 +195,9 @@
                       range-separator="至"
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
+                      value-format="yyyy-MM-dd"
                       :picker-options="pickerOptions"
-                      value-format="yyyy-MM-dd">
+                      >
                     </el-date-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timepicker'"

From 075b3d11b853380b79dc953503524c81d70f640e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 16:50:45 +0800
Subject: [PATCH 24/26] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=B5=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js            |  1 +
 src/views/modules/base/resi.vue | 49 +++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 0466541d..692bb8ba 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -60,6 +60,7 @@ http.interceptors.response.use(response => {
     }else {
       router.replace({ name: 'login' })
     }
+    
     return Promise.reject(response.data.msg)
   }
   return response
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index b7f6f7c6..4ebd5e49 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -225,6 +225,7 @@
 import resiSearch from '../../components/resiSearch.vue'
 import resiForm from '../../components/resiForm.vue'
 import editResi from '../../components/editResi.vue'
+import axios from 'axios'
 export default {
   components: {
     resiSearch,
@@ -333,21 +334,21 @@ export default {
       }
 
       // .post('epmetuser/icresiuser/exportExcel', params)
-      this.$http({
-        url: 'epmetuser/icresiuser/exportExcel',
+      axios({
+        url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/exportExcel',
         method: 'post',
         data: params,
-        header: {
-          headers: { 'Content-Type': 'application/x-download' }
-        },
         responseType: 'blob'
       })
-        .then(({ data: res }) => {
+        .then(res => {
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
           // var headerData = res.headers
           // this.download(res, '人员数据.xlsx')
-          console.log('res', res)
-          const fileName = '人员数据.xlsx'
-          let blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+          // console.log('res', res)
+          // const fileName = '人员数据.xlsx'
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
           var url = window.URL.createObjectURL(blob)
           var aLink = document.createElement('a')
           aLink.style.display = 'none'
@@ -357,7 +358,6 @@ export default {
           aLink.click()
           document.body.removeChild(aLink) //下载完成移除元素
           window.URL.revokeObjectURL(url) //释放掉blob对象
-          // window.location.href = res.data
         })
         .catch((err) => {
           console.log('获取导出情失败', err)
@@ -398,18 +398,27 @@ export default {
       this.importBtnTitle = '正在上传中...'
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
-      this.$http
-      .post('/epmetuser/icresiuser/importExcel', formData)
-      .then(({ data: res }) => {
-          // if(res.code === 0) {
-          //   // this.$refs.upload.submit()
-          //   file.onSuccess() 
-          //   console.log('res-ooooo---', res)
-          // }
+      axios({
+        url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+        method: 'post',
+        data: formData,
+        responseType: 'blob'
+      })
+      .then((res) => {
         this.importLoading = false
         this.importBtnTitle = '导入人员数据'
-        console.log('res-ooooo---', res)
-        this.download(res, 'info.xlsx')
+        let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+        let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+        var url = window.URL.createObjectURL(blob)
+        var aLink = document.createElement('a')
+        aLink.style.display = 'none'
+        aLink.href = url
+        aLink.setAttribute('download', fileName)
+        document.body.appendChild(aLink)
+        aLink.click()
+        document.body.removeChild(aLink) //下载完成移除元素
+        window.URL.revokeObjectURL(url) //释放掉blob对象
       })
       .catch( err => {
           console.log('失败', err)

From cf34df5ea450cc67c9ed610417b55c5e31ee0979 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 17:37:56 +0800
Subject: [PATCH 25/26] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E7=BA=A7?=
 =?UTF-8?q?=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 16 +++++++++++++++-
 src/views/modules/base/resi.vue   | 23 +++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 11ceee46..e5f3c907 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -486,11 +486,25 @@ export default {
       this.formList.forEach(async item => {
         if (item.optionSourceType === 'remote') {
           await this.getOptionsLists(item.optionSourceValue).then(res => {
-            item.options = res
+            item.options = this.getTreeData(res)
           })
         }
       })
     },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.children) {
+          if (item.children.length === 0) _item = { ...item, children: undefined }
+          else _item = { ...item, children: this.getTreeData(item.children)}
+        } else {
+          _item = { ...item }
+        }
+        return _item
+      })
+      return arr
+    },
     handleOpenSearch () {
       this.openSearch = !this.openSearch
     },
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 4ebd5e49..897b44c8 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -336,6 +336,7 @@ export default {
       // .post('epmetuser/icresiuser/exportExcel', params)
       axios({
         url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/exportExcel',
+        // url: 'epmetuser/icresiuser/exportExcel',
         method: 'post',
         data: params,
         responseType: 'blob'
@@ -344,10 +345,6 @@ export default {
           console.log('resllll', res)
           let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
           console.log('filename', fileName)
-          // var headerData = res.headers
-          // this.download(res, '人员数据.xlsx')
-          // console.log('res', res)
-          // const fileName = '人员数据.xlsx'
           let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
           var url = window.URL.createObjectURL(blob)
           var aLink = document.createElement('a')
@@ -780,6 +777,20 @@ export default {
           return this.$message.error('网络错误')
         })
     },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.children) {
+          if (item.children.length === 0) _item = { ...item, children: undefined }
+          else _item = { ...item, children: this.getTreeData(item.children)}
+        } else {
+          _item = { ...item }
+        }
+        return _item
+      })
+      return arr
+    },
     async getFormList(type) {
       await this.$http
         .post('/oper/customize/icform/getcustomerform', {
@@ -799,7 +810,7 @@ export default {
                 if (item.optionSourceType === 'remote') {
                   await this.getOptionsList(item.optionSourceValue).then(
                     (res) => {
-                      item.options = res
+                      item.options = this.getTreeData(res)
                     }
                   )
                 }
@@ -810,7 +821,7 @@ export default {
                 n.tableName = item.tableName
                 if (n.optionSourceType === 'remote' && type !== 'edit') {
                   await this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = res
+                    n.options = this.getTreeData(res)
                   })
                 }
               })

From bdff5f1cb708ca72c88a21a945af98187a3dad6c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 9 Nov 2021 18:24:50 +0800
Subject: [PATCH 26/26] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/buttonstyle.scss              |  61 ++++++++
 src/assets/scss/common.scss                   | 104 +++++++++++--
 .../modules/base/community/buildForm.vue      |  26 +++-
 .../modules/base/community/buildTable.vue     |  49 +++---
 .../modules/base/community/community.vue      | 145 +++++++++++-------
 .../modules/base/community/communityForm.vue  |  18 ++-
 .../modules/base/community/communityTable.vue |  53 +++----
 src/views/modules/base/community/roomForm.vue |  34 +++-
 .../modules/base/community/roomTable.vue      |  42 ++---
 9 files changed, 365 insertions(+), 167 deletions(-)
 create mode 100644 src/assets/scss/buttonstyle.scss

diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
new file mode 100644
index 00000000..1665c1b3
--- /dev/null
+++ b/src/assets/scss/buttonstyle.scss
@@ -0,0 +1,61 @@
+.el-button--green {
+  color: #fff;
+  background-color: #22c1c3;
+  border-color: #22c1c3;
+}
+.el-button--green:hover {
+  color: #fff;
+  background-color: #05b1b4;
+  border-color: #05b1b4;
+}
+.el-button--green:focus {
+  color: #fff;
+  background-color: #22c1c3;
+  border-color: #22c1c3;
+}
+
+.el-button--yellow:hover {
+  color: #fff;
+  background-color: #fa9200;
+  border-color: #fa9200;
+}
+.el-button--yellow:focus {
+  color: #fff;
+  background-color: #feb349;
+  border-color: #feb349;
+}
+.el-button--yellow {
+  color: #fff;
+  background-color: #feb349;
+  border-color: #feb349;
+}
+.el-button--blue:focus {
+  color: #fff;
+  background-color: #2195fe;
+  border-color: #2195fe;
+}
+.el-button--blue:hover {
+  color: #fff;
+  background-color: #0083fd;
+  border-color: #0083fd;
+}
+.el-button--blue {
+  color: #fff;
+  background-color: #2195fe;
+  border-color: #2195fe;
+}
+.el-button--red:focus {
+  color: #fff;
+  background-color: #fe6252;
+  border-color: #fe6252;
+}
+.el-button--red:hover {
+  color: #fff;
+  background-color: #fd341e;
+  border-color: #fd341e;
+}
+.el-button--red {
+  color: #fff;
+  background-color: #fe6252;
+  border-color: #fe6252;
+}
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index ba5139f8..c16afbd5 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -4,8 +4,8 @@
   box-sizing: border-box;
 }
 body {
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial,
-    sans-serif;
+  font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB',
+    'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
   font-size: $--font-size-base;
   line-height: $base--line-height;
   color: $--color-text-primary;
@@ -35,7 +35,7 @@ img {
 }
 .clearfix:before,
 .clearfix:after {
-  content: " ";
+  content: ' ';
   display: table;
 }
 .clearfix:after {
@@ -144,8 +144,8 @@ img {
     background-color: transparent;
   }
   &-add {
-    > span > *[class*="el-icon-"],
-    > span > *[class*="icon"] {
+    > span > *[class*='el-icon-'],
+    > span > *[class*='icon'] {
       vertical-align: middle;
       font-size: 18px;
       margin-right: 5px;
@@ -383,7 +383,7 @@ img {
 
         &::after {
           position: absolute;
-          content: "";
+          content: '';
           right: 0;
           top: 0;
           bottom: 0;
@@ -448,8 +448,8 @@ img {
     }
   }
   &__search {
-    > *[class*="el-icon-"],
-    > *[class*="icon"] {
+    > *[class*='el-icon-'],
+    > *[class*='icon'] {
       display: inline-block;
       vertical-align: middle;
     }
@@ -572,7 +572,9 @@ img {
     min-height: calc(#{$content--fill-height} - 2px);
   }
   > .aui-card--fill > .el-card__header + .el-card__body {
-    min-height: calc(#{$content--fill-height} - #{$content--card-header-height} - 2px);
+    min-height: calc(
+      #{$content--fill-height} - #{$content--card-header-height} - 2px
+    );
   }
   &--tabs {
     padding: $content--tabs-header-height 0 0;
@@ -644,7 +646,7 @@ img {
               position: absolute;
               bottom: 0;
               left: 0;
-              content: "";
+              content: '';
               width: 100%;
               height: 2px;
               background-color: $--color-primary;
@@ -677,10 +679,15 @@ img {
           min-height: calc(#{$content--fill-height-tabs} - 2px);
         }
         > .aui-card--fill > .el-card__header + .el-card__body {
-          min-height: calc(#{$content--fill-height-tabs} - #{$content--card-header-height} - 2px);
+          min-height: calc(
+            #{$content--fill-height-tabs} - #{$content--card-header-height} -
+              2px
+          );
         }
         &.is-iframe {
-          height: calc(#{$content--fill-height-tabs} + #{$content--padding * 2});
+          height: calc(
+            #{$content--fill-height-tabs} + #{$content--padding * 2}
+          );
           margin: -$content--padding;
           min-height: auto;
           > .aui-card--fill {
@@ -699,7 +706,10 @@ img {
             background-color: #fff;
           }
           > .aui-card--fill > .el-card__header + .el-card__body {
-            height: calc(#{$content--fill-height-tabs} - #{$content--card-header-height} - 2px);
+            height: calc(
+              #{$content--fill-height-tabs} - #{$content--card-header-height} -
+                2px
+            );
           }
         }
       }
@@ -729,7 +739,7 @@ img {
 
 /* Page
 ------------------------------ */
-*[class*="aui-page__"] {
+*[class*='aui-page__'] {
   padding-top: 0;
   .aui-content {
     min-height: auto;
@@ -741,7 +751,71 @@ img {
       min-height: calc(100vh - #{$content--padding * 2} - 2px);
     }
     > .aui-card--fill > .el-card__header + .el-card__body {
-      min-height: calc(100vh - #{$content--padding * 2} - #{$content--card-header-height} - 2px);
+      min-height: calc(
+        100vh - #{$content--padding * 2} - #{$content--card-header-height} - 2px
+      );
     }
   }
 }
+
+.el-button--green {
+  color: #fff;
+  background-color: #22c1c3;
+  border-color: #22c1c3;
+}
+.el-button--green:hover {
+  color: #fff;
+  background-color: #05b1b4;
+  border-color: #05b1b4;
+}
+.el-button--green:focus {
+  color: #fff;
+  background-color: #22c1c3;
+  border-color: #22c1c3;
+}
+
+.el-button--yellow:hover {
+  color: #fff;
+  background-color: #fa9200;
+  border-color: #fa9200;
+}
+.el-button--yellow:focus {
+  color: #fff;
+  background-color: #feb349;
+  border-color: #feb349;
+}
+.el-button--yellow {
+  color: #fff;
+  background-color: #feb349;
+  border-color: #feb349;
+}
+.el-button--blue:focus {
+  color: #fff;
+  background-color: #2195fe;
+  border-color: #2195fe;
+}
+.el-button--blue:hover {
+  color: #fff;
+  background-color: #0083fd;
+  border-color: #0083fd;
+}
+.el-button--blue {
+  color: #fff;
+  background-color: #2195fe;
+  border-color: #2195fe;
+}
+.el-button--red:focus {
+  color: #fff;
+  background-color: #fe6252;
+  border-color: #fe6252;
+}
+.el-button--red:hover {
+  color: #fff;
+  background-color: #fd341e;
+  border-color: #fd341e;
+}
+.el-button--red {
+  color: #fff;
+  background-color: #fe6252;
+  border-color: #fe6252;
+}
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index e7d957e5..96a222c0 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -35,14 +35,14 @@
             <el-radio :label="'3'">别墅</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="排序"
+        <!-- <el-form-item label="排序"
                       prop="sort"
                       style="display: block"
                       label-width="150px">
           <el-input-number class="item_width_1"
                            v-model="dataForm.sort"
                            label="排序"></el-input-number>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="单元数"
                       style="display: block"
                       prop="totalUnitNum"
@@ -75,7 +75,7 @@
                       prop="longitude"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_3"
+          <el-input class="item_width_4"
                     maxlength="50"
                     placeholder="请输入关键字"
                     v-model="keyWords">
@@ -108,6 +108,7 @@
       <el-button @click="handleCancle">取 消</el-button>
       <el-button v-if="formType != 'detail'"
                  type="primary"
+                 :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
   </div>
@@ -126,7 +127,7 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
+      btnDisable: false,
       buildingId: '', //楼栋ID
       buildType: "1",
       dataForm: {
@@ -135,7 +136,7 @@ export default {
         gridId: '', //所属网格ID
         neighborHoodId: '',//所属小区id
         buildingName: '',//房屋名称
-        sort: 0,//排序
+        // sort: 0,//排序
         totalUnitNum: 0,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//户数	
@@ -176,9 +177,14 @@ export default {
     },
 
     async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
       this.dataForm.type = this.buildType
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
+          this.btnDisable = false
           app.util.validateRule(messageObj)
         } else {
           this.addBuild()
@@ -187,6 +193,7 @@ export default {
       })
     },
     async addBuild () {
+
       let url = ''
       if (this.formType === 'add') {
         url = '/gov/org/building/buildingadd'
@@ -196,7 +203,6 @@ export default {
         this.dataForm.buildingId = this.buildingId
       }
 
-
       const { data, code, msg } = await requestPost(url, this.dataForm)
 
       if (code === 0) {
@@ -205,8 +211,11 @@ export default {
           message: '操作成功'
         })
         this.resetData()
+        this.btnDisable = false
         this.$emit('dialogOk')
+
       } else {
+        this.btnDisable = false
         this.$message.error(msg)
       }
 
@@ -305,7 +314,7 @@ export default {
         gridId: '', //所属网格ID
         neighborHoodId: '',//所属小区id
         buildingName: '',//房屋名称
-        sort: 0,//排序
+        // sort: 0,//排序
         totalUnitNum: 0,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//户数	
@@ -376,6 +385,9 @@ export default {
   margin-left: 10px;
   width: 200px;
 }
+.item_width_4 {
+  width: 200px;
+}
 
 .div_map {
   margin-top: 10px;
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 651a961c..3ca4fdd4 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -61,6 +61,7 @@
     <div class="div_table">
       <el-table :data="tableData"
                 border
+                :height="tableHeight"
                 v-loading="tableLoading"
                 style="width: 100%">
         <el-table-column prop="buildingName"
@@ -87,12 +88,15 @@
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="140"
+                         width="170"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-
+            <el-button type="text"
+                       style="color:#feb349;text-decoration: underline;"
+                       size="small"
+                       @click="handleToNextLevel(scope.row)">进入</el-button>
             <el-button type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
@@ -113,9 +117,9 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[20, 30, 50]"
+                       :page-sizes="[10, 20, 50]"
                        :page-size="pageSize"
-                       layout="sizes, prev, pager, next"
+                       layout="sizes, prev, pager, next, total"
                        :total="total">
         </el-pagination>
       </div>
@@ -151,7 +155,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 20,
+      pageSize: 10,
       pageNo: 0,
       tableLoading: true,
 
@@ -173,9 +177,12 @@ export default {
     console.log('building11111111111111111111111111')
   },
   computed: {
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
+    tableHeight () {
+
+      return (this.clientHeight - 220)
+
     },
+
     ...mapGetters(['clientHeight'])
   },
   methods: {
@@ -238,6 +245,9 @@ export default {
         this.$refs.ref_form.initForm('edit', row, this.agencyObj)
       })
     },
+    handleToNextLevel (row) {
+      this.$emit('toNextLevel', row, 'building')
+    },
 
     addFormCancle () {
       this.formShow = false
@@ -403,6 +413,10 @@ export default {
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
 
+        this.$message({
+          type: "success",
+          message: "导入成功"
+        });
         this.$emit('refreshTree')
         this.loadTable()
       } else {
@@ -450,26 +464,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-.el-button--green {
-  color: #fff;
-  background-color: #22c1c3;
-  border-color: #22c1c3;
-}
-.el-button--yellow {
-  color: #fff;
-  background-color: #feb349;
-  border-color: #feb349;
-}
-.el-button--blue {
-  color: #fff;
-  background-color: #2195fe;
-  border-color: #2195fe;
-}
-.el-button--red {
-  color: #fff;
-  background-color: #fe6252;
-  border-color: #fe6252;
-}
+@import "@/assets/scss/buttonstyle.scss";
 .div_search {
   display: flex;
 
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 8a3321e2..eb0ada5f 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1,54 +1,45 @@
 <template>
-  <div>
-
-    <el-row class="row"
-            :gutter="10">
-      <el-col :span="5">
-        <el-card>
-
-          <div :style="{height:rowHeight}"
-               class="div_tree">
-            <el-input placeholder="输入关键字进行过滤"
-                      v-model="filterText">
-            </el-input>
-
-            <el-tree ref="ref_tree"
-                     v-loading="treeLoading"
-                     class="filter-tree"
-                     :data="treeData"
-                     :props="defaultProps"
-                     :highlight-current="true"
-                     node-key="id"
-                     :expand-on-click-node="false"
-                     default-expand-all
-                     :filter-node-method="filterNode"
-                     @node-click="handleNodeClick">
-            </el-tree>
-
-          </div>
-
-        </el-card>
-      </el-col>
-
-      <el-col :span="19">
-        <el-card>
-          <div :style="{height:rowHeight}">
-
-            <build-table v-if="selTreeObj.level==='neighbourHood'"
-                         ref="ref_neighTable"
-                         @refreshTree="refreshTree"></build-table>
-            <room-table v-else-if="selTreeObj.level==='building'"
-                        ref="ref_buildingTable"
-                        @refreshTree="refreshTree"></room-table>
-            <community-table v-else
-                             ref="ref_communityTable"
-                             @refreshTree="refreshTree"></community-table>
-
-          </div>
-        </el-card>
-      </el-col>
-
-    </el-row>
+  <div class="div_main">
+
+    <div :style="{height:rowHeight}"
+         class="div_tree">
+      <el-input placeholder="输入关键字进行过滤"
+                v-model="filterText">
+      </el-input>
+      <el-scrollbar :style="{height:treeHeight}"
+                    class="scrollar">
+        <el-tree ref="ref_tree"
+                 v-loading="treeLoading"
+                 class="filter_tree"
+                 :data="treeData"
+                 :props="defaultProps"
+                 :highlight-current="true"
+                 node-key="id"
+                 :expand-on-click-node="false"
+                 default-expand-all
+                 :filter-node-method="filterNode"
+                 @node-click="handleNodeClick">
+        </el-tree>
+      </el-scrollbar>
+
+    </div>
+
+    <div :style="{height:rowHeight}"
+         class="div_table">
+
+      <build-table v-if="selTreeObj.level==='neighbourHood'"
+                   ref="ref_neighTable"
+                   @toNextLevel="toNextLevel"
+                   @refreshTree="refreshTree"></build-table>
+      <room-table v-else-if="selTreeObj.level==='building'"
+                  ref="ref_buildingTable"
+                  @refreshTree="refreshTree"></room-table>
+      <community-table v-else
+                       @toNextLevel="toNextLevel"
+                       ref="ref_communityTable"
+                       @refreshTree="refreshTree"></community-table>
+
+    </div>
 
   </div>
 </template>
@@ -99,7 +90,10 @@ export default {
   },
   computed: {
     rowHeight () {
-      return (this.clientHeight - 180) + 'px'
+      return (this.clientHeight - 140) + 'px'
+    },
+    treeHeight () {
+      return (this.clientHeight - 200) + 'px'
     },
     ...mapGetters(['clientHeight'])
   },
@@ -151,7 +145,6 @@ export default {
     },
 
     handleNodeClick (obj) {
-
       this.getTreeObj(obj)
 
       this.$nextTick(() => {
@@ -179,6 +172,23 @@ export default {
       this.treeLoading = false
     },
 
+    //进入下一级
+    toNextLevel (row, level) {
+
+      if (level === 'community') {
+        this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
+      } else {
+        this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
+      }
+
+      this.handleNodeClick(this.selTreeObj)
+      this.$nextTick(() => {
+        // ref_tree 元素的ref   value 绑定的node-key
+        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+      });
+
+    },
+
     //解析树数据
     getTreeObj (obj) {
       // 树接口：
@@ -246,8 +256,30 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
+.div_main {
+  display: flex;
+}
+.scrollar {
+  margin-top: 10px;
+}
+
 .div_tree {
-  overflow-y: auto;
+  flex: 0 0 400px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+  overflow-y: hidden;
+}
+.filter_tree {
+  overflow-x: auto;
+}
+
+.div_table {
+  margin-left: 15px;
+  width: calc(100vw - 680px);
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
 }
 
 .div_btn {
@@ -263,4 +295,11 @@ export default {
 .aui-content > .el-tabs > .el-tabs__content {
   padding: 0px;
 }
+.el-scrollbar__wrap {
+  overflow-x: hidden !important;
+}
+.el-tree-node:focus > .el-tree-node__content {
+  /* background-color: #ccc !important; */
+  color: #2195fe;
+}
 </style>
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 50845fd3..d5de921f 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -48,6 +48,7 @@
             <el-select class="item_width_2"
                        v-model="dataForm.propertyId"
                        placeholder="请选择"
+                       filterable
                        clearable>
               <el-option v-for="item in propertyList"
                          :key="item.propertyId"
@@ -88,7 +89,7 @@
                         prop="longitude"
                         label-width="150px"
                         style="display: block">
-            <el-input class="item_width_3"
+            <el-input class="item_width_4"
                       maxlength="50"
                       placeholder="请输入关键字"
                       v-model="keyWords">
@@ -139,6 +140,7 @@
       <el-button @click="handleCancle">取 消</el-button>
       <el-button v-if="formType != 'detail'"
                  type="primary"
+                 :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
   </div>
@@ -160,6 +162,7 @@ export default {
 
       gridList: [],
       propertyList: [],
+      btnDisable: false,
 
       neighborHoodId: '', //小区ID
       dataForm: {
@@ -339,14 +342,20 @@ export default {
     },
 
     async handleComfirm () {
+
       if (this.propertyFormShow) {
 
         this.addProperty()
 
       } else {
+        this.btnDisable = true
+        setTimeout(() => {
+          this.btnDisable = false
+        }, 10000)
         this.$refs['ref_form'].validate((valid, messageObj) => {
           if (!valid) {
             app.util.validateRule(messageObj)
+            this.btnDisable = false
           } else {
             this.addCommunity()
           }
@@ -376,7 +385,9 @@ export default {
         })
         this.resetData()
         this.$emit('dialogOk')
+        this.btnDisable = false
       } else {
+        this.btnDisable = false
         this.$message.error(msg)
       }
 
@@ -400,7 +411,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: 'success',
-          message: '添加物业成功'
+          message: '操作成功'
         })
         this.dataForm.propertyId = data.propertyId
         this.propertyForm.name = ''
@@ -498,6 +509,9 @@ export default {
   margin-left: 10px;
   width: 200px;
 }
+.item_width_4 {
+  width: 200px;
+}
 
 .div_map {
   margin-top: 10px;
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 1a8ca199..f5e5266c 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -63,6 +63,7 @@
     <div class="div_table">
       <el-table :data="tableData"
                 border
+                :height="tableHeight"
                 v-loading="tableLoading"
                 style="width: 100%">
         <el-table-column prop="neighborHoodName"
@@ -85,16 +86,16 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         width="140"
+                         width="170"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
 
-            <!-- <el-button type="text"
-                       style="color:#00A7A9;text-decoration: underline;"
+            <el-button type="text"
+                       style="color:#feb349;text-decoration: underline;"
                        size="small"
-                       @click="handleToBuild(scope.row)">进入</el-button> -->
+                       @click="handleToNextLevel(scope.row)">进入</el-button>
             <el-button type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
@@ -115,9 +116,9 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[20, 30, 50]"
+                       :page-sizes="[10, 20, 50]"
                        :page-size="pageSize"
-                       layout="sizes, prev, pager, next"
+                       layout="sizes, prev, pager, next, total"
                        :total="total">
         </el-pagination>
       </div>
@@ -153,7 +154,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 20,
+      pageSize: 10,
       pageNo: 0,
       tableLoading: true,
 
@@ -179,6 +180,11 @@ export default {
 
   },
   computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 320)
+
+    },
     rowHeight () {
       return (this.clientHeight - 200) + 'px'
     },
@@ -246,6 +252,10 @@ export default {
       })
     },
 
+    handleToNextLevel (row) {
+      this.$emit('toNextLevel', row, 'community')
+    },
+
     addFormCancle () {
       this.formShow = false
     },
@@ -405,13 +415,13 @@ export default {
       var url = '/gov/org/neighborhood/import'
       let fileFormData = new FormData();
       fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      // let params = {
-      //   file: this.files
-      // }
 
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
-
+        this.$message({
+          type: "success",
+          message: "导入成功"
+        });
         this.$emit('refreshTree')
         this.loadTable()
       } else {
@@ -458,26 +468,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-.el-button--green {
-  color: #fff;
-  background-color: #22c1c3;
-  border-color: #22c1c3;
-}
-.el-button--yellow {
-  color: #fff;
-  background-color: #feb349;
-  border-color: #feb349;
-}
-.el-button--blue {
-  color: #fff;
-  background-color: #2195fe;
-  border-color: #2195fe;
-}
-.el-button--red {
-  color: #fff;
-  background-color: #fe6252;
-  border-color: #fe6252;
-}
+@import "@/assets/scss/buttonstyle.scss";
 .div_search {
   display: flex;
 
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 781117f2..93877ef4 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -115,6 +115,7 @@
       <el-button @click="handleCancle">取 消</el-button>
       <el-button v-if="formType != 'detail'"
                  type="primary"
+                 :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
   </div>
@@ -130,7 +131,7 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
+      btnDisable: false,
       unitList: [],
 
       houseId: '', //房屋ID
@@ -206,11 +207,17 @@ export default {
     },
 
     async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
       this.dataForm.houseType = this.houseType
       this.dataForm.purpose = this.purpose
       this.dataForm.rentFlag = this.rentFlag
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
+          this.btnDisable = false
           app.util.validateRule(messageObj)
         } else {
           this.addRoom()
@@ -220,6 +227,25 @@ export default {
     },
 
     async addRoom () {
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      if (regCard.test(this.dataForm.ownerIdCard) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的身份证号码'
+        })
+        return false;
+      }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (regPhone.test(this.dataForm.ownerPhone) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
       let url = ''
 
       if (this.formType === 'add') {
@@ -229,10 +255,8 @@ export default {
         this.dataForm.houseId = this.houseId
       }
 
-
-
       const { data, code, msg } = await requestPost(url, this.dataForm)
-
+      this.btnDisable = false
       if (code === 0) {
         this.$message({
           type: 'success',
@@ -240,7 +264,9 @@ export default {
         })
         this.resetData()
         this.$emit('dialogOk')
+
       } else {
+
         this.$message.error(msg)
       }
 
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index f2978907..c4a8319e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -81,10 +81,10 @@
                          label="门牌号">
         </el-table-column>
         <el-table-column prop="houseType"
-                         label="房屋类型">
+                         label="类型">
         </el-table-column>
         <el-table-column prop="purpose"
-                         label="房屋用途">
+                         label="用途">
         </el-table-column>
         <el-table-column prop="rentFlag"
                          label="是否出租">
@@ -93,10 +93,12 @@
                          label="房主姓名">
         </el-table-column>
         <el-table-column prop="ownerPhone"
-                         label="房主电话">
+                         label="房主电话"
+                         width="110">
         </el-table-column>
         <el-table-column prop="ownerIdCard"
-                         label="身份证">
+                         label="身份证"
+                         width="160">
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
@@ -126,9 +128,9 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[20, 30, 50]"
+                       :page-sizes="[10, 20, 50]"
                        :page-size="pageSize"
-                       layout="sizes, prev, pager, next"
+                       layout="sizes, prev, pager, next, total"
                        :total="total">
         </el-pagination>
       </div>
@@ -163,7 +165,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 20,
+      pageSize: 10,
       pageNo: 0,
       tableLoading: true,
 
@@ -415,7 +417,10 @@ export default {
 
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
-
+        this.$message({
+          type: "success",
+          message: "导入成功"
+        });
         this.$emit('refreshTree')
         this.loadTable()
       } else {
@@ -462,26 +467,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-.el-button--green {
-  color: #fff;
-  background-color: #22c1c3;
-  border-color: #22c1c3;
-}
-.el-button--yellow {
-  color: #fff;
-  background-color: #feb349;
-  border-color: #feb349;
-}
-.el-button--blue {
-  color: #fff;
-  background-color: #2195fe;
-  border-color: #2195fe;
-}
-.el-button--red {
-  color: #fff;
-  background-color: #fe6252;
-  border-color: #fe6252;
-}
+@import "@/assets/scss/buttonstyle.scss";
 .div_search {
   display: flex;