Browse Source

Merge branch 'bugfix_zhy123'

# Conflicts:
#	src/views/modules/plugins/change/changedeath-add-or-update.vue
#	src/views/modules/plugins/change/changedeath.vue
#	src/views/modules/plugins/change/changerelocation.vue
#	src/views/modules/plugins/change/changewelfare-add-or-update.vue
#	src/views/modules/plugins/change/changewelfare.vue
dev-map-local
zhangyuan 3 years ago
parent
commit
5a2cbdb81a
  1. 14
      src/views/modules/base/collect.vue
  2. 2
      src/views/modules/base/visitor.vue
  3. 2
      src/views/modules/plugins/change/changedeath-add-or-update.vue
  4. 2
      src/views/modules/plugins/change/changedeath.vue
  5. 2
      src/views/modules/plugins/change/changerelocation.vue
  6. 4
      src/views/modules/plugins/change/changewelfare-add-or-update.vue
  7. 4
      src/views/modules/plugins/change/changewelfare.vue
  8. 4
      src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue
  9. 2
      src/views/modules/plugins/rent/hikerrorinfo.vue
  10. 4
      src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
  11. 14
      src/views/modules/plugins/rent/rentblacklist.vue
  12. 16
      src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
  13. 12
      src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
  14. 34
      src/views/modules/plugins/rent/rentcontractinfo.vue
  15. 30
      src/views/modules/plugins/rent/rentcontractreview.vue
  16. 4
      src/views/modules/plugins/rent/renthouse-add-or-update.vue
  17. 113
      src/views/modules/plugins/rent/renthouse.vue
  18. 9
      src/views/modules/plugins/rent/renthouseForm.vue
  19. 6
      src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
  20. 16
      src/views/modules/plugins/rent/renttenantinfo.vue
  21. 6
      src/views/modules/plugins/stats/factagencyuserhousedaily.vue
  22. 4
      src/views/modules/plugins/visit/visitor-add-or-update.vue
  23. 4
      src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
  24. 6
      src/views/modules/plugins/visit/visitvisitor.vue

14
src/views/modules/base/collect.vue

@ -141,7 +141,7 @@
prop="memberIdNum"
width="180"
align="center"
label="成员身份证"
label="成员证件号"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -209,9 +209,9 @@
label="人脸"
>
<template slot-scope="scope">
<el-image
<el-image
style="max-height: 50px; max-width: 50px;"
:src="scope.row.faceImg"
:src="scope.row.faceImg"
:preview-src-list="[scope.row.faceImg]">
<div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i> -->
@ -349,7 +349,7 @@
prop="memberIdNum"
width="180"
align="center"
label="成员身份证"
label="成员证件号"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -406,9 +406,9 @@
label="人脸"
>
<template slot-scope="scope">
<el-image
<el-image
style="max-height: 50px; max-width: 50px;"
:src="scope.row.faceImg"
:src="scope.row.faceImg"
:preview-src-list="[scope.row.faceImg]">
<div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i> -->
@ -773,7 +773,7 @@ export default {
// this.fileJurisdiction(params)
}).catch(() => {})
}).catch(() => {
//
//
})
} else {
this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {

2
src/views/modules/base/visitor.vue

@ -67,7 +67,7 @@
<el-table-column
prop="idCard"
width="240"
label="身份证号"
label="证号"
align="center"
:show-overflow-tooltip="true"
/>

2
src/views/modules/plugins/change/changedeath-add-or-update.vue

@ -8,7 +8,7 @@
<el-input v-model="dataForm.name" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="证件号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
<el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>

2
src/views/modules/plugins/change/changedeath.vue

@ -18,7 +18,7 @@
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证号或护照号">
placeholder="请输入证件号">
</el-input>
</el-form-item>
<el-form-item label="手机"

2
src/views/modules/plugins/change/changerelocation.vue

@ -115,7 +115,7 @@
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证号或护照号">
placeholder="请输入证件号">
</el-input>
</el-form-item>
<el-form-item label="手机"

4
src/views/modules/plugins/change/changewelfare-add-or-update.vue

@ -10,8 +10,8 @@
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="护照号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
<el-form-item label="证件号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>

4
src/views/modules/plugins/change/changewelfare.vue

@ -12,13 +12,13 @@
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="护照号"
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="dataForm.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证号或护照号">
placeholder="请输入证件号">
</el-input>
</el-form-item>
<el-form-item label="手机"

4
src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue

@ -22,8 +22,8 @@
<el-form-item label="客户ID" prop="customerId">
<el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号"></el-input>
<el-form-item label="证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证号"></el-input>
</el-form-item>
<el-form-item label="错误类型 0:token,1:人员,2权限" prop="errorType">
<el-input v-model="dataForm.errorType" placeholder="错误类型 0:token,1:人员,2权限"></el-input>

2
src/views/modules/plugins/rent/hikerrorinfo.vue

@ -11,7 +11,7 @@
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" label="证号" header-align="center" align="center"></el-table-column>
<el-table-column prop="errorInfo" label="错误详情" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">

4
src/views/modules/plugins/rent/rentblacklist-add-or-update.vue

@ -7,8 +7,8 @@
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="身份证" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
<el-form-item label="证件号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>

14
src/views/modules/plugins/rent/rentblacklist.vue

@ -1,9 +1,8 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-rent__rentBlacklist} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="姓名"
<el-form-item label="姓名" label-width="100px"
prop="name">
<el-input v-model="dataForm.name"
size="small"
@ -12,16 +11,16 @@
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="身份证"
<el-form-item label="证件号" label-width="100px"
prop="idCard">
<el-input v-model="dataForm.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入证件号">
</el-input>
</el-form-item>
<el-form-item label="手机"
<el-form-item label="手机" label-width="100px"
prop="mobile">
<el-input v-model="dataForm.mobile"
size="small"
@ -30,7 +29,7 @@
placeholder="请输入手机">
</el-input>
</el-form-item>
<el-form-item label="入黑名单时间"
<el-form-item label="入黑名单时间" label-width="100px"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"
@ -54,7 +53,7 @@
<el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></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="joinDate" label="入黑名单时间" header-align="center" align="center"></el-table-column>
@ -95,7 +94,6 @@
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
</div>
</el-card>
</template>
<script>

16
src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue

@ -133,7 +133,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="idCard" label="身份证号" :render-header="renderHeader" header-align="center" align="center" width="180">
<el-table-column prop="idCard" label="证号" :render-header="renderHeader" header-align="center" align="center" width="180">
<template slot-scope="scope">
<el-form-item :prop="'tenantList['+scope.$index+'].idCard'" required :show-message="false">
<el-input v-model="dataForm.tenantList[scope.$index].idCard"></el-input>
@ -189,7 +189,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="身份证照片" :render-header="renderHeader" header-align="center" align="center" width="245px">
<el-table-column label="证照片" :render-header="renderHeader" header-align="center" align="center" width="245px">
<template slot-scope="scope">
<upload-image :defaultFileList="dataForm.tenantList[scope.$index].idCardImgList" :limit="2" :rowIndex="scope.$index" @change="onChangeTenantListIdImgList"></upload-image>
</template>
@ -211,8 +211,8 @@
<el-form-item label="出租人姓名" prop="lessorName" label-width="140px">
<el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
</el-form-item>
<el-form-item label="出租人身份证" prop="lessorIdCard" label-width="140px">
<el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证"></el-input>
<el-form-item label="出租人证件号" prop="lessorIdCard" label-width="140px">
<el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号"></el-input>
</el-form-item>
<el-form-item label="出租人手机" prop="lessorMobile" label-width="140px">
<el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
@ -239,8 +239,8 @@
<el-form-item label="承租人姓名" prop="lesseeName" label-width="140px">
<el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" ></el-input>
</el-form-item>
<el-form-item label="承租人身份证" prop="lesseeIdCard" label-width="140px">
<el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证" ></el-input>
<el-form-item label="承租人证件号" prop="lesseeIdCard" label-width="140px">
<el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" ></el-input>
</el-form-item>
<el-form-item label="承租人手机" prop="lesseeMobile" label-width="140px">
<el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机" ></el-input>
@ -559,7 +559,7 @@ export default {
<span style="font-size:12px; color: #ff0000;">*</span>
<span>{label}</span>
</div>
)
)
},
onChangeTenantListIdImgList (e, rowIndex=0) {
console.log('onChangeTenantListIdImgList', e)
@ -876,7 +876,7 @@ export default {
return item.idCardImgList.length == 0
})
if (isUploadIdCardImgList) {
this.$message.error('请上传成员身份证照片')
this.$message.error('请上传成员证照片')
return
}
const isUploadImgList = this.dataForm.tenantList.some(item => {

12
src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue

@ -29,12 +29,12 @@
<el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="idCard" label="证号" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
<el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCardImgList" label="身份证照片" header-align="center" align="center">
<el-table-column prop="idCardImgList" label="证照片" header-align="center" align="center">
<template slot-scope="scope">
<div v-for="(item,index) in scope.row.idCardImgList" :key="index">
<img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40" />
@ -55,8 +55,8 @@
<el-form-item label="出租人姓名" prop="lessorName">
<el-input v-model="dataForm.lessorName" placeholder="出租人姓名" disabled></el-input>
</el-form-item>
<el-form-item label="出租人身份证" prop="lessorIdCard">
<el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证" disabled></el-input>
<el-form-item label="出租人证件号" prop="lessorIdCard">
<el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="出租人手机" prop="lessorMobile">
@ -87,8 +87,8 @@
<el-form-item label="承租人姓名" prop="lesseeName">
<el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" disabled></el-input>
</el-form-item>
<el-form-item label="承租人身份证" prop="lesseeIdCard">
<el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证" disabled></el-input>
<el-form-item label="承租人证件号" prop="lesseeIdCard">
<el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="承租人手机" prop="lesseeMobile">

34
src/views/modules/plugins/rent/rentcontractinfo.vue

@ -1,11 +1,10 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-rent__rentContractInfo} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" label-width="100px"
prop="gridId">
<el-select
<el-select size="small"
v-model.trim="dataForm.gridId"
placeholder="请选择"
clearable
@ -24,7 +23,7 @@
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select
<el-select size="small"
v-model.trim="dataForm.villageId"
placeholder="请选择小区"
clearable
@ -41,7 +40,7 @@
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select
<el-select size="small"
v-model.trim="dataForm.buildId"
placeholder="楼号"
clearable
@ -60,7 +59,7 @@
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select
<el-select size="small"
v-model.trim="dataForm.unitId"
:disabled="changeBDisabled"
placeholder="单元"
@ -79,7 +78,7 @@
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select
<el-select size="small"
v-model.trim="dataForm.homeId"
:disabled="changeDDisabled"
placeholder="房号"
@ -100,34 +99,34 @@
</el-form-item>
<br/>
<el-form-item label="出租人" label-width="100px">
<el-input v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
<el-input size="small" v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
</el-form-item>
<el-form-item label="出租人身份证" label-width="100px">
<el-input v-model="dataForm.lessorIdCard" placeholder='出租人身份证' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
<el-form-item label="出租人证件号" label-width="100px">
<el-input size="small" v-model="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
</el-form-item>
<el-form-item label="出租人手机号" label-width="100px">
<el-input v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
<el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
</el-form-item>
<br/>
<el-form-item label="承租人" label-width="100px">
<el-input v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
<el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
</el-form-item>
<el-form-item label="承租人身份证" label-width="100px">
<el-input v-model="dataForm.lesseeIdCard" placeholder='承租人身份证' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
<el-form-item label="承租人证件号" label-width="100px">
<el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
</el-form-item>
<el-form-item label="承租人手机号" label-width="100px">
<el-input v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
<el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
</el-form-item>
<br/>
<el-form-item label="合同到期时间" prop="endDate" label-width="100px">
<el-select v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
<el-select size="small" v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
<el-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="合同签订时间" prop="startTime" label-width="100px">
<el-date-picker v-model="dataForm.startTime"
type="date"
type="date" size="small"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
@ -137,7 +136,7 @@
</el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
type="date" size="small"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
@ -194,7 +193,6 @@
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</el-card>
</template>
<script>

30
src/views/modules/plugins/rent/rentcontractreview.vue

@ -1,11 +1,10 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-rent__rentContractInfo} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" label-width="100px"
prop="gridId">
<el-select
<el-select size="small"
v-model.trim="dataForm.gridId"
placeholder="请选择"
clearable
@ -24,7 +23,7 @@
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select
<el-select size="small"
v-model.trim="dataForm.villageId"
placeholder="请选择小区"
clearable
@ -41,7 +40,7 @@
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select
<el-select size="small"
v-model.trim="dataForm.buildId"
placeholder="楼号"
clearable
@ -60,7 +59,7 @@
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select
<el-select size="small"
v-model.trim="dataForm.unitId"
:disabled="changeBDisabled"
placeholder="单元"
@ -79,7 +78,7 @@
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select
<el-select size="small"
v-model.trim="dataForm.homeId"
:disabled="changeDDisabled"
placeholder="房号"
@ -100,24 +99,24 @@
</el-form-item>
<br/>
<el-form-item label="审核状态" prop="scanFlag" label-width="100px">
<el-select v-model="dataForm.state" placeholder="审核状态" clearable>
<el-select size="small" v-model="dataForm.state" placeholder="审核状态" clearable>
<el-option v-for="item in stateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="承租人身份证" label-width="100px">
<el-input v-model="dataForm.lesseeIdCard" placeholder='承租人身份证' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
<el-form-item label="承租人证件号" label-width="100px">
<el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
</el-form-item>
<el-form-item label="承租人手机号" label-width="100px">
<el-input v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
<el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
</el-form-item>
<br/>
<el-form-item label="承租人" label-width="100px">
<el-input v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
<el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
</el-form-item>
<el-form-item label="审核时间" prop="startTime" label-width="100px">
<el-date-picker v-model="dataForm.startTime"
type="date"
type="date" size="small"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
@ -127,7 +126,7 @@
</el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
type="date" size="small"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
@ -137,7 +136,7 @@
</el-form-item>
<el-form-item label="数据来源" label-width="100px"
prop="gridId">
<el-select
<el-select size="small"
v-model.trim="dataForm.isPcInput"
placeholder="请选择"
clearable
@ -184,7 +183,7 @@
<!-- <el-table-column prop="unitName" label="单元" header-align="center" align="center"></el-table-column>-->
<!-- <el-table-column prop="homeName" label="房屋" header-align="center" align="center"></el-table-column>-->
<el-table-column prop="lesseeName" label="承租人" header-align="center" align="center"></el-table-column>
<el-table-column prop="lesseeIdCard" label="身份证" header-align="center" align="center"></el-table-column>
<el-table-column prop="lesseeIdCard" label="证件号" header-align="center" align="center"></el-table-column>
<el-table-column prop="lesseeMobile" label="手机" header-align="center" align="center"></el-table-column>
<el-table-column prop="state" label="审核状态" header-align="center" align="center">
<template slot-scope="scope">
@ -217,7 +216,6 @@
<look-or-check v-if="lookOrCheckVisible" ref="LookOrCheck" @refreshDataList="getDataList"></look-or-check>
<add-or-update v-if="addOrUpdateVisible" ref="AddOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</el-card>
</template>
<script>

4
src/views/modules/plugins/rent/renthouse-add-or-update.vue

@ -25,8 +25,8 @@
<el-form-item label="房主电话" prop="ownerPhone">
<el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
</el-form-item>
<el-form-item label="房主身份证号" prop="ownerIdCard">
<el-input v-model="dataForm.ownerIdCard" placeholder="房主身份证号"></el-input>
<el-form-item label="房主证号" prop="ownerIdCard">
<el-input v-model="dataForm.ownerIdCard" placeholder="房主证号"></el-input>
</el-form-item>
<el-form-item label="网格" prop="gridName">
<el-input v-model="dataForm.gridName" placeholder="网格"></el-input>

113
src/views/modules/plugins/rent/renthouse.vue

@ -1,8 +1,8 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-rent__rentHouse}">
<div class="mod-rent__rentHouse} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
<el-form-item label="所属网格"
<el-form-item label="所属网格" size="small" label-width="100px"
prop="gridId">
<el-select
v-model.trim="dataForm.gridId"
@ -19,11 +19,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属房屋" >
<el-form-item label="所属房屋" label-width="100px">
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select
<el-select size="small"
v-model.trim="dataForm.villageId"
placeholder="请选择小区"
clearable
@ -40,7 +40,7 @@
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select
<el-select size="small"
v-model.trim="dataForm.buildId"
placeholder="楼号"
clearable
@ -59,7 +59,7 @@
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select
<el-select size="small"
v-model.trim="dataForm.unitId"
:disabled="changeBDisabled"
placeholder="单元"
@ -78,7 +78,7 @@
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select
<el-select size="small"
v-model.trim="dataForm.homeId"
:disabled="changeDDisabled"
placeholder="房号"
@ -99,7 +99,7 @@
</el-form-item>
<br/>
<el-form-item label="姓名"
<el-form-item label="姓名" label-width="100px"
prop="ownerName">
<el-input v-model="dataForm.ownerName"
size="small"
@ -108,16 +108,16 @@
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="身份证"
<el-form-item label="证件号" label-width="100px"
prop="ownerIdCard">
<el-input v-model="dataForm.ownerIdCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入证件号">
</el-input>
</el-form-item>
<el-form-item label="手机"
<el-form-item label="手机" label-width="100px"
prop="ownerPhone">
<el-input v-model="dataForm.ownerPhone"
size="small"
@ -127,13 +127,13 @@
</el-input>
</el-form-item>
<br/>
<el-form-item label="房屋状态" prop="rentFlag">
<el-select v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
<el-form-item label="房屋状态" prop="rentFlag" label-width="100px">
<el-select size="small" v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
<el-option v-for="item in rentFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="购房时间"
<el-form-item label="购房时间" label-width="100px"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"
@ -151,17 +151,16 @@
<el-form-item>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
</el-form-item>
<br/>
<el-form-item>
<el-button type="primary" size="small" @click="handleEdit()">{{ '购房登记' }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
<!--<el-form-item>-->
<!--<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
<!--</el-form-item>-->
</el-form>
</el-card>
<el-card class="resi-card-table">
<div style="margin-bottom: 13px;">
<el-button type="primary" size="small" @click="handleEdit()">{{ '购房登记' }}</el-button>
<el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
</div>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
<el-table-column label="序号"
type="index"
@ -222,7 +221,7 @@
</el-table-column>
<el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
<el-table-column prop="ownerPhone" label="房主电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="ownerIdCard" label="房主身份证号" header-align="center" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="ownerIdCard" label="房主证号" header-align="center" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="purchaseDate" label="购房日期" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
@ -240,6 +239,7 @@
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
</el-card>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<!-- 购房登记弹出框 -->
@ -256,7 +256,6 @@
@dialogOk="addFormOk"></room-form>
</el-dialog>
</div>
</el-card>
</template>
<script>
@ -512,3 +511,69 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.blacklist-reason {
width: 100%;
height: 80px;
border: 1px solid #e4e4e4;
border-radius: 4px;
resize: none;
padding: 8px;
box-sizing: border-box;
}
</style>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
// border-right: 1px solid rgba(33, 149, 254, 1);
}
}
.resi-table {
::v-deep .el-button--text {
text-decoration: underline;
}
::v-deep .btn-color-del {
margin-left: 10px;
color: rgba(213, 16, 16, 1);
}
::v-deep .btn-color-edit {
color: rgba(0, 167, 169, 1);
}
}
.form-wr {
.input-width {
width: 260px;
}
.input-width-textarea {
width: 500px;
}
.imsg-list {
display: flex;
align-items: center;
.imgs-item {
position: relative;
margin-right: 10px;
.el-icon-delete {
position: absolute;
top: 0;
right: 0;
font-size: 18px;
color: red;
z-index: 3;
cursor: pointer;
}
}
}
}
.div-content {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>

9
src/views/modules/plugins/rent/renthouseForm.vue

@ -144,12 +144,12 @@
v-model="dataForm.ownerPhone">
</el-input>
</el-form-item>
<el-form-item label="房主身份证"
<el-form-item label="房主证件号"
prop="ownerIdCard"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入房主身份证"
placeholder="请输入房主证件号"
v-model="dataForm.ownerIdCard">
</el-input>
</el-form-item>
@ -520,11 +520,12 @@ export default {
async addRoom () {
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //1518151817X
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
const regPassport = /^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/; //1827
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false && regPassport.test(this.dataForm.ownerIdCard) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的身份证号'
message: '请输入正确的证号'
})
return false;
}

6
src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue

@ -4,8 +4,8 @@
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="姓名" disabled></el-input>
</el-form-item>
<el-form-item label="身份证" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证" disabled></el-input>
<el-form-item label="证件号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证件号" disabled></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号" disabled></el-input>
@ -13,7 +13,7 @@
<!--<el-form-item label="与房主关系" prop="yfzgx">-->
<!--<el-input v-model="dataForm.yfzgx" placeholder="与房主关系" disabled></el-input>-->
<!--</el-form-item>-->
<el-form-item label="身份证照片" prop="idCardImgList">
<el-form-item label="证照片" prop="idCardImgList">
<template>
<label v-for="(item,index) in dataForm.idCardImgList" :key="index">
<img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />

16
src/views/modules/plugins/rent/renttenantinfo.vue

@ -1,16 +1,15 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-rent__rentTenantInfo} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="姓名" label-width="60px">
<el-input v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
<el-form-item label="姓名" label-width="100px">
<el-input size="small" v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
</el-form-item>
<el-form-item label="身份证" label-width="60px">
<el-input v-model="dataForm.idCard" placeholder='身份证' clearable @keyup.native="btKeyUpIdCard"></el-input>
<el-form-item label="证件号" label-width="100px">
<el-input size="small" v-model="dataForm.idCard" placeholder='证件号' clearable @keyup.native="btKeyUpIdCard"></el-input>
</el-form-item>
<el-form-item label="手机号" label-width="60px">
<el-input v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
<el-form-item label="手机号" label-width="100px">
<el-input size="small" v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
@ -31,7 +30,7 @@
<!--<el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
<!--<el-table-column prop="contractId" label="合同ID" header-align="center" align="center"></el-table-column>-->
<el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" label="身份证" header-align="center" align="center"></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="yfzgx" label="与房主关系" header-align="center" align="center"></el-table-column>-->
<el-table-column prop="state" label="审核状态" header-align="center" align="center">
@ -73,7 +72,6 @@
</span>
</el-dialog>
</div>
</el-card>
</template>
<script>

6
src/views/modules/plugins/stats/factagencyuserhousedaily.vue

@ -1,5 +1,4 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mode-block resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
@ -18,7 +17,7 @@
>
</el-option>
</el-select> -->
<el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
<el-cascader size="small" ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
<template slot-scope="{ node, data }">
<div @click="cascaderClick(data)">
<!-- <span class="block"></span> -->
@ -28,7 +27,7 @@
</template>
</el-cascader>
</el-form-item>
<el-form-item label="时间范围"
<el-form-item label="时间范围" label-width="100px"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"
@ -107,7 +106,6 @@
</template>
</el-dialog>
</div>
</el-card>
</template>
<script>

4
src/views/modules/plugins/visit/visitor-add-or-update.vue

@ -4,8 +4,8 @@
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="身份证" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
<el-form-item label="证件号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-radio-group v-model="dataForm.gender">

4
src/views/modules/plugins/visit/visitvisitor-add-or-update.vue

@ -4,8 +4,8 @@
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="身份证" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
<el-form-item label="证件号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-radio-group v-model="dataForm.gender">

6
src/views/modules/plugins/visit/visitvisitor.vue

@ -6,8 +6,8 @@
<el-form-item label="姓名" label-width="100px">
<el-input v-model="dataForm.name" placeholder='姓名' clearable></el-input>
</el-form-item>
<el-form-item label="身份证" label-width="100px">
<el-input v-model="dataForm.idCard" placeholder='身份证' clearable></el-input>
<el-form-item label="证件号" label-width="100px">
<el-input v-model="dataForm.idCard" placeholder='证件号' clearable></el-input>
</el-form-item>
<el-form-item label="联系方式" label-width="100px">
<el-input v-model="dataForm.mobile" placeholder='联系方式' clearable></el-input>
@ -114,7 +114,7 @@
<el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" 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="mobile" label="手机号" header-align="center" align="center"></el-table-column>
<el-table-column prop="type" label="人员类型" header-align="center" align="center">

Loading…
Cancel
Save