From 49a501e09f8ed415709f12bac6de2c983944145d Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 18 Apr 2024 10:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/screen-content-right.js | 38 +- .../dialog-module/resident-info/index.vue | 114 +++- .../dialog-module/resident-info/info.json | 619 +++++++++++++++++- 3 files changed, 745 insertions(+), 26 deletions(-) diff --git a/src/api/screen-content-right.js b/src/api/screen-content-right.js index f106902..f70093a 100644 --- a/src/api/screen-content-right.js +++ b/src/api/screen-content-right.js @@ -115,7 +115,7 @@ export function getResidentList (data) { } // 获取居民详情-右侧若干信息一块 -export function getResidentMoreInfo ({ icResiUserId }) { +export function getrowInfo ({ icResiUserId }) { return request({ baseURL: intranetApiUrl, url: '/epmetuser/icresiuser/screenJinShui/screenIcResiDetail', @@ -125,6 +125,42 @@ export function getResidentMoreInfo ({ icResiUserId }) { } }) } +// 获取小区列表 agencyId gridId +export function getNeighborhoodoption (data) { + return request({ + baseURL: intranetApiUrl, + url: '/gov/org/icneighborhood/screenJinShui/neighborhoodoption', + method: 'POST', + data + }) +} +// 获取楼栋列表 +export function getBuildingoption (data) { + return request({ + baseURL: intranetApiUrl, + url: '/gov/org/icbuilding/screenJinShui/buildingoption', + method: 'POST', + data + }) +} +// 获取单元 buildingId +export function getUnitoption (data) { + return request({ + baseURL: intranetApiUrl, + url: '/gov/org/icbuildingunit/unitoption', + method: 'POST', + data + }) +} +// 获取房屋 unitId +export function getHouseoption (data) { + return request({ + baseURL: intranetApiUrl, + url: '/gov/org/ichouse/houseoption', + method: 'POST', + data + }) +} // 获取居民详情-左上个人基本情况 export function getResidentBasicInfo ({ userId }) { diff --git a/src/views/next/dialog-module/resident-info/index.vue b/src/views/next/dialog-module/resident-info/index.vue index 5982939..687333c 100644 --- a/src/views/next/dialog-module/resident-info/index.vue +++ b/src/views/next/dialog-module/resident-info/index.vue @@ -133,14 +133,10 @@
-
+
{{ item.label }}：{{ loopGetLabel(item.optionsList, item.value) }}
-
-
-
{{ item.label }}：{{ item.value || '-' }}
-
@@ -191,7 +187,11 @@ import { mapGetters, mapActions } from 'vuex' import { getResidentBasicInfo, getResidentRelationshipInfo, - getResidentMoreInfo + getrowInfo, + getNeighborhoodoption, + getBuildingoption, + getUnitoption, + getHouseoption } from 'api/screen-content-right' import Bus from 'utils/eventBus' import moreInfo from './info.json' @@ -210,7 +210,7 @@ export default { { label: '工作单位', icon: require('@/assets/next-images/resident-info/work-position.png'), left: '110px', top: '250px', visible: false, value: [] }, { label: '志愿者类别', icon: require('@/assets/next-images/resident-info/volunteer-type.png'), left: '550px', top: '250px', visible: false, value: [] } ], - + resiInfo:{}, relationship: { owner: '-', firstRel: '-', @@ -229,11 +229,12 @@ export default { { label: '核酸信息', value: '' }, { label: '行程信息', value: '' }, { label: '疫苗信息', value: '' } ], - residentId: '' + residentId: '', + gridName:null } }, computed: { - ...mapGetters(['residentInfoVisible']), + ...mapGetters(['residentInfoVisible','communityId']), tabInfoList () { let list = [] try { @@ -252,7 +253,24 @@ export default { Bus.$off('emitResidentInfoData', this.emitResidentInfoData.bind(this)) Bus.$on('emitResidentInfoData', this.emitResidentInfoData.bind(this)) }, + watch:{ + 'resiInfo':{ + handler(newVal){ + this.getResidentMoreInfo() + }, + deep:true + } + }, + methods: { + getrowInfo(){ + let params = { + icResiUserId: this.residentId + } + getrowInfo(params).then(({ data: res }) => { + this.resiInfo = res.ic_resi_user[0] + }) + }, emitResidentInfoData ({ residentId }) { this.residentId = residentId || '' if (this.residentId) { @@ -287,7 +305,7 @@ export default { getResidentDetail () { this.getResidentBasicInfo() this.getResidentRelationshipInfo() - this.getResidentMoreInfo() + this.getrowInfo() }, // 获取左上个人基本情况 getResidentBasicInfo () { @@ -298,6 +316,7 @@ export default { console.log('获取左上个人基本情况', res) const { name, gridName, financialSituation, personCategory, houseInfo, workUnit, volunteerCategory } = res this.userName = name + this.gridName = gridName const { monthlyIncome, retirementAmount } = financialSituation this.peopleSituationList = [ { label: '所属网格', icon: require('@/assets/next-images/resident-info/belong-grid.png'), left: '160px', top: '0px', visible: false, value: [gridName || '-'] }, @@ -333,31 +352,78 @@ export default { console.error('获取左下家庭关系情况', err) }) }, - // 获取更多信息 - getResidentMoreInfoBk () { - const params = { - icResiUserId: this.residentId + + getNeighborhoodoption(){ + let params = { + agencyId: this.communityId, + gridId:this.resiInfo.GRID_ID } - getResidentMoreInfo(params).then(() => { - console.log('获取更多信息', moreInfo) - }).catch(err => { - console.error('获取更多信息', err) + getNeighborhoodoption(params).then(({ data: res }) => { + let str =res.filter(item=>item.value == this.resiInfo.VILLAGE_ID)[0].label + this.infoList.forEach(item=>{ + if(item.type === 'neighborhood'){ + item.value = str + } + }) + this.getBuildingoption() + }) + }, + getBuildingoption(){ + let params = { + neighborHoodId: this.resiInfo.VILLAGE_ID + } + getBuildingoption(params).then(({ data: res }) => { + let str =res.filter(item=>item.value == this.resiInfo.BUILD_ID)[0].label + this.infoList.forEach(item=>{ + if(item.type === 'building'){ + item.value = str + } + }) + this.getUnitoption() + }) + }, + getUnitoption(){ + let params = { + buildingId: this.resiInfo.BUILD_ID + } + getUnitoption(params).then(({ data: res }) => { + let str =res.filter(item=>item.value == this.resiInfo.UNIT_ID)[0].label + this.infoList.forEach(item=>{ + if(item.type === 'unit'){ + item.value = str + } + }) + this.getHouseoption() + }) + }, + getHouseoption(){ + let params = { + unitId: this.resiInfo.UNIT_ID + } + getHouseoption(params).then(({ data: res }) => { + let str =res.filter(item=>item.value == this.resiInfo.HOME_ID)[0].label + this.infoList.forEach(item=>{ + if(item.type === 'house'){ + item.value = str + } + }) }) }, // 获取更多信息 getResidentMoreInfo () { - console.log('获取居民详情', moreInfo) const { itemList, groupList } = moreInfo.data this.infoList = [ - { label: '所属网格', value: '', optionsList: [], type: 'self' }, - { label: '所属小区', value: '', optionsList: [], type: 'self' }, - { label: '所属楼栋', value: '', optionsList: [], type: 'self' }, - { label: '所属楼栋', value: '', optionsList: [], type: 'self' } + { label: '所属网格', value: this.gridName, optionsList: [], type: 'grid' }, + { label: '所属小区', value: '', optionsList: [], type: 'neighborhood' }, + { label: '所属楼栋', value: '', optionsList: [], type: 'building' }, + { label: '所属单元', value: '', optionsList: [], type: 'unit' }, + { label: '所属房屋', value: '', optionsList: [], type: 'house' } ] + this.getNeighborhoodoption() itemList.forEach(item => { this.infoList.push({ label: item.label, - value: item.defaultValue, + value:this.resiInfo[item.columnName]|| item.defaultValue, optionsList: item.options, type: item.label === '分割线' ? 'divider' : 'info' }) diff --git a/src/views/next/dialog-module/resident-info/info.json b/src/views/next/dialog-module/resident-info/info.json index e1c2ae9..042880f 100644 --- a/src/views/next/dialog-module/resident-info/info.json +++ b/src/views/next/dialog-module/resident-info/info.json @@ -163,7 +163,624 @@ "placeholder": "", "columnName": "MZ", "columnNum": 0, - "options": [], + "options": [ + { + "label": "汉族", + "code": null, + "value": "0", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "满族", + "code": null, + "value": "1", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "蒙古族", + "code": null, + "value": "2", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "回族", + "code": null, + "value": "3", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "藏族", + "code": null, + "value": "4", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "维吾尔族", + "code": null, + "value": "5", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "苗族", + "code": null, + "value": "6", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "彝族", + "code": null, + "value": "7", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "壮族", + "code": null, + "value": "8", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "布依族", + "code": null, + "value": "9", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "侗族", + "code": null, + "value": "10", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "瑶族", + "code": null, + "value": "11", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "白族", + "code": null, + "value": "12", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "土家族", + "code": null, + "value": "13", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "哈尼族", + "code": null, + "value": "14", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "哈萨克族", + "code": null, + "value": "15", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "傣族", + "code": null, + "value": "16", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "黎族", + "code": null, + "value": "17", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "傈僳族", + "code": null, + "value": "18", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "佤族", + "code": null, + "value": "19", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "畲族", + "code": null, + "value": "20", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "高山族", + "code": null, + "value": "21", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "拉祜族", + "code": null, + "value": "22", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "水族", + "code": null, + "value": "23", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "东乡族", + "code": null, + "value": "24", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "纳西族", + "code": null, + "value": "25", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "景颇族", + "code": null, + "value": "26", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "柯尔克孜族", + "code": null, + "value": "27", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "土族", + "code": null, + "value": "28", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "达斡尔族", + "code": null, + "value": "29", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "仫佬族", + "code": null, + "value": "30", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "羌族", + "code": null, + "value": "31", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "布朗族", + "code": null, + "value": "32", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "撒拉族", + "code": null, + "value": "33", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "毛南族", + "code": null, + "value": "34", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "仡佬族", + "code": null, + "value": "35", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "锡伯族", + "code": null, + "value": "36", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "阿昌族", + "code": null, + "value": "37", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "普米族", + "code": null, + "value": "38", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "朝鲜族", + "code": null, + "value": "39", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "塔吉克族", + "code": null, + "value": "40", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "怒族", + "code": null, + "value": "41", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "乌孜别克族", + "code": null, + "value": "42", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "俄罗斯族", + "code": null, + "value": "43", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "鄂温克族", + "code": null, + "value": "44", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "德昂族", + "code": null, + "value": "45", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "保安族", + "code": null, + "value": "46", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "裕固族", + "code": null, + "value": "47", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "京族", + "code": null, + "value": "48", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "塔塔尔族", + "code": null, + "value": "49", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "独龙族", + "code": null, + "value": "50", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "鄂伦春族", + "code": null, + "value": "51", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "赫哲族", + "code": null, + "value": "52", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "门巴族", + "code": null, + "value": "53", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "珞巴族", + "code": null, + "value": "54", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + }, + { + "label": "基诺族", + "code": null, + "value": "55", + "sysDictDataId": null, + "children": null, + "usableFlag": null, + "type": null, + "pid": null, + "pvalue": null + } + ], "childGroup": null, "multiSelect": false, "groupLabel": null