房屋管理添加查询字段

3 years ago · dbfa30ca28
3 changed files with 1246 additions and 1177 deletions
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@ -75,6 +75,31 @@

          </div>
        </div>
+
+        <div class="resi-cell">
+          <div class="resi-cell-label">房屋用途</div>
+          <div class="resi-cell-value">
+
+            <el-select v-model="purpose" placeholder="房屋用途" clearable>
+              <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+              </el-option>
+            </el-select>
+
+          </div>
+        </div>
+
+        <div class="resi-cell">
+          <div class="resi-cell-label">备注</div>
+          <div class="resi-cell-value">
+
+            <el-input v-model="remark"
+                      size="small"
+                      clearable
+                      placeholder="请输入备注">
+            </el-input>
+
+          </div>
+        </div>
        <el-button style="margin-left:10px"
                   class="diy-button--search"
                   size="small"
@ -122,16 +147,16 @@
 </template>

 <script>
-import CDialog from '@c/CDialog'
-import communityTable from './communityTable'
-import buildTable from './buildTable'
-import roomTable from './roomTable'
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-
-let loading // 加载动画
-export default {
+    import CDialog from '@c/CDialog'
+    import communityTable from './communityTable'
+    import buildTable from './buildTable'
+    import roomTable from './roomTable'
+    import { requestPost } from "@/js/dai/request";
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+
+    let loading // 加载动画
+    export default {
        data () {
            return {
                filterText: '',
@ -166,8 +191,19 @@ export default {
                ownerName: '',
                ownerPhone: '',
                rentFlag: '',
+                purpose: '',
+                remark: '',
                showRoomTable: false,
                selObj: {},
+                purposeArr: [
+                    { dictValue: '1', dictName: '住宅' },
+                    { dictValue: '2', dictName: '商业' },
+                    { dictValue: '3', dictName: '办公' },
+                    { dictValue: '4', dictName: '工业' },
+                    { dictValue: '5', dictName: '仓储' },
+                    { dictValue: '6', dictName: '商住混用' },
+                    { dictValue: '7', dictName: '其他' }
+                ]
            }
        },
        components: {
@ -206,7 +242,7 @@ export default {
        methods: {

            handleSearch () {
-      if (this.ownerName || this.ownerPhone || this.rentFlag) {
+                if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
                    this.showRoomTable = true

                    this.$nextTick(() => {
@ -224,6 +260,8 @@ export default {
                this.ownerName = ''
                this.ownerPhone = ''
                this.rentFlag = ''
+                this.purpose = ''
+                this.remark = ''

                this.pageSize = 10
                this.pageNo = 1
@ -295,6 +333,8 @@ export default {
                this.ownerName = ''
                this.ownerPhone = ''
                this.rentFlag = ''
+                this.purpose = ''
+                this.remark = ''
                this.showRoomTable = false

                this.selObj = JSON.parse(JSON.stringify(obj))
@ -435,63 +475,63 @@ export default {
        components: {
            communityTable, buildTable, roomTable
        }
-}
+    }
 </script>
 <style lang="scss" scoped >
-.div_main {
+  .div_main {
    display: flex;
-}
-.scrollar {
+  }
+  .scrollar {
    margin-top: 10px;
-}
+  }

-.div_tree {
+  .div_tree {
    flex: 0 0 280px;
    background-color: #ffffff;
    border-radius: 5px;
    padding: 10px;
    overflow-y: hidden;
-}
-.filter_tree {
+  }
+  .filter_tree {
    overflow-x: auto;
-}
+  }

-.div_table {
+  .div_table {
    margin-left: 15px;
    // flex: 1;
    width: calc(100% - 300px);
    background-color: #ffffff;
    border-radius: 5px;
    padding: 10px;
-}
+  }

-.div_btn {
+  .div_btn {
    margin-top: 20px;
-}
+  }

-.row {
+  .row {
    padding: 10px;
-}
+  }
 </style>

 <style>
-/* .aui-content > .el-tabs > .el-tabs__content {
+  /* .aui-content > .el-tabs > .el-tabs__content {
    padding: 0px;
-} */
+  } */

-.el-tree-node:focus > .el-tree-node__content {
+  .el-tree-node:focus > .el-tree-node__content {
    /* background-color: #ccc !important; */
    color: #2195fe;
-}
+  }
 </style>
 <style lang="scss" scoped>
-.div_tree {
+  .div_tree {
    /deep/ .el-scrollbar__wrap {
      overflow-x: hidden !important;
    }
-}
+  }
 </style>

 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
+  @import "@/assets/scss/modules/visual/communityManage.scss";
 </style>
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@ -110,6 +110,16 @@
                    v-model="dataForm.ownerIdCard">
          </el-input>
        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="30"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </el-input>
+        </el-form-item>
      </el-form>

    </div>
@ -126,13 +136,13 @@
 </template>

 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost, requestGet } from '@/js/dai/request'
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost, requestGet } from '@/js/dai/request'


-let loading // 加载动画
-export default {
+    let loading // 加载动画
+    export default {
        data () {
            return {
                formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
@ -153,7 +163,8 @@ export default {
                    rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
                    ownerPhone: '', //房主电话
                    ownerName: '', //房主名字
-        ownerIdCard: '' //房主身份证	
+                    ownerIdCard: '', //房主身份证
+                    remark: ''
                },

                keyWords: '',
@ -321,7 +332,8 @@ export default {
                    rentFlag: 0,//是否出租【是：1，否：0】
                    ownerPhone: '', //房主电话
                    ownerName: '', //房主名字
-        ownerIdCard: '' //房主身份证	
+                    ownerIdCard: '', //房主身份证
+                    remark: '' // 备注
                }

            },
@ -368,13 +380,16 @@ export default {
                    ownerIdCard: [
                        { required: false }
                    ],
+                    remark: [
+                        { required: false }
+                    ],
                }
            },

        },
        props: {}
-}
+    }
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
+  @import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@ -188,14 +188,14 @@

 <script>

-import roomForm from './roomForm'
+    import roomForm from './roomForm'

-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost } from "@/js/dai/request";
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务

-let loading // 加载动画
-export default {
+    let loading // 加载动画
+    export default {
        data () {
            return {
                source: 'tree',//来源
@ -347,6 +347,8 @@ export default {
                    ownerName: this.ownerName,
                    ownerPhone: this.ownerPhone,
                    rentFlag: this.rentFlag,
+                    purpose: this.purpose,
+                    remark: this.remark,
                    sortType: this.sortType,
                }

@ -541,6 +543,8 @@ export default {
                    ownerName: this.ownerName,
                    ownerPhone: this.ownerPhone,
                    rentFlag: this.rentFlag,
+                    purpose: this.purpose,
+                    remark: this.remark,
                    buildingId: this.agencyObj.id
                }

@ -618,6 +622,8 @@ export default {
                    gridId: '',
                    ownerName: this.ownerName,
                    ownerPhone: this.ownerPhone,
+                    purpose: this.purpose,
+                    remark: this.remark,
                    rentFlag: this.rentFlag,
                    buildingId: '',
                    neighborHoodId: ''
@ -799,22 +805,30 @@ export default {
                type: String,
                default: '',
            },
+            purpose: {
+                type: String,
+                default: '',
+            },
+            remark: {
+                type: String,
+                default: '',
+            },
+        }
    }
-}
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
+  @import "@/assets/scss/modules/visual/communityManage.scss";

-.item_width_4 {
+  .item_width_4 {
    width: 120px;
-}
+  }

-/deep/.el-input-number--medium .el-input-number__decrease,
-/deep/.el-input-number--medium .el-input-number__increase {
+  /deep/.el-input-number--medium .el-input-number__decrease,
+  /deep/.el-input-number--medium .el-input-number__increase {
    width: 26px;
-}
-/deep/.el-input-number--medium .el-input__inner {
+  }
+  /deep/.el-input-number--medium .el-input__inner {
    padding-left: 0px;
    padding-right: 0px;
-}
+  }
 </style>