From 0a06732c0f76a1eae406b67ffddaa233e6656e08 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 3 Nov 2021 14:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildForm.vue      |  2 +-
 .../modules/base/community/buildTable.vue     | 28 ++++++++++++---
 .../modules/base/community/communityForm.vue  |  2 +-
 .../modules/base/community/communityTable.vue | 34 ++++++++++++++++---
 src/views/modules/base/community/roomForm.vue | 17 ++++++----
 .../modules/base/community/roomTable.vue      | 28 ++++++++++++---
 6 files changed, 89 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index b4f74c139..c53b55cee 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -183,7 +183,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: 'success',
-          message: '添加楼栋成功'
+          message: '操作成功'
         })
         this.resetData()
         this.$emit('dialogOk')
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index e7df16f1a..e9ffd683b 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -32,15 +32,15 @@
     </div>
     <div class="div_btn">
       <el-button style="float:left"
-                 type="warning"
+                 type="yellow"
                  size="small"
                  @click="handleExport">导出</el-button>
       <el-button style="float:left"
-                 type="success"
+                 type="green"
                  size="small"
                  @click="handleAdd">新增楼宇</el-button>
       <el-button style="float:left"
-                 type="primary"
+                 type="blue"
                  size="small"
                  @click="handleExportModule">下载楼宇模板</el-button>
       <el-upload ref="upload"
@@ -54,7 +54,7 @@
                  :http-request="uploadFile">
         <el-button style="margin-left:10px"
                    size="small"
-                   type="danger">导入小区数据</el-button>
+                   type="red">导入小区数据</el-button>
       </el-upload>
     </div>
 
@@ -442,6 +442,26 @@ 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;
+}
 .div_search {
   display: flex;
 
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 4604f9c29..bce626a37 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -2,7 +2,7 @@
   <div>
     <div>
       <div v-show="!propertyFormShow">
-        <el-form :inline="false"
+        <el-form :inline="true"
                  :model="dataForm"
                  :rules="dataRule"
                  :disabled="formType === 'detail'"
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 47dc22d38..0aecefae0 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -32,15 +32,15 @@
     </div>
     <div class="div_btn">
       <el-button style="float:left"
-                 type="warning"
+                 type="yellow"
                  size="small"
                  @click="handleExport">导出</el-button>
       <el-button style="float:left"
-                 type="success"
+                 type="green"
                  size="small"
                  @click="handleAdd">新增小区</el-button>
       <el-button style="float:left"
-                 type="primary"
+                 type="blue"
                  size="small"
                  @click="handleExportModule">下载小区模板</el-button>
 
@@ -55,7 +55,7 @@
                  :http-request="uploadFile">
         <el-button style="margin-left:10px"
                    size="small"
-                   type="danger">导入小区数据</el-button>
+                   type="red">导入小区数据</el-button>
       </el-upload>
 
     </div>
@@ -90,6 +90,10 @@
                          class="operate">
           <template slot-scope="scope">
 
+            <!-- <el-button type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleToBuild(scope.row)">进入</el-button> -->
             <el-button type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
@@ -123,7 +127,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="900px"
+               width="850px"
                top="5vh"
                @closed="diaClose">
       <community-form ref="ref_form"
@@ -446,6 +450,26 @@ 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;
+}
 .div_search {
   display: flex;
 
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 333f77eaa..620c23f2c 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -73,8 +73,8 @@
                       style="display: block">
           <el-radio-group v-model="rentFlag">
 
-            <el-radio :label="false">否</el-radio>
-            <el-radio :label="true">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+            <el-radio :label="1">是</el-radio>
 
           </el-radio-group>
         </el-form-item>
@@ -175,7 +175,12 @@ export default {
         this.dataForm.buildingUnitId = row.unitNumKey
         this.houseType = row.houseTypeKey
         this.purpose = row.purposeKey
-        this.rentFlag = row.rentFlagKey
+        if (row.rentFlagKey) {
+          this.rentFlag = 1
+        } else {
+          this.rentFlag = 0
+        }
+
       }
       console.log(row)
 
@@ -200,11 +205,9 @@ export default {
       }
     },
 
-
-
     async handleComfirm () {
       let url = ''
-      // this.dataForm.buildingUnitId = '14a8df50bc43fda1753088fb458d2942'
+
       if (this.formType === 'add') {
         url = '/gov/org/house/houseadd'
       } else {
@@ -221,7 +224,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: 'success',
-          message: '添加楼栋成功'
+          message: '操作成功'
         })
         this.resetData()
         this.$emit('dialogOk')
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index eeca50299..7eb6d0867 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -32,15 +32,15 @@
     </div>
     <div class="div_btn">
       <el-button style="float:left"
-                 type="warning"
+                 type="yellow"
                  size="small"
                  @click="handleExport">导出</el-button>
       <el-button style="float:left"
-                 type="success"
+                 type="green"
                  size="small"
                  @click="handleAdd">新增房屋</el-button>
       <el-button style="float:left"
-                 type="primary"
+                 type="blue"
                  size="small"
                  @click="handleExportModule">下载房屋模板</el-button>
       <el-upload ref="upload"
@@ -54,7 +54,7 @@
                  :http-request="uploadFile">
         <el-button style="margin-left:10px"
                    size="small"
-                   type="danger">导入小区数据</el-button>
+                   type="red">导入小区数据</el-button>
       </el-upload>
     </div>
 
@@ -455,6 +455,26 @@ 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;
+}
 .div_search {
   display: flex;