Merge branch 'dev' into test

3 years ago · b43ed25ff2
4 changed files with 91 additions and 21 deletions
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@ -48,7 +48,6 @@
          <div class="resi-cell-label">房主手机</div>
          <div class="resi-cell-value">
            <el-input v-model="ownerPhone"
-                      class="resi-cell-input"
                      size="small"
                      clearable
                      placeholder="请输入内容">
@ -75,6 +74,32 @@

          </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"
@ -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))
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@ -110,6 +110,15 @@
                    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"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </el-input>
+        </el-form-item>
      </el-form>

    </div>
@ -146,14 +155,15 @@ export default {
      dataForm: {
        neighborHoodId: '', // 所属小区ID
        buildingId: '',//所属楼栋ID
-        buildingUnitId: '',//所属单元ID	
-        doorName: '',//门牌号	
-        houseType: '',//房屋类型【楼房，平房，别墅】		
-        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-        ownerPhone: '', //房主电话	
-        ownerName: '', //房主名字		
-        ownerIdCard: '' //房主身份证	
+        ownerPhone: '', //房主电话
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
      },

      keyWords: '',
@ -255,7 +265,7 @@ export default {
    },

    async addRoom () {
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
        this.btnDisable = false
        this.$message({
@ -314,14 +324,15 @@ export default {
      this.dataForm = {
        neighborHoodId: '', // 所属小区ID
        buildingId: '',//所属楼栋ID
-        buildingUnitId: '',//所属单元ID	
-        doorName: '',//门牌号	
-        houseType: '1',//房屋类型【楼房，平房，别墅】		
-        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: 0,//是否出租【是：1，否：0】		
-        ownerPhone: '', //房主电话	
-        ownerName: '', //房主名字		
-        ownerIdCard: '' //房主身份证	
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '1',//房屋类型【楼房，平房，别墅】
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//是否出租【是：1，否：0】
+        ownerPhone: '', //房主电话
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
      }

    },
@ -368,6 +379,9 @@ export default {
        ownerIdCard: [
          { required: false }
        ],
+        remark: [
+            { required: false }
+        ]
      }
    },

@ -377,4 +391,4 @@ export default {
 </script>
 <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
-</style>
+</style>
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@ -84,7 +84,15 @@
        </el-table-column>
        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gender" label="性别" header-align="center" align="center">
+          <template slot-scope="scope">
+            {{
+            scope.row.gender == '2'
+            ? "保密"
+            : scope.row.gender
+            }}
+          </template>
+        </el-table-column>
        <!--<el-table-column prop="type" label="类型" header-align="center" align="center">-->
          <!--<template slot-scope="scope">-->
            <!--{{-->
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@ -182,7 +182,15 @@
        <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{
+            scope.row.gender == '2'
+            ? "保密"
+            : scope.row.gender
+            }}
+          </template>
+        </el-table-column>
        <el-table-column prop="age" label="年龄" header-align="center" align="center" min-width="90" show-overflow-tooltip></el-table-column>
        <el-table-column prop="outOfTime" label="迁出时间" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="reason" label="迁出原因" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>