diff --git a/src/assets/scss/pages/resiAdd.scss b/src/assets/scss/pages/resiAdd.scss index 8858ececd..5b97e2246 100644 --- a/src/assets/scss/pages/resiAdd.scss +++ b/src/assets/scss/pages/resiAdd.scss @@ -2,11 +2,29 @@ height: 100%; padding:16px; .item_width_1{ - width: 514px; + width: 498px; } .form{ background-color: #fff; padding:16px; + .flex_box{ + display: flex; + flex-wrap: wrap; + .flex_item_width1{ + width: 332px; + } + .flex_item_width2{ + width: 700px; + } + .flex_item_width3{ + width: 120px; + } + .flex_item_width4{ + width: 300px; + + } + + } } } h5 { diff --git a/src/assets/scss/pages/resiInfo.scss b/src/assets/scss/pages/resiInfo.scss index e1fcf212e..63abec1b7 100644 --- a/src/assets/scss/pages/resiInfo.scss +++ b/src/assets/scss/pages/resiInfo.scss @@ -84,6 +84,7 @@ } .right{ flex: 1; + width: 100%; height: 100%; background: #ffffff; position: relative; @@ -104,31 +105,40 @@ margin-left: 0px; margin-top: 22px; } - .f-label { - width: 100px; - text-align: right; - color: rgba(51, 51, 51, .85) ; - >b{ - font-weight: 400; - position: relative; - color: rgba(51, 51, 51, .85) ; + .flex_box{ + display: flex; + flex-wrap: wrap; - &::after{ - content: '*'; - position: absolute; - top: 0px; - color: #ff5107; - left: -7px; + .f-flex{ + margin-top: 23px; + width: 332px; + align-items: center; + .f-label { + width: 100px; + text-align: right; + color: rgba(51, 51, 51, .85) ; + >b{ + font-weight: 400; + position: relative; + color: rgba(51, 51, 51, .85) ; + + &::after{ + content: '*'; + position: absolute; + top: 0px; + color: #ff5107; + left: -7px; + } + } } } + } + .f-labels{ width: 155px; text-align: right; } - .f-flex{ - align-items: center; - } .f-m-top23{ margin-top: 23px; } @@ -138,6 +148,4 @@ ::v-deep .el-button--text{ padding: 0; } -::v-deep .el-row{ - padding-left: 37px; -} + diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss index 1bf746981..3a92756c9 100644 --- a/src/assets/scss/pages/smartImport.scss +++ b/src/assets/scss/pages/smartImport.scss @@ -96,7 +96,7 @@ } /deep/ .el-step__description{ width: 300px; - color: #cbcbcb; + color: #666666; } } diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 7bdd94cca..048ac8bf9 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -3,85 +3,70 @@
基础信息登记
-
- - - +
+ - - - + + - - - + + - - - + + - - - - - + + - - - + + - - - + + - - - + + - - - - - + + - - - + + - - - + - - - + 本地 - - - +
居住信息登记
-
-
- - - +
+ - + - - + + label-width="100px" class="font-color-orange flex_item_width4" :rules="[ + { required: true, message: '请选择小区', trigger: 'blur' }, + ]"> + size="small" class="f-bto0" clearable> + + + { required: true, message: '请选择楼栋', trigger: 'blur' }, + ]" class="flex_item_width3"> + class=" f-bto0"> @@ -155,10 +132,10 @@ + { required: true, message: '请选择单元', trigger: 'blur' }, + ]" class="flex_item_width3"> @@ -167,10 +144,10 @@ + { required: true, message: '请选择房屋', trigger: 'blur' }, + ]" class="flex_item_width3"> @@ -183,12 +160,10 @@ icon="el-icon-minus" @click="handelClickDelHouse(index)" style="height: 30px;" circle> - +
+
- - - - + @@ -196,64 +171,50 @@ :label="item.label" :value="item.value"> - - - + - - - - - - - - - - - + - - - - + - - - + + - - - - - + + + + + +
+ +
-
拓展信息登记
-
- - - +
+ + - - - + + - - - + + - - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.label }} - - - - - - - {{ item.label }} - - - - - - - - - - - - - - - - {{ item.label }} - - - - - - - - - - - - - - - - -
-
人员标签
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ + item.label + }} + + + + + + {{ + item.label + }} + + + + + + + + + + + + {{ item.label + }} + + + + + + + + + + + + +
+
人员标签
+
+ +
+ + + + 取消 + 保存 + 提交并补充家庭人员信息 + +
- - - - 取消 - 保存 - 提交并补充家庭人员信息 - - + + +
- - - -
diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue index e55de1b4e..b1994d66c 100644 --- a/src/views/modules/portrayal/jumin/cpts/graph.vue +++ b/src/views/modules/portrayal/jumin/cpts/graph.vue @@ -45,7 +45,6 @@ export default { }, mounted() { this.$nextTick(() => { - // this.showSeeksGraph(); this.getFamilyRelationshipList() }) }, @@ -62,10 +61,8 @@ export default { let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId; let { code, data, msg } = await requestPost(url) if (code == 0) { - // 找到符合条件的对象的索引 let index = data.findIndex(item => item.name == this.userInfo.name); if (index !== -1) { - // 移除这个对象并将其放到数组的第一个位置 const [item] = data.splice(index, 1); data.unshift(item); } @@ -74,7 +71,8 @@ export default { 'text': item.name, 'innerHTML': `
${item.type == 1?`${item.name}`:item.name.length === 2 ? item.name.substring(0, 1) + '*' : - item.name.substring(0, 1) + '*' + item.name.substring(2)} ${item.age?`（${item.age}）岁`:''}
` + item.name.substring(0, 1) + '*' + item.name.substring(2)} ${item.age?`（${item.age}）岁`:''}`, + 'data':{id: item.id,type:item.type,name:item.name}, })) let lineList = data.map((item, index) => ({ 'from': 'N1', @@ -82,7 +80,8 @@ export default { 'text':item.type ==1?'房屋':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')) + '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 } @@ -94,109 +93,32 @@ export default { this.$message.error(msg) } }, - showSeeksGraph() { - const __graph_json_data = { - 'rootId': 'N13', 'nodes': [ - { 'id': 'N1', 'text': '', 'borderColor': '#6cc0ff', 'data': { 'isGoodMan': false, 'sexType': '男' }, 'innerHTML': '
' }, { 'id': 'N2', 'text': '李*康', 'data': { 'isGoodMan': true, 'sexType': '男' }, 'innerHTML': '
李*康
' }, { 'id': 'N3', 'text': '祁*伟', 'borderColor': '#6cc0ff', 'data': { 'isGoodMan': false, 'sexType': '男' }, 'innerHTML': '
祁*伟
' }, { 'id': 'N4', 'text': '陈*石', 'data': { 'isGoodMan': true, 'sexType': '男' }, 'innerHTML': '
陈*石
' }, { 'id': 'N5', 'text': '陆*可', 'data': { 'isGoodMan': true, 'sexType': '女' }, 'innerHTML': '
陆*可（25岁）
' }, { 'id': 'N6', 'text': '高*良', 'data': { 'isGoodMan': false, 'sexType': '男' }, 'innerHTML': '
高*良
' }, { 'id': 'N7', 'text': '沙*金', 'data': { 'isGoodMan': true, 'sexType': '男' }, 'innerHTML': '
沙*金
' }, { 'id': 'N9', 'text': '沙*金2', 'data': { 'isGoodMan': true, 'sexType': '男' }, 'innerHTML': '
沙*金2
' },], 'lines': [ - { - 'from': 'N1', - 'to': 'N6', - 'text': '', - 'color': '#3b3b3b', - 'fontColor': '#3b3b3b', - 'isHideArrow': true, - 'data': { - 'type': '父亲' - }, - - }, - { - 'from': 'N1', - 'to': 'N7', - 'text': '父亲', - 'color': '#3b3b3b', - 'fontColor': '#3b3b3b', - 'isHideArrow': true, - 'data': { - 'type': '母亲' - } - }, - { - 'from': 'N1', - 'to': 'N8', - 'text': '母亲', - 'color': '#3b3b3b', - 'fontColor': '#3b3b3b', - 'isHideArrow': true, - 'data': { - 'type': '儿子' - } - }, - { - 'from': 'N1', - 'to': 'N2', - 'text': '儿子', - 'color': '#3b3b3b', - 'fontColor': '#3b3b3b', - 'isHideArrow': true, - 'data': { - 'type': '女儿' - } - }, - { - 'from': 'N1', - 'to': 'N3', - 'text': '女儿', - 'color': '#3b3b3b', - 'fontColor': '#3b3b3b', - 'isHideArrow': true, - 'data': { - 'type': '配偶' - } - }, - { - 'from': 'N1', - 'to': 'N4', - 'text': '配偶', - 'color': '#d7e5ff', - 'fontColor': '#3b3b3b', - 'isHideArrow': true, - 'data': { - 'type': '岳父' - } - }, - { - 'from': 'N1', - 'to': 'N5', - 'text': '岳父', - 'color': '#3b3b3b', - 'fontColor': '#3b3b3b', - 'isHideArrow': true, - 'data': { - 'type': '岳母' - } - }, - { - 'from': 'N1', - 'to': 'N9', - 'text': '岳母', - 'isHideArrow': true, - 'color': '#ffe4e4', - 'fontColor': '#3b3b3b', - 'data': { - 'type': '岳母' - } - }, - - ] - }; - this.$refs.seeksRelationGraph.setJsonData(__graph_json_data, (graphInstance) => { - // 这些写上当图谱初始化完成后需要执行的代码 - }); - }, onNodeClick(nodeObject, $event) { - console.log('onNodeClick:', nodeObject); + let {name,id,type} = nodeObject.data + if(type === 0){ + this.$store.dispatch("saveData", { + resiId:id, + name + }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map( + (item) => { + if (item.name === "jumin-huaxiang") { + return { ...item, title: name }; + } + return item; + } + ); + }else if(type === 1){ + this.$store.dispatch('saveDataH', { houseId:id, houseName:name}); + this.$router.push({ name: 'house-huaxiang' }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + if (item.name === "house-huaxiang") { + return { ...item, title: name }; + } + return item; + }); + } }, onLineClick(lineObject, $event) { console.log('onLineClick:', lineObject); @@ -216,9 +138,9 @@ export default { } .c-node-name2 { - margin-left: -5px; + margin-left: 2px; text-align: center; - margin-top: 63px; + margin-top: 83px; line-height: 20px; position: absolute; width: 96px; @@ -267,7 +189,16 @@ export default { } .c-node-name1 { - display: none; + margin-left: 2px; + text-align: center; + margin-top: 83px; + line-height: 20px; + position: absolute; + width: 96px; + height: 20px; + background: #FFFFFF; + box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4); + border-radius: 10px; } .rel-node-checked { diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index e8e04b888..3f39030aa 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -21,10 +21,11 @@ :class="{ item: true, active: index == active }" v-for="(item, index) in menuList" @click="handelCLickMenu(item.id, index)" - v-show="item.filledQty != 0" + v-show="item.filledQty != 0 || item.id == 'ext' || item.id == 'reside'" > {{ item.name }}基础信息 - - +
+
国籍：
-
--
- - +
+
证件类型：
--
- - +
+
证件号：
{{ @@ -98,8 +98,8 @@ @click="handelCLickShowCheckPassword('idCard')" >{{ showFlagIdCardBtn ? "显示" : "隐藏" }} - - +
+
联系电话：
{{ @@ -129,10 +129,9 @@ @click="handelCLickShowCheckPassword('mobile')" >{{ showFlagMobileBtn ? "显示" : "隐藏" }} - - - - +
+ +
性别：
{{ @@ -141,14 +140,14 @@ : "--" }}
- - +
+
出生日期：
{{ resiDetailObj.baseInfoDto.birthday || "--" }}
- - +
+
民族：
{{ @@ -157,8 +156,8 @@ : "--" }}
- - +
+
文化程度：
{{ @@ -168,11 +167,8 @@ : "--" }} - - - - -
+
+
婚姻状况：
-- -
- - -
+
+
配偶情况：
{{ spouseText() }} -- -
- - +
+
+
籍贯：
+ {{ + resiDetailObj.baseInfoDto + ? resiDetailObj.baseInfoDto.nativePlace + ? resiDetailObj.baseInfoDto.nativePlace + : "--" + : "--" + }} +
+
备注：
{{ @@ -203,9 +206,9 @@ : "--" }}
- - -
创建日期：
+
+
+
创建时间：
{{ resiDetailObj.baseInfoDto.createdTime @@ -213,11 +216,8 @@ : "--" }} - - - - -
+
+
更新时间：
{{ @@ -227,34 +227,28 @@ }}
- - +
居住信息
- - -
+
+
所属网格：
{{ item.gridName || "--" }}
- - -
+
所属房屋：
- {{ item.gridName + "-" + item.homeName || "--" }} + {{ item.agencyName?item.agencyName:'' + item.homeName || "--" }}
- - - - -
+
+
+
人房关系：
{{ @@ -267,35 +261,31 @@ : "--" }} -
- - +
人户状况：
{{ householdSituationText(indexK) }}
- - +
户籍所在地：
{{ item.placeOfDomicile || "--" }}
- - +
+
与户主关系：
{{ houseHolderRelText(indexK) }} - - -
+
+
+
拓展信息
- - -
+
+
宗教信仰：
{{ resiDetailObj.religionDto && resiDetailObj.religionDto.religion @@ -303,28 +293,16 @@ : "--" }}
- - -
-
籍贯：
- {{ - resiDetailObj.baseInfoDto - ? resiDetailObj.baseInfoDto.nativePlace - ? resiDetailObj.baseInfoDto.nativePlace - : "--" - : "--" - }} -
- - + +
就业状态：
{{ careerStatusText() }} -- - - +
- - +
- - - - +
-
职业：
{{ resiDetailObj.workInfoDto @@ -379,10 +354,9 @@ : "--" : "--" }} -
- - +
- - +
-
月收入：
{{ resiDetailObj.economyDto @@ -418,9 +391,7 @@ : "--" }}
- - - - +
- - +
+
有无赡养人：
{{ @@ -476,9 +438,8 @@ : "--" }}
- - +
- - - - + ">
再就业优惠证号：
{{ resiDetailObj.unemployedDto @@ -514,8 +470,12 @@ : "--" : "--" }} - - +
+
是否领取失业金：
{{ @@ -529,8 +489,12 @@ }} -- - - +
+
是否就业困难对象：
{{ @@ -544,8 +508,12 @@ }} -- - - +
+
劳动就业愿望：
{{ @@ -556,17 +524,13 @@ : "--" }} - - - - + ">
有无赡养人：
{{ @@ -579,8 +543,8 @@ : "--" }}
- - +
+
关系图谱
{{ sectionItem.title }}
- +
- -
-
{{ item.label }}：
+ +
{{ row.label }}：
{{ - item.value ? item.value : "--" + row.value ? row.value : "--" }} -
- - +
+ +
业务记录
@@ -798,7 +755,7 @@ export default { children: [ { label: "老年人分类", - itemType: "select1", + itemType: "checkbox", multiple: true, formName: "oldPeopleCategories", opctionUrl: "sys/dict/data/dictlist", @@ -1106,6 +1063,64 @@ export default { rules: { password: [{ required: true, message: "请输入密码", trigger: "blur" }], }, + incidence: { + parymemberInfoDto: { + formId: "parymemberInfoDto", + formType: "parymemberInfoDto", + title: "党员信息", + }, + disabilityFlag: { + formId: "healthDto", + formType: "healthDto", + title: "残疾信息", + }, + seriousIllnessFlag: { + formId: "seriousIllnessDto", + formType: "seriousIllnessDto", + title: "大病信息", + }, + chronicDiseaseFlag: { + formId: "chronicDiseaseDto", + formType: "chronicDiseaseDto", + title: "慢病信息", + }, + deathFlag: { formId: "deathDto", formType: "deathDto", title: "死亡" }, + oldPeopleFlag: { + formId: "oldPeopleDto", + formType: "oldPeopleDto", + title: "老年人信息", + }, + subsistenceAllowanceFlag: { + formId: "subsistenceAllowanceDto", + formType: "subsistenceAllowanceDto", + title: "低保人员信息", + }, + veteranFlag: { + formId: "veteranDto", + formType: "veteranDto", + title: "退役军人信息", + }, + ensureHouseFlag: { + formId: "ensureHouseDto", + formType: "ensureHouseDto", + title: "保障性住房信息", + }, + specialSupportFlag: { + formId: "specialSupportDto", + formType: "specialSupportDto", + title: "特扶人员", + }, + unitedFrontFlag: { + formId: "unitedFrontDto", + formType: "unitedFrontDto", + title: "统战人员", + }, + volunteerFlag: { + formId: "volunteerDto", + formType: "volunteerDto", + title: "志愿者", + }, + }, }; }, components: { graph, staffTag, businessRecord, changeRecord }, @@ -1145,6 +1160,7 @@ export default { if (res.data.code === 0) { this.resiDetailObj = res.data.data || {}; const nameMap = { + reside: "居住信息", ext: "拓展信息", united_front: "统战人员信息", party_member: "党员信息", @@ -1169,14 +1185,14 @@ export default { totalQty: value.totalQty, })) .reverse(); - let arr = this.menuList.filter( - (item) => - item.filledQty > 0 && - item.name !== "基本信息" && - item.name !== "拓展信息" - ); + const keysWithValueOne = []; + for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) { + if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1) { + keysWithValueOne.push(this.incidence[key].formId); + } + } this.expandList = this.originalExpandList.filter((itemA) => { - return arr.some((itemB) => itemB.name === itemA.title); + return keysWithValueOne.some((itemB) => itemB === itemA.id); }); await Promise.all( this.expandList.map(async (item) => { @@ -1199,25 +1215,13 @@ export default { }) ); - this.expandList.forEach((item) => { - const rows = []; - const chunkSize = 3; - for (let i = 0; i < item.children.length; i += chunkSize) { - rows.push(item.children.slice(i, i + chunkSize)); - } - item.rows = rows; - }); this.menuList.push( { name: "业务记录", - filledQty: 1, - totalQty: 1, id: "businessRecord", }, { name: "更新纪录", - filledQty: 1, - totalQty: 1, id: "updateRecord", } );