Browse Source

Merge branch 'dev' into test

test
wanggongfeng 3 years ago
parent
commit
b43ed25ff2
  1. 44
      src/views/modules/base/community/community.vue
  2. 18
      src/views/modules/base/community/roomForm.vue
  3. 10
      src/views/modules/plugins/change/changedeath.vue
  4. 10
      src/views/modules/plugins/change/changerelocation.vue

44
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))

18
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>
@ -153,7 +162,8 @@ export default {
rentFlag: 0,//10 12 0
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '' //
ownerIdCard: '', //
remark: '' //
},
keyWords: '',
@ -321,7 +331,8 @@ export default {
rentFlag: 0,//10
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '' //
ownerIdCard: '', //
remark: '' //
}
},
@ -368,6 +379,9 @@ export default {
ownerIdCard: [
{ required: false }
],
remark: [
{ required: false }
]
}
},

10
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">-->
<!--{{-->

10
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>

Loading…
Cancel
Save