From f82b8afc3c45482f4bae17aef83d7e38045c629f Mon Sep 17 00:00:00 2001 From: HH <2454517719@qq.com> Date: Thu, 20 Jun 2024 16:51:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=B3=BB=E7=BB=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/assets/icons/xianshi.svg | 1 + src/assets/icons/yingchang.svg | 1 + .../flow/dialog/detail-addPersonnel.vue | 57 +++++++++++--- .../permanent/dialog/detail-addPersonnel.vue | 57 +++++++++++--- .../base-manage/residence/dialog/add-edit.vue | 78 ++++++++++++++----- .../residence/dialog/detail-addPersonnel.vue | 70 ++++++++++++++--- src/views/base-manage/residence/index.vue | 5 +- .../procession/add-member-dialog.vue | 14 +++- .../emergency/procession/team-details.vue | 4 +- .../emergency/statistics/dialog/details.vue | 4 +- src/views/emergency/statistics/index.vue | 2 +- .../system/base/service-rating/index.vue | 31 +++++++- .../system/message/public-content/add.vue | 64 ++++++++++++++- .../system/message/public-content/detail.vue | 44 ++++++++++- src/views/work-trends/components/Add.vue | 3 +- 16 files changed, 369 insertions(+), 70 deletions(-) create mode 100644 src/assets/icons/xianshi.svg create mode 100644 src/assets/icons/yingchang.svg diff --git a/.env.development b/.env.development index 3306c41..7a14a2f 100644 --- a/.env.development +++ b/.env.development @@ -16,10 +16,10 @@ VITE_PROXY_API = /dev-api # VITE_PROXY = [ ["/dev-api", "http://42.193.40.239:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] # VITE_UPLOAD_URL = http://42.193.40.239:8888 # 东哥 -VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] +# VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] # VITE_UPLOAD_URL = http://192.168.110.186 # 陈游 -# VITE_PROXY = [ ["/dev-api", "http://192.168.110.10:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] +VITE_PROXY = [ ["/dev-api", "http://192.168.110.10:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]] VITE_UPLOAD_URL = http://42.193.40.239:8888/ # VITE_UPLOAD_URL = https://city.sczysoft.com/dffile/ # diff --git a/src/assets/icons/xianshi.svg b/src/assets/icons/xianshi.svg new file mode 100644 index 0000000..9827284 --- /dev/null +++ b/src/assets/icons/xianshi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/yingchang.svg b/src/assets/icons/yingchang.svg new file mode 100644 index 0000000..3c84da2 --- /dev/null +++ b/src/assets/icons/yingchang.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/base-manage/flow/dialog/detail-addPersonnel.vue b/src/views/base-manage/flow/dialog/detail-addPersonnel.vue index 061f9ae..2f453fd 100644 --- a/src/views/base-manage/flow/dialog/detail-addPersonnel.vue +++ b/src/views/base-manage/flow/dialog/detail-addPersonnel.vue @@ -135,8 +135,12 @@ placeholder="请输入身份证号" type="input" v-model="formData.idCard" - /> - 查看身份证号 + > + + { emits("close"); }; //获取身份证明文 -const getPeopleIdCard = () =>{ - let params = { - idCard:formData.value.idCard, - peopleId:formData.value.peopleId, - } - peopleIdCard(params).then((res: any) => { - if (res.data.idCard) { - formData.value.idCard = res.data.idCard; +const cardtype = ref(true); +const getPeopleIdCard = (type) =>{ + cardtype.value = !cardtype.value; + if(type) { + let params = { + idCard:formData.value.idCard, + peopleId:formData.value.peopleId, } - }); + peopleIdCard(params).then((res: any) => { + if (res.data.idCard) { + formData.value.idCard = res.data.idCard; + } + }); + }else { + function maskIdCard(idCardNumber) { + if (idCardNumber.length !== 18) { + throw new Error('身份证号码必须是18位'); + } + // 提取前六位 + var firstSix = idCardNumber.substring(0, 6); + // 提取后四位 + var lastFour = idCardNumber.substring(14); + // 中间用*代替 + var maskedMiddle = '********'.repeat(1); // 生成8个* + // 拼接结果 + return firstSix + maskedMiddle + lastFour; + } + formData.value.idCard = maskIdCard(formData.value.idCard); + } + } onMounted(() => { getareaTree(); @@ -360,4 +384,15 @@ watch( .idCardButton { margin-top: 10px; } +.icon_xianshi { + width: 2em; + height: 2em; + position: absolute; + right: 0px; +} +:deep(.el-input-group__append) { + padding: 0 !important; + background-color:transparent !important; + + } \ No newline at end of file diff --git a/src/views/base-manage/permanent/dialog/detail-addPersonnel.vue b/src/views/base-manage/permanent/dialog/detail-addPersonnel.vue index 4cdea8f..ab0c670 100644 --- a/src/views/base-manage/permanent/dialog/detail-addPersonnel.vue +++ b/src/views/base-manage/permanent/dialog/detail-addPersonnel.vue @@ -135,8 +135,12 @@ placeholder="请输入身份证号" type="input" v-model="formData.idCard" - /> - 查看身份证号 + > + + @@ -316,16 +320,36 @@ const onclone = () => { emits("close"); }; //获取身份证明文 -const getPeopleIdCard = () =>{ - let params = { - idCard:formData.value.idCard, - peopleId:formData.value.peopleId, - } - peopleIdCard(params).then((res: any) => { - if (res.data.idCard) { - formData.value.idCard = res.data.idCard; +const cardtype = ref(true); +const getPeopleIdCard = (type) =>{ + cardtype.value = !cardtype.value; + if(type) { + let params = { + idCard:formData.value.idCard, + peopleId:formData.value.peopleId, } - }); + peopleIdCard(params).then((res: any) => { + if (res.data.idCard) { + formData.value.idCard = res.data.idCard; + } + }); + }else { + function maskIdCard(idCardNumber) { + if (idCardNumber.length !== 18) { + throw new Error('身份证号码必须是18位'); + } + // 提取前六位 + var firstSix = idCardNumber.substring(0, 6); + // 提取后四位 + var lastFour = idCardNumber.substring(14); + // 中间用*代替 + var maskedMiddle = '********'.repeat(1); // 生成8个* + // 拼接结果 + return firstSix + maskedMiddle + lastFour; + } + formData.value.idCard = maskIdCard(formData.value.idCard); + } + } onMounted(() => { getareaTree(); @@ -360,4 +384,15 @@ watch( .idCardButton { margin-top: 10px; } +.icon_xianshi { + width: 2em; + height: 2em; + position: absolute; + right: 0px; +} +:deep(.el-input-group__append) { + padding: 0 !important; + background-color:transparent !important; + + } \ No newline at end of file diff --git a/src/views/base-manage/residence/dialog/add-edit.vue b/src/views/base-manage/residence/dialog/add-edit.vue index df10938..2850416 100644 --- a/src/views/base-manage/residence/dialog/add-edit.vue +++ b/src/views/base-manage/residence/dialog/add-edit.vue @@ -89,7 +89,12 @@ placeholder="请输入身份证号" type="input" v-model="formData.idCard" - /> + > + + { if (!value) { return new Error("请输入身份证号)"); } else { - const reg = - /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/; + const reg = /^[0-9*]{15}$|^[0-9*]{17}[0-9Xx]$/; const card = reg.test(value); if (!card) { - //判断座机为12位 - callback(new Error("身份证格式如:423024xxxx0216xxxx")); + ///判断是否15-18位 + callback(new Error("请输入长度为15或者18位")); } else { callback(); } @@ -246,34 +250,66 @@ const onclone = () => { emits("close"); }; //详情获取户籍人员信息 -const detailTableData = ref([]); const getDomicileDetail = (id) => { domicileDetail({ domicileId: id }).then((res: any) => { - detailTableData.value = res.peopleList; + formData.value = res.data; }); }; +//获取身份证明文 +const cardtype = ref(true); +const getPeopleIdCard = (type) =>{ + cardtype.value = !cardtype.value + if(type) { + let params = { + idCard:formData.value.idCard, + domicileId:formData.value.domicileId, + } + domicileIdCard(params).then((res: any) => { + if (res.data.idCard) { + formData.value.idCard = res.data.idCard; + } + }); + }else { + function maskIdCard(idCardNumber) { + if (idCardNumber.length !== 18) { + throw new Error('身份证号码必须是18位'); + } + // 提取前六位 + var firstSix = idCardNumber.substring(0, 6); + // 提取后四位 + var lastFour = idCardNumber.substring(14); + // 中间用*代替 + var maskedMiddle = '********'.repeat(1); // 生成8个* + // 拼接结果 + return firstSix + maskedMiddle + lastFour; + } + formData.value.idCard = maskIdCard(formData.value.idCard); + } + +} onMounted(() => { getareaTree(); }); - -watch( - () => props.readonly, - (val: any) => { - if (val == true) { - setTimeout(() => { - titleName.value = "查看"; - getDomicileDetail(formData.value.domicileId); - }, 300); - } - } -); //详情 watch( () => props.form, (val: any) => { titleName.value = val.domicileId ? "编辑" : "新增/迁入"; formData.value = JSON.parse(JSON.stringify(val)); + if(val.domicileId) getDomicileDetail(formData.value.domicileId); } ); - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/base-manage/residence/dialog/detail-addPersonnel.vue b/src/views/base-manage/residence/dialog/detail-addPersonnel.vue index eb0335e..27728ca 100644 --- a/src/views/base-manage/residence/dialog/detail-addPersonnel.vue +++ b/src/views/base-manage/residence/dialog/detail-addPersonnel.vue @@ -78,7 +78,7 @@ value-format="YYYY-MM-DD" /> - + + + + + + + + - 查看身份证号 + > + + { emits("close"); }; //获取身份证明文 -const getPeopleIdCard = () =>{ - let params = { - idCard:formData.value.idCard, - peopleId:formData.value.peopleId, - } - peopleIdCard(params).then((res: any) => { - if (res.data.idCard) { - formData.value.idCard = res.data.idCard; +const cardtype = ref(true); +const getPeopleIdCard = (type) =>{ + cardtype.value = !cardtype.value; + if(type) { + let params = { + idCard:formData.value.idCard, + peopleId:formData.value.peopleId, } - }); + peopleIdCard(params).then((res: any) => { + if (res.data.idCard) { + formData.value.idCard = res.data.idCard; + } + }); + }else { + function maskIdCard(idCardNumber) { + if (idCardNumber.length !== 18) { + throw new Error('身份证号码必须是18位'); + } + // 提取前六位 + var firstSix = idCardNumber.substring(0, 6); + // 提取后四位 + var lastFour = idCardNumber.substring(14); + // 中间用*代替 + var maskedMiddle = '********'.repeat(1); // 生成8个* + // 拼接结果 + return firstSix + maskedMiddle + lastFour; + } + formData.value.idCard = maskIdCard(formData.value.idCard); + } + } onMounted(() => { getCrTypeList(); @@ -311,4 +346,15 @@ watch( .idCardButton { margin-top: 10px; } +.icon_xianshi { + width: 2em; + height: 2em; + position: absolute; + right: 0px; +} +:deep(.el-input-group__append) { + padding: 0 !important; + background-color:transparent !important; + + } \ No newline at end of file diff --git a/src/views/base-manage/residence/index.vue b/src/views/base-manage/residence/index.vue index c90c006..8bb7f59 100644 --- a/src/views/base-manage/residence/index.vue +++ b/src/views/base-manage/residence/index.vue @@ -400,7 +400,7 @@ const onclone = () => { const fileExport = () => { const params = { userId:userId.value, - areaCode:search.value.areaCode, + areaCode:'', condition:search.value.condition, domicileState:search.value.domicileState, marriageState:search.value.marriageState, @@ -408,6 +408,9 @@ const fileExport = () => { startTime:'', endTime:'', } + if (search.value.areaCode) { + params.areaCode = search.value.areaCode[search.value.areaCode.length - 1]; + } exportFileRequest(`/admin/export/exportDomicileList`, '户籍管理统计.xlsx', params).then(res => { }) }; diff --git a/src/views/emergency/procession/add-member-dialog.vue b/src/views/emergency/procession/add-member-dialog.vue index c1b1141..5136e7f 100644 --- a/src/views/emergency/procession/add-member-dialog.vue +++ b/src/views/emergency/procession/add-member-dialog.vue @@ -13,7 +13,7 @@ @@ -21,7 +21,17 @@ - + + + + + + + + diff --git a/src/views/emergency/procession/team-details.vue b/src/views/emergency/procession/team-details.vue index 4ad3b0b..633688a 100644 --- a/src/views/emergency/procession/team-details.vue +++ b/src/views/emergency/procession/team-details.vue @@ -167,7 +167,9 @@ label="性别" > - + 刷新 +
+ + 导出动态 +
@@ -63,6 +67,16 @@
+
+ + +
+
+ + +
@@ -166,6 +180,7 @@