From ecd8cb9b82f7d1a05df37c2ad83202f4a4ae7e63 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 3 Apr 2023 10:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=BD=95=E5=85=A5=E6=95=B0?=
=?UTF-8?q?=E9=87=8F=E4=B8=8D=E7=AC=A6=E7=BA=A2=E8=89=B2=E5=AD=97=E4=BD=93?=
=?UTF-8?q?,=E6=88=BF=E4=B8=BB=E8=AF=81=E4=BB=B6=E5=8F=B7,=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8=E7=94=B5=E8=AF=9D=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/cpts/map/popup.vue | 2 +-
src/views/modules/base/community/community.vue | 16 ++++++++--------
src/views/modules/base/community/roomDetail.vue | 4 ++--
src/views/modules/base/community/roomForm.vue | 8 ++++----
src/views/modules/base/resi.vue | 12 +++++++++---
src/views/modules/base/roomForm.vue | 8 ++++----
src/views/modules/home/cpts/fangwu-info.vue | 6 +++---
src/views/modules/home/cpts/scroll-notice.vue | 2 +-
.../plugins/rent/renthouse-add-or-update.vue | 4 ++--
src/views/modules/plugins/rent/renthouse.vue | 2 +-
src/views/modules/plugins/rent/renthouseForm.vue | 8 ++++----
src/views/modules/shequ/chaxun.vue | 10 ++++++++--
src/views/modules/shequ/cpts/fangwu-info.vue | 6 +++---
src/views/modules/shequ/cpts/scroll-notice.vue | 2 +-
src/views/modules/sys/roomForm.vue | 8 ++++----
.../modules/visual/basicinfo/cpts/roomInfo.vue | 2 +-
src/views/modules/visual/command/cpts/popup.vue | 2 +-
.../fivelayers/mapIndex copy 2.vue | 2 +-
.../communityGovern/fivelayers/mapIndex copy.vue | 2 +-
.../fivelayers/mapIndex-baidu.vue | 2 +-
.../communityGovern/fivelayers/mapIndex.vue | 2 +-
21 files changed, 61 insertions(+), 49 deletions(-)
diff --git a/src/views/dataBoard/cpts/map/popup.vue b/src/views/dataBoard/cpts/map/popup.vue
index bb5968153..a6b44472d 100644
--- a/src/views/dataBoard/cpts/map/popup.vue
+++ b/src/views/dataBoard/cpts/map/popup.vue
@@ -199,7 +199,7 @@
{{ info.holder_phone || "--" }}
- 房主身份证:
+ 房主证件号:
{{ info.holder_idcard || "--" }}
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index fe8702f91..61bf5ac60 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -25,7 +25,7 @@
:load="lazyLoadTree"
>
-
+ /> -->
@@ -43,7 +43,7 @@
{{ data.showNum }}
{{ ")" }}
-->
-
{{ data.showName }}
+
{{ data.showName }}
@@ -153,7 +153,7 @@
-
+
-
+
+
-
+ -->
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index 20ea4f0ef..2ea3c8f56 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -126,7 +126,7 @@ export default {
rentFlag: 0, //房屋状态【是:1,否:0】 出租1、闲置2、自住 0
ownerPhone: "", //联系方式
ownerName: "", //房主名字
- ownerIdCard: "", //房主身份证
+ ownerIdCard: "", //房主证件号
remark: "",
// realPerson: 0,
coding: "",
@@ -219,7 +219,7 @@ export default {
rentFlag: 0, //是否出租【是:1,否:0】
ownerPhone: "", //联系方式
ownerName: "", //房主名字
- ownerIdCard: "", //房主身份证
+ ownerIdCard: "", //房主证件号
remark: "", // 备注
coding: "",
sysCoding: "",
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 507ea3642..3c5d2aa60 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -157,11 +157,11 @@
v-model="dataForm.ownerPhone">
-
@@ -217,7 +217,7 @@ export default {
rentFlag: 0,//房屋状态【是:1,否:0】 出租1、闲置2、自住 0
ownerPhone: '', //联系方式
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
remark: '',
// realPerson: 0,
coding: '',
@@ -403,7 +403,7 @@ export default {
rentFlag: 0,//是否出租【是:1,否:0】
ownerPhone: '', //联系方式
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
remark: '', // 备注
coding: '',
sysCoding: ''
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index aa8fbd85f..771cb20b8 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -194,7 +194,7 @@
? `${scope.row.idNum.substr(0, 11)}` +
"******" +
`${scope.row.idNum.substr(16, 2)}`
- : ""
+ : "--"
}}
@@ -203,7 +203,7 @@
? `${scope.row.mobile.substr(0, 3)}` +
"******" +
`${scope.row.mobile.substr(7, 4)}`
- : ""
+ : "--"
}}
@@ -696,6 +696,7 @@ export default {
},
queryConditions: [],
+ searchFlag:false
};
},
@@ -787,7 +788,7 @@ export default {
let obj = this.$refs.myResiSearch.form;
let categoryArr = this.$refs.myResiSearch.form.categoryKey;
let agencyId = this.$refs.myResiSearch.form.agencyId;
-
+ this.searchFlag = true
if (
typeof obj.categoryKey == "object" &&
obj.categoryKey.length != 0
@@ -1009,7 +1010,11 @@ export default {
obj.agencyId = "";
}
this.currentPage = val;
+ if(this.searchFlag){
this.getTableData(obj);
+ }else{
+ this.getTableData();
+ }
this.$refs.myResiSearch.form.categoryKey = categoryArr;
this.$refs.myResiSearch.form.agencyId = agencyId;
},
@@ -1026,6 +1031,7 @@ export default {
},
resetSearchForm() {
+ this.searchFlag = false
for (const n in this.$refs.myResiSearch.form) {
this.$refs.myResiSearch.form[n] = "";
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index bc69aa45c..88692f1a6 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -145,12 +145,12 @@
v-model="dataForm.ownerPhone">
-
@@ -206,7 +206,7 @@ export default {
rentFlag: 0,//房屋状态【是:1,否:0】 出租1、闲置2、自住 0
ownerPhone: '', //联系方式
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
remark: '',
// realPerson: 0,
coding: '',
@@ -357,7 +357,7 @@ export default {
rentFlag: 0,//是否出租【是:1,否:0】
ownerPhone: '', //联系方式
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
remark: '', // 备注
coding: '',
sysCoding: ''
diff --git a/src/views/modules/home/cpts/fangwu-info.vue b/src/views/modules/home/cpts/fangwu-info.vue
index 272489744..99ae18721 100644
--- a/src/views/modules/home/cpts/fangwu-info.vue
+++ b/src/views/modules/home/cpts/fangwu-info.vue
@@ -86,7 +86,7 @@
{{ dataForm.ownerPhone }}
-
-
+
+
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index 199d69e9a..6d628d7b8 100644
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -221,7 +221,7 @@
-
+
diff --git a/src/views/modules/plugins/rent/renthouseForm.vue b/src/views/modules/plugins/rent/renthouseForm.vue
index 0b80acab1..1d3929c67 100644
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@@ -144,12 +144,12 @@
v-model="dataForm.ownerPhone">
-
@@ -198,7 +198,7 @@ export default {
rentFlag: 1,//房屋状态【是:1,否:0】 出租1、闲置2、自住 0
ownerPhone: '', //房主电话
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
needUpdate: false,
purchaseDate: '',
villageId: '',
@@ -580,7 +580,7 @@ export default {
rentFlag: 0,//是否出租【是:1,否:0】
ownerPhone: '', //房主电话
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
needUpdate: false,
purchaseDate: '',
id: ''
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index fd464e94b..cd67066b4 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -43,7 +43,7 @@

- 智能搜索
+ 智能查询
@@ -742,8 +742,14 @@ export default {
if (n.value == row[item.columnName] ) _val = n.label;
});
}
+ console.log(row.mobile);
+
+ if(row.mobile == '' || row.mobile == '--'){
+ row.mobile = ""
+ }else{
+ row.mobile = row.mobile.substr(0, 3) + '****' + row.mobile.substr(7,4)
+ }
row.idNum = row.idNum.substr(0, 11) + '*****' + row.idNum.substr(16,2)
- row.mobile = row.mobile.substr(0, 3) + '****' + row.mobile.substr(7,4)
return _val || row[item.columnName];
},
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
index 078ef7b1e..9554cfe4d 100644
--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@@ -86,7 +86,7 @@
{{ dataForm.ownerPhone }}
-
@@ -207,7 +207,7 @@ export default {
rentFlag: 0,//房屋状态【是:1,否:0】 出租1、闲置2、自住 0
ownerPhone: '', //联系方式
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
remark: '',
// realPerson: 0,
coding: '',
@@ -393,7 +393,7 @@ export default {
rentFlag: 0,//是否出租【是:1,否:0】
ownerPhone: '', //联系方式
ownerName: '', //房主名字
- ownerIdCard: '', //房主身份证
+ ownerIdCard: '', //房主证件号
remark: '', // 备注
coding: '',
sysCoding: ''
diff --git a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
index a3b93557b..61e2d006d 100644
--- a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
+++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
@@ -77,7 +77,7 @@
- 房主身份证:
+ 房主证件号:
{{ formData. ownerIdCard?formData.ownerIdCard:'无' }}
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index 493c2cd05..a99aadfbe 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -332,7 +332,7 @@
{{ info.ownerPhone || "--" }}
- 房主身份证:
+ 房主证件号:
{{ info.ownerIdCard || "--" }}
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index fd06ce82b..bf041acf8 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
@@ -301,7 +301,7 @@
联系方式:
{{ selInfo.ownerPhone }}
- 房主身份证:
+
房主证件号:
{{ selInfo.ownerIdCard }}
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index 44919c1f1..3621d5712 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
@@ -300,7 +300,7 @@
联系方式:
{{ selInfo.ownerPhone }}
-
房主身份证:
+
房主证件号:
{{ selInfo.ownerIdCard }}
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 607d9f254..07292b0cc 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -301,7 +301,7 @@
联系方式:
{{ selInfo.ownerPhone }}
-
房主身份证:
+
房主证件号:
{{ selInfo.ownerIdCard }}
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 63ad3e5b8..776f9a837 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -298,7 +298,7 @@
联系方式:
{{ selInfo.ownerPhone }}
-
房主身份证:
+
房主证件号:
{{ selInfo.ownerIdCard }}