![]()
@@ -265,9 +265,15 @@
src="~@/assets/images/shuju/renfang/index/znyc.png"
/>
智能预测
-
+
+
+
+ 根据智能分类设置规则，预测来年育龄妇女、老年人、空巢老人、独居老人分别有多少人
+
+
+
{{ tableTitle }}
-
+
{
@@ -389,11 +392,6 @@ export default {
async handleComfirm() {
this.importLoading = true;
this.importBtnTitle = "正在上传中...";
- this.$message({
- showClose: true,
- message: "导入中，请到系统管理-导入记录中查看进度",
- duration: 0,
- });
const { importOption, importCode, dataList } = this;
dataList.forEach((item) => {
if (!item.exist) {
@@ -411,8 +409,30 @@ export default {
.then((res) => {
console.log("res-up", res);
if (res.data.code == 0 && res.data.msg == "success") {
- // this.$message.success('导入成功')
- this.dataList = [];
+ this.upload2(this.fileData, this.importCode);
+ } else this.$message.error(res.data.msg);
+ })
+ .catch((err) => {
+ console.log("失败", err);
+ file.onError(); //上传失败的文件会从文件列表中删除
+ // this.$message.error('导入失败')
+ });
+ this.importLoading = false;
+ this.importBtnTitle = "导入";
+ },
+
+ async upload2(file, code) {
+ this.importLoading = true;
+ this.importBtnTitle = "正在上次中...";
+ const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+ formData.append("file", file.file); //添加文件对象
+ formData.append("code", code); //添加文件对象
+ await this.$http
+ .post("/actual/base/residentBaseInfo/importExcel", formData)
+ .then((res) => {
+ console.log("res-up", res);
+ if (res.data.code == 0 && res.data.msg == "success") {
+ this.afterSuccess();
} else this.$message.error(res.data.msg);
})
.catch((err) => {
@@ -422,6 +442,20 @@ export default {
});
this.importLoading = false;
this.importBtnTitle = "导入";
+ this.$refs.upload.clearFiles();
+ },
+
+ afterSuccess() {
+ this.$message({
+ showClose: true,
+ message: "导入成功，请到系统管理-导入记录中查看进度",
+ duration: 0,
+ });
+
+ this.dataList = [];
+ this.importOption = {};
+ this.importCode = "";
+ this.fileData = null;
},
// 取消
From 97205b36de1f4a8995c7bc082348bf99e3ac8116 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 1 Mar 2023 16:44:21 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=B8=80?=
=?UTF-8?q?=E4=B8=8Bstaffbasicinfo=E8=BF=94=E5=9B=9Enull=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/main.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/main.vue b/src/views/main.vue
index f67320e6d..a3044201e 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -146,7 +146,7 @@ export default {
const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {};
const { data, code, msg } = await requestPost(url, params);
- if (code === 0) {
+ if (code === 0 && data) {
this.$store.state.user = { ...data };
console.log("user---hahha", this.$store.state.user);
localStorage.setItem("roleList", data.roleList);
From fe25d9fbd91e1b090ca797d373f452df39c68c2b Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 1 Mar 2023 16:47:17 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=90=8C=E4=B8=8A=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/main.vue | 303 +++++++++++++++++++++++----------------------
1 file changed, 157 insertions(+), 146 deletions(-)
diff --git a/src/views/main.vue b/src/views/main.vue
index a3044201e..656358f64 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -1,33 +1,33 @@
-
From d16d14face5c1ef67c41f03dab59141ffe5aa10f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 1 Mar 2023 17:28:08 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E7=BB=9F?=
=?UTF-8?q?=E4=B8=80=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/editResi.vue | 2 +-
src/views/components/resiForm.vue | 2 +-
src/views/dataBoard/cpts/map/popup.vue | 4 ++--
src/views/modules/base/community/roomForm.vue | 4 ++--
src/views/modules/base/community/roomTable.vue | 2 +-
.../modules/base/huji/chusheng/cpts/edit.vue | 6 +++---
src/views/modules/base/huji/immigration/edit.vue | 4 ++--
src/views/modules/base/roomForm.vue | 4 ++--
.../cabaseinfo/carental-add-or-update.vue | 4 ++--
.../cabaseinfo/caresident-add-or-update.vue | 4 ++--
src/views/modules/cabaseinfo/caresident.vue | 6 +++---
.../cabaseinfo/carotators-add-or-update.vue | 4 ++--
.../cabaseinfo/carotators-binding-house.vue | 4 ++--
src/views/modules/cabaseinfo/carotators.vue | 6 +++---
.../modules/communityParty/heart/heartAudit.vue | 2 +-
.../modules/communityParty/heart/heartPerson.vue | 2 +-
.../modules/communityParty/members/crateForm.vue | 6 +++---
.../communityParty/members/detailForm.vue | 2 +-
.../modules/communityParty/members/index.vue | 4 ++--
.../modules/communityParty/members/points.vue | 6 +++---
.../modules/communityService/measure/points.vue | 6 +++---
.../communityService/policy/personListItem.vue | 6 +++---
src/views/modules/demo/demo-add-or-update.vue | 4 ++--
src/views/modules/demo/demo.vue | 4 ++--
src/views/modules/home/index.vue | 2 +-
.../partymember/icpartymemberpayrecorddetail.vue | 6 +++---
.../modules/partymember/icpartymemberpoint.vue | 6 +++---
src/views/modules/partymember/lookMember.vue | 4 ++--
.../plugins/power/kernelhouseholdAddMember.vue | 2 +-
.../plugins/power/kernelhouseholdTable.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 | 6 +++---
src/views/modules/shequ/chaxun.vue | 4 ++--
src/views/modules/shequ/index.vue | 4 ++--
src/views/modules/shequzhili/event/cpts/add.vue | 16 ++++++++--------
.../shequzhili/event/cpts/event-detail.vue | 2 +-
src/views/modules/shequzhili/issue/cpts/add.vue | 16 ++++++++--------
.../shequzhili/issue/cpts/eventDetail.vue | 2 +-
.../shequzhili/issue/cptsAudit/eventDetail.vue | 2 +-
.../modules/shequzhili/tuceng/zhonghe/base.vue | 4 ++--
.../shequzhili/tuceng/zhonghe/baseTotal.vue | 4 ++--
.../modules/shequzhili/xiangmu/cpts/edit.vue | 4 ++--
.../modules/sys/icvaccineprarmeter-check.vue | 2 +-
src/views/modules/sys/roomForm.vue | 4 ++--
.../modules/visual/basicinfo/peopleList copy.vue | 2 +-
.../modules/visual/basicinfo/peopleList.vue | 2 +-
src/views/modules/visual/command/cpts/popup.vue | 4 ++--
.../duoyuanfuwu/duoyuanfuwufenxi.vue | 2 +-
.../fivelayers/mapIndex copy 2.vue | 4 ++--
.../communityGovern/fivelayers/mapIndex copy.vue | 4 ++--
.../fivelayers/mapIndex-baidu.vue | 4 ++--
.../communityGovern/fivelayers/mapIndex.vue | 4 ++--
.../communityGovern/shijianchuli/event-info.vue | 2 +-
.../modules/visual/communityParty/crateForm.vue | 6 +++---
.../modules/visual/communityParty/gridParty.vue | 2 +-
src/views/modules/visual/measure/volunteer.vue | 2 +-
.../plugin/power/components/house-dialog.vue | 2 +-
.../modules/visual/shundeju/controlCount.vue | 2 +-
.../components/screen-table/people-list.vue | 2 +-
.../components/screen-table/people-list.vue | 2 +-
61 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 298717546..37c3843d4 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -392,7 +392,7 @@ export default {
callback(new Error('请输入证件号'))
} else {
if (!isCard(value)) {
- callback(new Error('请输入正确的身份证号或护照号'))
+ callback(new Error('请输入正确的证件号或护照号'))
}
callback()
}
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 07817648a..c330573fb 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1602,7 +1602,7 @@ export default {
return this.$message.error('网络错误')
})
},
- // 身份证号失去焦点事件
+ // 证件号失去焦点事件
handleValidBlur (item) {
console.log('n---', item)
if (item.formName !== 'idNum') return
diff --git a/src/views/dataBoard/cpts/map/popup.vue b/src/views/dataBoard/cpts/map/popup.vue
index 4df2d793d..276dd217e 100644
--- a/src/views/dataBoard/cpts/map/popup.vue
+++ b/src/views/dataBoard/cpts/map/popup.vue
@@ -37,7 +37,7 @@
{{ info.genderShow || "--" }}
- 身份证号：
+ 证件号：
{{ info.idcard || "--" }}
@@ -199,7 +199,7 @@
{{ info.holder_phone || "--" }}
- 房主证件号：
+ 房主身份证：
{{ info.holder_idcard || "--" }}
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 3438595fc..65c61cc17 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -337,12 +337,12 @@ 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({
type: 'warning',
- message: '请输入正确的身份证号码'
+ message: '请输入正确的证件号码'
})
return false;
}
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 1d54bfd4c..d1ec848d8 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -186,7 +186,7 @@
width="110">
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index cf3e31c3b..b0243d9ce 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -131,7 +131,7 @@
style="display: block">
@@ -345,7 +345,7 @@ export default {
callback(new Error("请输入证件号"));
} else {
if (!isCard(value)) {
- callback(new Error("请输入正确的身份证号或护照号"));
+ callback(new Error("请输入正确的证件号或护照号"));
}
callback();
}
@@ -360,7 +360,7 @@ export default {
],
name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
idCard: [
- { required: true, message: "身份证号不能为空", trigger: "blur" },
+ { required: true, message: "证件号不能为空", trigger: "blur" },
{ required: true, validator: checkIdCard, trigger: "blur" },
],
birthplace: [
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 81b3f8492..11befc2ec 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -141,7 +141,7 @@
prop="idCard"
style="display: block">
@@ -341,7 +341,7 @@ export default {
callback(new Error('请输入证件号'))
} else {
if (!isCard(value)) {
- callback(new Error('请输入正确的身份证号或护照号'))
+ callback(new Error('请输入正确的证件号或护照号'))
}
callback()
}
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index 704fad4ff..e7c546a43 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -293,12 +293,12 @@ 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({
type: 'warning',
- message: '请输入正确的身份证号码'
+ message: '请输入正确的证件号码'
})
return false;
}
diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue
index 793cbb8f4..2364bb101 100644
--- a/src/views/modules/cabaseinfo/carental-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue
@@ -34,8 +34,8 @@
-
-
+
+
diff --git a/src/views/modules/cabaseinfo/caresident-add-or-update.vue b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
index 4383f1d75..1cafee1b8 100644
--- a/src/views/modules/cabaseinfo/caresident-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index b0b357e19..a4a424f65 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/src/views/modules/cabaseinfo/carotators-add-or-update.vue b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
index eaf0bed8c..5d698ff90 100644
--- a/src/views/modules/cabaseinfo/carotators-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/views/modules/cabaseinfo/carotators-binding-house.vue b/src/views/modules/cabaseinfo/carotators-binding-house.vue
index 276d1eb46..b7014bcdd 100644
--- a/src/views/modules/cabaseinfo/carotators-binding-house.vue
+++ b/src/views/modules/cabaseinfo/carotators-binding-house.vue
@@ -92,7 +92,7 @@
@@ -225,7 +225,7 @@ export default {
},
typePlaceholder: {
- jumin: "请输入姓名或电话或身份证号",
+ jumin: "请输入姓名或电话或证件号",
fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
xuqiu: "请输入需求人或需求内容或服务方",
},
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index eb4fe9398..8a6973bd6 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue
index f37af575e..d9c7c8852 100644
--- a/src/views/modules/communityParty/heart/heartAudit.vue
+++ b/src/views/modules/communityParty/heart/heartAudit.vue
@@ -46,7 +46,7 @@
diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue
index bf4f48372..8a24d4d90 100644
--- a/src/views/modules/communityParty/heart/heartPerson.vue
+++ b/src/views/modules/communityParty/heart/heartPerson.vue
@@ -36,7 +36,7 @@
diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index 248371905..eb03a76bd 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -75,7 +75,7 @@
-
{
if (value === '') {
- callback(new Error('请输入身份证'))
+ callback(new Error('请输入证件号'))
} else {
if (!isCard(value)) {
- callback(new Error('身份证号格式不正确'))
+ callback(new Error('证件号格式不正确'))
}
callback()
}
diff --git a/src/views/modules/communityParty/members/detailForm.vue b/src/views/modules/communityParty/members/detailForm.vue
index 07d416c4a..4669347d4 100644
--- a/src/views/modules/communityParty/members/detailForm.vue
+++ b/src/views/modules/communityParty/members/detailForm.vue
@@ -45,7 +45,7 @@
- 身份证：
+ 证件号：
{{ info.idCard?info.idCard:'--' }}
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index 80255c7f2..9b1d29233 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -41,7 +41,7 @@
class="input-width"
clearable>
-
-
+
@@ -89,7 +89,7 @@
/>
@@ -235,7 +235,7 @@
{{detailInfo.mobile}}
-
+
{{detailInfo.idCard}}
diff --git a/src/views/modules/communityService/measure/points.vue b/src/views/modules/communityService/measure/points.vue
index 5a7b704a1..f06369051 100644
--- a/src/views/modules/communityService/measure/points.vue
+++ b/src/views/modules/communityService/measure/points.vue
@@ -18,7 +18,7 @@
-
+
@@ -89,7 +89,7 @@
/>
@@ -235,7 +235,7 @@
{{detailInfo.mobile}}
-
+
{{detailInfo.idCard}}
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
index e6d5bdd8d..da4948474 100644
--- a/src/views/modules/communityService/policy/personListItem.vue
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -104,13 +104,13 @@
-
+ placeholder="请输入证件号">
@@ -162,7 +162,7 @@
-
-
+
+
diff --git a/src/views/modules/demo/demo.vue b/src/views/modules/demo/demo.vue
index f39204ccd..60c1d36f4 100644
--- a/src/views/modules/demo/demo.vue
+++ b/src/views/modules/demo/demo.vue
@@ -17,7 +17,7 @@
@@ -59,7 +59,7 @@
header-align="center"
align="center">
-
+ placeholder="请输入证件号">
-
+
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index 310d1e328..95c2710b6 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -45,13 +45,13 @@
>
-
+
@@ -123,7 +123,7 @@
>
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 1716b3b79..ba8c95878 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -43,7 +43,7 @@
class="input-width"
clearable>
-
+ label="证件号">
diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue
index 99d8c4e5b..638cc8100 100644
--- a/src/views/modules/plugins/power/kernelhouseholdTable.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue
@@ -47,7 +47,7 @@
width="150">
-
-
+
+
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index 781df1e41..cabf65cdc 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 45bbaef0b..bde1cf507 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">
-
@@ -519,7 +519,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
const regPassport = /^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/; //护照号，1字母8数字或2字母7数字
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false && regPassport.test(this.dataForm.ownerIdCard) === false) {
this.btnDisable = false
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 52fe8ae3d..390ee23de 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -156,7 +156,7 @@
-
+
@@ -605,7 +605,7 @@ export default {
},
typePlaceholder: {
- jumin: "请输入姓名或电话或身份证号",
+ jumin: "请输入姓名或电话或证件号",
fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
xuqiu: "请输入需求人或需求内容或服务方",
},
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index b0c0bbcc7..edef3a606 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -50,13 +50,13 @@
-
@@ -243,7 +243,7 @@ function iniFmData () {
reportUserId: "", // 报事人ID
name: "", // 报事人姓名
mobile: "", // 手机号
- idCard: "", // 身份证号
+ idCard: "", // 证件号
sourceType: "", // 反映渠道
happenTime: "", //发生时间
eventContent: "", // 事件内容
@@ -322,10 +322,10 @@ export default {
dataRule () {
let checkIdCard = (rule, value, callback) => {
if (value === "") {
- callback(new Error("请输入身份证"));
+ callback(new Error("请输入证件号"));
} else {
if (!isCard(value)) {
- callback(new Error("身份证号格式不正确"));
+ callback(new Error("证件号格式不正确"));
}
callback();
}
@@ -340,7 +340,7 @@ export default {
{ required: true, message: "手机号不能为空", trigger: "blur" },
],
// idCard: [
- // { required: true, message: "身份证号不能为空", trigger: "blur" },
+ // { required: true, message: "证件号不能为空", trigger: "blur" },
// { required: true, validator: checkIdCard, trigger: "blur" },
// ],
sourceType: [
@@ -521,14 +521,14 @@ export default {
return false;
}
- 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.formData.idCard &&
regCard.test(this.formData.idCard) === false
) {
this.$message({
type: "warning",
- message: "请输入正确的身份证号码",
+ message: "请输入正确的证件号码",
});
return false;
}
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index ecc20e83e..6da354356 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -56,7 +56,7 @@
{{ info.mobile }}
- 身份证号：
+ 证件号：
{{ info.idCard?info.idCard:'--' }}
diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue
index ca354ac52..7ac195e71 100644
--- a/src/views/modules/shequzhili/issue/cpts/add.vue
+++ b/src/views/modules/shequzhili/issue/cpts/add.vue
@@ -70,7 +70,7 @@
@@ -304,7 +304,7 @@ function iniFmData() {
reportUserId: "", // 报事人ID
name: "", // 报事人姓名
mobile: "", // 手机号
- idCard: "", // 身份证号
+ idCard: "", // 证件号
sourceType: "", // 反映渠道
happenTime: "", //发生时间
eventContent: "", // 事件内容
@@ -379,10 +379,10 @@ export default {
dataRule() {
let checkIdCard = (rule, value, callback) => {
if (value === "") {
- callback(new Error("请输入身份证"));
+ callback(new Error("请输入证件号"));
} else {
if (!isCard(value)) {
- callback(new Error("身份证号格式不正确"));
+ callback(new Error("证件号格式不正确"));
}
callback();
}
@@ -397,7 +397,7 @@ export default {
{ required: true, message: "手机号不能为空", trigger: "blur" },
],
// idCard: [
- // { required: true, message: "身份证号不能为空", trigger: "blur" },
+ // { required: true, message: "证件号不能为空", trigger: "blur" },
// { required: true, validator: checkIdCard, trigger: "blur" },
// ],
sourceType: [
@@ -574,14 +574,14 @@ export default {
return false;
}
- 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.formData.idCard &&
regCard.test(this.formData.idCard) === false
) {
this.$message({
type: "warning",
- message: "请输入正确的身份证号码",
+ message: "请输入正确的证件号码",
});
return false;
}
diff --git a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
index b070e724e..b01b3a3d7 100644
--- a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
@@ -63,7 +63,7 @@
{{ eventDetailData.mobile||'--' }}
- 身份证号：
+ 证件号：
{{ eventDetailData.idCard||'--' }}
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
index b070e724e..b01b3a3d7 100644
--- a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
+++ b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
@@ -63,7 +63,7 @@
{{ eventDetailData.mobile||'--' }}
- 身份证号：
+ 证件号：
{{ eventDetailData.idCard||'--' }}
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
index 3a80484e6..d49d2f5b1 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
@@ -147,7 +147,7 @@
-
+
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
index 2f3fc8107..7c86822b3 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -148,7 +148,7 @@
-
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
index 0a7dcec40..a63a5a059 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
@@ -178,7 +178,7 @@
-
diff --git a/src/views/modules/sys/roomForm.vue b/src/views/modules/sys/roomForm.vue
index d7a3f6723..ad1c364da 100644
--- a/src/views/modules/sys/roomForm.vue
+++ b/src/views/modules/sys/roomForm.vue
@@ -327,12 +327,12 @@ 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({
type: 'warning',
- message: '请输入正确的身份证号码'
+ message: '请输入正确的证件号码'
})
return false;
}
diff --git a/src/views/modules/visual/basicinfo/peopleList copy.vue b/src/views/modules/visual/basicinfo/peopleList copy.vue
index b7d47fb8c..4dbe15851 100644
--- a/src/views/modules/visual/basicinfo/peopleList copy.vue
+++ b/src/views/modules/visual/basicinfo/peopleList copy.vue
@@ -28,7 +28,7 @@
所属网格
所属房屋
手机
- 身份证
+ 证件号
性别
出生日期
操作
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index d2005d1c2..ace920f1f 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -127,7 +127,7 @@ export default {
"所属网格",
"所属房屋",
"手机",
- "身份证",
+ "证件号",
"性别",
"出生日期",
"操作",
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index f68b60234..e94861b04 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -36,7 +36,7 @@
{{ info.genderShow || "--" }}
- 身份证号：
+ 证件号：
{{ info.idCard || "--" }}
@@ -255,7 +255,7 @@
{{ info.mobile || "--" }}
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 813711594..908ca9067 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -618,7 +618,7 @@ export default {
//
+ 
-
-
- {{ data.label+'(' }}
- {{ data.showNum }}
- {{')' }}
-
- {{ data.showName }}
-
- 
+
+ 
+
+
+