From fd8e521f6a185b9a2512e4bf2f6dc76ccafa917d Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 27 Feb 2024 20:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95=E4=BF=A1=E6=81=AF=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E5=B0=81=E8=A3=85=E5=AE=8C=E6=88=90,=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/resiInfo.scss | 13 +- src/js/columns/constants/index.js | 12 +- src/views/components/addResi.vue | 700 ++++++++++++++++-- .../components/resiExpand/cpts/disability.vue | 0 src/views/components/resiExpand/index.vue | 301 +++++++- .../modules/portrayal/jumin/cpts/graph.vue | 12 +- .../modules/portrayal/jumin/cpts/staffTag.vue | 64 +- src/views/modules/portrayal/jumin/index.vue | 144 +++- 8 files changed, 1116 insertions(+), 130 deletions(-) delete mode 100644 src/views/components/resiExpand/cpts/disability.vue diff --git a/src/assets/scss/pages/resiInfo.scss b/src/assets/scss/pages/resiInfo.scss index a6770c9c8..ea519de3d 100644 --- a/src/assets/scss/pages/resiInfo.scss +++ b/src/assets/scss/pages/resiInfo.scss @@ -80,6 +80,7 @@ height: 100%; background: #ffffff; position: relative; + padding-bottom: 16px; .editBtn{ position: absolute; right: 16px; @@ -111,6 +112,10 @@ } } } + .f-labels{ + width: 155px; + text-align: right; + } .f-flex{ align-items: center; } @@ -119,9 +124,15 @@ } } } +.full{ + color: #0056d6; +} +.incomplete{ + color: #ff5107; +} ::v-deep .el-button--text{ padding: 0; } ::v-deep .el-row{ padding-left: 37px; -} \ No newline at end of file +} diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js index 9ba80e489..693d71b64 100644 --- a/src/js/columns/constants/index.js +++ b/src/js/columns/constants/index.js @@ -2,7 +2,7 @@ * @Author: mk 2403457699@qq.com * @Date: 2023-08-01 10:13:40 * @LastEditors: mk 2403457699@qq.com - * @LastEditTime: 2023-08-04 18:02:54 + * @LastEditTime: 2024-02-27 19:04:44 * @Description: 此文件针对于本地字典,常用的男女或者是否一类需要在前端写的可以在此文件中添加 * * @@ -49,6 +49,16 @@ export const disabilityFlagList = [ value: 0 } ] +export const hasOptions = [ + { + label: '有', + value: 1 + }, + { + label: '无', + value: 0 + } +] export const dormitoryTypeList = [ { label: '楼长', diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 5303a5f09..e538f2b8d 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -6,45 +6,47 @@
- - + + - - + + - - + - - + - + - - + + - + @@ -52,16 +54,18 @@ - + - - + @@ -69,34 +73,35 @@ - - + - - + + - 本地 - - + + 本地 - +
@@ -105,7 +110,8 @@ - + @@ -122,29 +128,31 @@ - - + - + - + --> - - - + - - - + @@ -154,26 +162,25 @@ - - - + - - + + - - + + @@ -182,7 +189,7 @@
人员标签
- +
@@ -194,36 +201,536 @@ + + + diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue index 2848dac1f..b885fc660 100644 --- a/src/views/modules/portrayal/jumin/cpts/graph.vue +++ b/src/views/modules/portrayal/jumin/cpts/graph.vue @@ -73,15 +73,17 @@ export default { let familyList = data.map((item, index) => ({ 'id': `N${index + 1}`, 'text': item.name, - 'innerHTML': `
${item.name} （${item.age}）岁
` + 'innerHTML': `
${item.name.length === 2 ? + item.name.substring(0, 1) + '*' : + item.name.substring(0, 1) + '*' + item.name.substring(2)} （${item.age}）岁
` })) let lineList = data.map((item, index) => ({ 'from': 'N1', 'to': `N${index + 1}`, - 'text': data[index].houseHolderRel || '其他', + 'text': data[index].houseHolderRel || '未知', 'isHideArrow': true, - 'color': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲'||item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')), - 'fontColor': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' ||item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')) + 'color': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')), + 'fontColor': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')) })); lineList = lineList.slice(1) const __graph_json_data = { rootId: 'root', nodes: familyList, lines: lineList } @@ -220,7 +222,7 @@ export default { margin-top: 63px; line-height: 20px; position: absolute; - width: 92px; + width: 96px; height: 20px; background: #FFFFFF; box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4); diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index 7e0714f1b..b15c637b7 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -8,16 +8,18 @@ @@ -42,9 +44,9 @@ export default { value: '', type: 'radio', option: [ - { label: '群众', value: '1' }, - { label: '党员', value: '2' }, - { label: '共青团员', value: '3' }, + { label: '群众', value: '0' }, + { label: '党员', value: '1' }, + { label: '共青团员', value: '2' }, ] }, { @@ -67,7 +69,7 @@ export default { }, { label: '死亡', - value: 'siwang' + value: 'deathFlag' } ] }, @@ -78,23 +80,7 @@ export default { type: 'checkbox', option: [ { - label: '空巢老人', - value: 'emptyNesterFlag' - }, - { - label: '独居老人', - value: 'liveAloneFlag' - }, - { - label: '失能老人', - value: 'disabledFlag' - }, - { - label: '失智老人', - value: 'dementedFlag' - }, - { - label: '高龄老人', + label: '老年人', value: 'oldPeopleFlag' }, { @@ -115,7 +101,7 @@ export default { }, { label: '特扶人员', - value: 'bereavedPersonFlag' + value: 'specialSupportFlag' } ] }, @@ -156,6 +142,16 @@ export default { label: "邪教人员", value: "xiejiaorenyuan", children: null + }, + { + label: "信访人员", + value: "petitionOfficerFlag", + children: null + }, + { + label: "统战人员", + value: "unitedFrontFlag", + children: null } ] }, @@ -194,7 +190,7 @@ export default { type: Object, default: () => { } }, - formType:{ + formType: { type: String, default: 'detail' } @@ -221,7 +217,7 @@ export default { } else if (this.userInfo.categoryInfo.partyFlag === 0) { this.formData.tableData[0].value = '1'; } - //添加回填需要在这里加上key与对应的index(在formData.tableData中对应的下标) + //添加回填需要在这里加上key与对应的index(在formData.tableData中对应的下标) updateValue('disabilityFlag', 1); updateValue('seriousIllnessFlag', 1); updateValue('chronicDiseaseFlag', 1); @@ -237,8 +233,14 @@ export default { updateValue('buildingChiefFlag', 4); updateValue('unitChiefFlag', 4); updateValue('publicWelfareFlag', 4); + }, + handeleClickRadio(val) { + this.$emit('showDialog', {value:val === '1'?'parymemberInfoDto':val},val === '1') + }, + handeleClickchckbox(item, event,index) { + item.index = index + this.$emit('showDialog', item, event) } - }, components: {}, computed: {}, diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index f6b0297f3..9dbea8ea9 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -14,7 +14,9 @@
- {{ item.name }} + {{ item.name }}{{ + item.num }}
@@ -144,7 +146,7 @@
所属房屋：
- + {{ resiDetailObj.houseInfo.gridName + '-' + resiDetailObj.houseInfo.homeName || '--' }}
@@ -254,9 +256,104 @@
关系图谱
- +
人员标签
+
党员信息
+ + +
入党时间：
+
+ {{ partyMemberInfoDto.joinTime ? partyMemberInfoDto.joinTime : "--" }} +
+ + +
转正时间：
+
+ {{ partyMemberInfoDto.positiveTime ? partyMemberInfoDto.positiveTime : "--" }} +
+ + +
所属支部：
+
+ {{ partyMemberInfoDto.branchId ? partyMemberInfoDto.branchId : "--" }} +
+ + + + +
是否流动党员：
+
+ {{ partyMemberInfoDto.flowFlag ? partyMemberInfoDto.flowFlag == 1 ? '是' : '否' : "--" }} +
+ + +
流动党员活动证号：
+
+ {{ partyMemberInfoDto.flowActNum ? partyMemberInfoDto.flowActNum : "--" }} +
+ + +
党组织职务：
+
+ {{ partyMemberInfoDto.partyJob ? partyMemberInfoDto.partyJob : "--" }} +
+ + + + + + +
是否退休：
+
+
+ {{ partyMemberInfoDto.retiredFlag ? partyMemberInfoDto.retiredFlag == 1 ? '是' : '否' : "--" }} +
+
+ + +
党员中心户：
+
+
+ {{ partyMemberInfoDto.centerFlag ? partyMemberInfoDto.centerFlag == 1 ? '是' : '否' : "--" }} +
+
+ + +
免学习：
+
+ + {{ partyMemberInfoDto.studyNotNeed ? partyMemberInfoDto.studyNotNeed == 1 ? '是' : '否' : "--" }} +
+ + + + + +
入党时所在党支部：
+
+ {{ partyMemberInfoDto.joinBranchName ? partyMemberInfoDto.joinBranchName : "--" }} +
+ + +
组织关系转入社区时间：
+
+
+ {{ partyMemberInfoDto.joinCommunityTime ? partyMemberInfoDto.joinCommunityTime : "--" }} +
+
+ + + + + +
职责：
+
+ + {{ partyMemberInfoDto.duty ? partyMemberInfoDto.duty : "--" }} +
+ +
业务记录
更新记录
@@ -288,29 +385,36 @@ export default { return { changeRecordList: [],//更新记录 - resiDetailObj: {}, + resiDetailObj: {},//居民详情 eduInfoDto: {},//学历详情 residentFamilyInfoObj: {}, //家庭详情 residentReligionObj: {},//宗教信仰详情 residentResideInfoObj: {}, //居住详情 residentWorkInfoObj: {},//工作详情 resiEconomyObj: {},//经济状况详情 + partyMemberInfoDto: {},//党员信息详情 showFlagIdCardBtn: true, showFlagMobileBtn: true, active: 0, menuList: [ { - name: '基本信息（7/7）' + name: '基本信息', + num: '（7/7）' }, { - name: '居住信息（4/4）' + name: '居住信息', + num: '（4/4）' + }, { - name: '拓展信息（3/4）' + name: '拓展信息', + num: '（3/4）' + }, + { + name: '党员信息', + num: '（0/3）' + }, - // { - // name: '党员信息（0/3）' - // }, // { // name: '残疾信息（0/3）' // }, @@ -330,9 +434,11 @@ export default { // name: '特扶人员信息（0/3）' // }, { - name: '业务记录（1）' + name: '业务记录', + num: '（1）' }, { - name: '更新记录（1）' + name: '更新记录', + num: '（1）' } ], age: null, @@ -370,6 +476,7 @@ export default { this.getResidentWorkInfoObj() this.getEconomyDetail() this.getChangeRecordDetailById() + this.getResidentPartyMemberInfo() }, mounted() { }, @@ -388,8 +495,10 @@ export default { this.getResidentWorkInfoObj() this.getEconomyDetail() this.getChangeRecordDetailById() + this.getResidentPartyMemberInfo() }, methods: { + // 更新记录 async getChangeRecordDetailById() { try { @@ -524,6 +633,17 @@ export default { console.log(error, "获取学历字典"); } }, + //获取党员信息 + async getResidentPartyMemberInfo() { + try { + const { data } = await this.$http.get( + `/actual/base/residentPartyMemberInfo/detail/${this.resiId}` + ); + this.partyMemberInfoDto = data.data; + } catch (error) { + console.log(error); + } + }, // 学历信息 async getEduInfoDtoObj() { try {