From 28d1e1c320bdeb6459152ca0384fd04cc33b96ce Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 28 Mar 2023 15:06:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/yanjing1.png | Bin 0 -> 321 bytes src/assets/img/yanjing2.png | Bin 0 -> 296 bytes src/views/components/resiChangeTransfer.vue | 3 +- src/views/components/resiInfo.vue | 26 ++++++++++++------ src/views/main-navbar.vue | 9 +++++- .../modules/base/community/community.vue | 24 ++++++++++++---- .../modules/base/community/communityTable.vue | 2 +- src/views/modules/base/resi.vue | 7 +++++ src/views/modules/home/index.vue | 2 +- .../plugins/change/changerelocation.vue | 3 +- .../modules/plugins/change/resideathAdd.vue | 4 +-- 11 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 src/assets/img/yanjing1.png create mode 100644 src/assets/img/yanjing2.png diff --git a/src/assets/img/yanjing1.png b/src/assets/img/yanjing1.png new file mode 100644 index 0000000000000000000000000000000000000000..a5a14daa1db99178de0e3d04a0207b7f6048ce21 GIT binary patch literal 321 zcmV-H0lxl;P)Px#`$5wzd@H_8&_{-vhZVE5MdwZO$M{m8DNfGoV^9m z_mmPppJ@Y7Vl4%PsZw7;rl$hL7`vfq+b+y~fw~?6Jm7=rLpf8Q0J1bOCD-3ufMy^} zK&&A60uY%CK?&NvJv*uFEx6H=d9&|0!8R@}53NsJ1xV7A!@SvFbDH@zAR8?sWDuF< zkcH#G&gx8;+6|&`xA3Orc-*(+%htjNX7>B(H7} T4Z~D<00000NkvXXu0mjfLG6Xe literal 0 HcmV?d00001 diff --git a/src/assets/img/yanjing2.png b/src/assets/img/yanjing2.png new file mode 100644 index 0000000000000000000000000000000000000000..ca591cb38223d935e9e59c13182a9f2cb25c27f7 GIT binary patch literal 296 zcmV+@0oVSCP)Px#;z>k7R5(w~l19elB*Yo37yC+ z_vC$&H#b7dkd}IW5iqGb)J##$5HjEtY)V1GnoWAkZ?8`~7*})9g^QFEA|=Y1q#mF$ z3ot3zrOQTl-$5f*O7^`WlPaUul^3ck*{21ufh-zG0EFTLq6OQ2?r)>xAx3xI% literal 0 HcmV?d00001 diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index 5018b20aa..5f4f32abf 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -157,11 +157,10 @@
- 取 消 + 取 消 保 存联系电话:
{{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}}
+ + 显示 + @click="handleTuomin('mobile')">{{showFlagMobileBtn?'显示':'隐藏'}}
证件号:
{{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}}
+ + 显示 + @click="handleTuomin('idCard')">{{showFlagIdCardBtn?'显示':'隐藏'}} @@ -924,7 +925,9 @@ export default { specialDtoArr:[], spouseArr:[], relationshipArr:[], - categoryDictArr:[] + categoryDictArr:[], + showFlagIdCardBtn:true, + showFlagMobileBtn:true } }, computed: { @@ -1740,14 +1743,21 @@ export default { }, async handleTuomin (type) { const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`; - const { data, code, msg } = await requestPost(url); if (code === 0) { if (type === 'mobile') { this.$set(this.resiDetailObj, 'showMobile', data.mobile) + this.showFlagMobileBtn = !this.showFlagMobileBtn + if(this.showFlagMobileBtn){ + this.$set(this.resiDetailObj, 'showMobile', data.mobile.substr(0,3) +'****'+ data.mobile.substr(7,4) ) + } } if (type === 'idCard') { this.$set(this.resiDetailObj, 'showIdNum', data.idNum) + this.showFlagIdCardBtn = !this.showFlagIdCardBtn + if(this.showFlagIdCardBtn){ + this.$set(this.resiDetailObj, 'showIdNum', data.idNum.substr(0,11) +'****'+ data.idNum.substr(16,2) ) + } } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 3a240f1af..8c562f8f2 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -313,6 +313,9 @@ export default { if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) { this.getNoticeList(); this.displayedNoticeList = true; + setTimeout(()=>{ + this.displayedNoticeList = false; + },5000) } this.unreadMsgNum = data.unreadNum; } else { @@ -383,6 +386,7 @@ export default { box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12); border-radius: 4px; + .title { margin-bottom: 16px; height: 22px; @@ -435,8 +439,11 @@ export default { font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: rgba(0, 0, 0, 0.85); line-height: 22px; + cursor: pointer; + &:hover{ + color: #0056d6 !important; + } } } diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 403e435fb..2592d8adb 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -26,7 +26,7 @@ > {{ ' ' }} --> - {{ data.label + "(" }} {{ data.showNum }} {{ ")" }} - - {{ data.showName }} + --> + {{ data.showName }} @@ -243,7 +243,7 @@ 查询 @@ -476,8 +476,20 @@ export default { ? this.clientHeight - 245 + this.iframeHeight + "px" : this.clientHeight - 245 + "px"; }, - ...mapGetters(["clientHeight", "iframeHeight"]), + showIcons(){ + return function(data){ + if(data.level=='building'){ + let arr = data.showNum.split('/') + console.log(arr); + if(arr[0] !== arr[1]){ + return true + }else{ + return false + } + } + } + }, }, watch: { // filterText (val) { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index f07b7b56d..515910991 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -5,7 +5,7 @@ 新增小区 diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index b78ea8387..0c3e4b9d4 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -51,7 +51,7 @@
- 智能搜索 + 智能查询
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index 56097448c..8fd6d43e7 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -164,7 +164,7 @@ 查询 @@ -321,7 +321,6 @@ slot="reference" type="text" size="small" - class="div-table-button--blue" >恢复 diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue index 91342318a..c3d1453b0 100644 --- a/src/views/modules/plugins/change/resideathAdd.vue +++ b/src/views/modules/plugins/change/resideathAdd.vue @@ -56,10 +56,10 @@
- 取 消 + 取 消 保 存 Date: Tue, 28 Mar 2023 15:51:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/collect.vue | 16 ++++++------ .../modules/base/community/communityTable.vue | 8 +++--- .../modules/base/huji/immigration/index.vue | 26 ++++++++----------- .../modules/plugins/change/changedeath.vue | 22 ++++++++++++---- .../plugins/change/changerelocation.vue | 15 ++++------- 5 files changed, 45 insertions(+), 42 deletions(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index c253e8e2b..d5f80200e 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -59,18 +59,18 @@ -
- + + + 重置 查询 - -
- - + +
@@ -421,8 +421,8 @@ export default { computed: { ...mapGetters(["clientHeight", "iframeHeight"]), tableHeight () { - const h = this.clientHeight - 360 + this.iframeHeigh; - const _h = this.clientHeight - 360; + const h = this.clientHeight - 400 + this.iframeHeigh; + const _h = this.clientHeight - 400; return this.$store.state.inIframe ? h : _h; }, dialogTableHeight () { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 515910991..f6fe14242 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -176,7 +176,7 @@ >下载房屋模板
-
补全小程序小区码 -
+
-->
智能填报
-
@@ -227,7 +227,7 @@ @click="handleDownQr(agencyObj, 'community')" >社区二维码 -
+ --> --> - -
+ + + 查询 -
- + +
@@ -547,13 +548,16 @@ export default { importLoading: false, searchH: 0, - tableHeight: 0, changeRecordShow: false, }; }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), - + tableHeight(){ + const h = this.clientHeight - 450 + this.iframeHeigh; + const _h = this.clientHeight - 450; + return this.$store.state.inIframe ? h : _h; + }, changeVDisabled() { return !this.fmData.villageId; }, @@ -563,6 +567,7 @@ export default { changeDDisabled() { return !this.fmData.unitId; }, + }, watch: { rangeTime: function (val) { @@ -575,15 +580,6 @@ export default { this.fmData.endTime = ""; } }, - searchH() { - const h = this.clientHeight - this.searchH + this.iframeHeight; - const _h = this.clientHeight - this.searchH; - console.log("computed-searchH---_h", _h); - - this.$nextTick(() => { - this.tableHeight = this.$store.state.inIframe ? h : _h; - }); - }, }, mounted() { this.getGridList(); diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 86a05754c..4a2159a12 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -69,8 +69,11 @@ --> -
- + + + 重置 查询 -
- + +
@@ -96,6 +99,7 @@ class="m-table-item" v-loading="dataListLoading" :data="dataList" + :height="tableHeight" border > @@ -277,7 +281,7 @@ import nextTick from "dai-js/tools/nextTick"; import resiChangeRecord from "@/views/components/resiChangeRecord.vue"; import { requestPost } from "@/js/dai/request"; import resiInfo from "@/views/components/resiInfo.vue"; - +import { mapGetters } from "vuex"; export default { mixins: [mixinViewModule], data() { @@ -328,6 +332,14 @@ export default { resiInfo, resiChangeRecord, }, + computed:{ + ...mapGetters(["clientHeight", "iframeHeight"]), + tableHeight(){ + const h = this.clientHeight - 410 + this.iframeHeigh; + const _h = this.clientHeight - 410; + return this.$store.state.inIframe ? h : _h; + }, + }, methods: { async handleRecovery(rowData) { console.log("11111"); diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index 8fd6d43e7..88c1e9ca7 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -441,7 +441,6 @@ export default { changeRecordShow: false, searchH: 0, - tableHeight: 0, }; }, components: { @@ -451,6 +450,11 @@ export default { }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), + tableHeight(){ + const h = this.clientHeight - 420 + this.iframeHeigh; + const _h = this.clientHeight - 420; + return this.$store.state.inIframe ? h : _h; + }, changeVDisabled() { return !this.dataForm.villageId; }, @@ -479,15 +483,6 @@ export default { this.dataForm.endTime = ""; } }, - searchH() { - const h = this.clientHeight - this.searchH + this.iframeHeight; - const _h = this.clientHeight - this.searchH; - console.log("computed-searchH---_h", _h); - - this.$nextTick(() => { - this.tableHeight = this.$store.state.inIframe ? h : _h; - }); - }, }, methods: { async handleRecovery(rowData) { From 6fdafae932db9f99c7cb63fc166a6b003bf55984 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 28 Mar 2023 17:06:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/resi-category-map.js | 6 +++--- src/views/components/resiForm.vue | 4 +++- src/views/components/resiInfo.vue | 6 +++--- src/views/modules/base/community/community.vue | 8 +++++--- src/views/modules/base/community/roomTable.vue | 2 +- src/views/modules/base/resi.vue | 4 ++-- src/views/modules/home/notice.vue | 1 + 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/views/business/resi-category-map.js b/src/views/business/resi-category-map.js index 7a125a8a0..5e239c62d 100644 --- a/src/views/business/resi-category-map.js +++ b/src/views/business/resi-category-map.js @@ -1,8 +1,8 @@ export default { PARTY_FLAG: "党员", - SUBSISTENCE_ALLOWANCE_FLAG: "低保户", - ENSURE_HOUSE_FLAG: "保障房", - UNEMPLOYED_FLAG: "失业", + SUBSISTENCE_ALLOWANCE_FLAG: "低保人员", + ENSURE_HOUSE_FLAG: "保障房人员", + UNEMPLOYED_FLAG: "失业人员", FERTILE_WOMAN_FLAG: "育龄妇女", VETERAN_FLAG: "退役军人", UNITED_FRONT_FLAG: "统战人员", diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 7acb09064..4c4358c19 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -23,7 +23,9 @@ + label-width="100px" + :required="true" + >
居民分类:
- 失独老人 + 特扶人员 慢病 失智老人 残疾 @@ -85,10 +85,10 @@ 信访人员 大病 特殊人群 - 低保 + 低保人员 统战人员 租户 - 失业 + 失业人员 退役军人 志愿者 diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 2592d8adb..f8761b00e 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -70,7 +70,7 @@ > - + { + this.$refs.ref_buildingTable.loadTable('search',this.selObj) + }) + }, async loadOpenNode() { const url = "/gov/org/building/tree-ids"; diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 13536a6ae..47ff9e06e 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -481,7 +481,7 @@ export default { async loadTable (source, treeObj) { this.source = source; this.tableLoading = true; - + console.log(treeObj,'see'); if (source === "tree") { //来源于tree，查询数据清空 this.sortType = "asc"; diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 6a3e0d94c..8ff6492bb 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -241,7 +241,7 @@ }} {{ scope.row.categoryInfo.ensureHouseFlag == 1 - ? "保障房 " + ? "保障房人员 " : "" }} {{ @@ -289,7 +289,7 @@ {{ scope.row.categoryInfo .subsistenceAllowanceFlag == 1 - ? "低保 " + ? "低保人员 " : "" }} {{ diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue index 3bfaeeb8b..9dbf7b2da 100644 --- a/src/views/modules/home/notice.vue +++ b/src/views/modules/home/notice.vue @@ -201,6 +201,7 @@ export default { &:hover { .item-title { color: #0056d6; + cursor: pointer; } .item-btn-clear { display: block; From 4a2c5f48f715dbf1224332ebc1184de2a6cd37df Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 28 Mar 2023 17:15:00 +0800 Subject: [PATCH 4/4] 1 --- src/views/modules/base/community/community.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index f8761b00e..6f3f31ad1 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -76,7 +76,7 @@ class="u-item-width-normal" size="small" clearable - placeholder="请输入手机" + placeholder="请输入联系电话" >