申报日期 :
{{residentBirthRecordObj?residentBirthRecordObj.reportDate ?residentBirthRecordObj.reportDate :'--':'--'}}
+
+
申报日期 :
+
{{residentBirthRecordObj?residentBirthRecordObj.reportDate ?residentBirthRecordObj.reportDate :'--':'--'}}
+
死亡时间 :
+
{{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}}
+
+
加入原因 :
+
{{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}}
+
+
移除时间 :
+
{{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}}
+
+
移除原因 :
+
{{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}}
+
+
迁出日期 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}}
+
+
迁出类型 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.type ?residentMoveOutRecordObj.type :'--':'--'}}
+
+
迁出原因 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.reason ?residentMoveOutRecordObj.reason:'--':'--'}}
+
+
迁出至组织 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}}
+
+
小区 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName ?residentMoveOutRecordObj.villageName :'--':'--'}}
+
+
楼号 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName ?residentMoveOutRecordObj.buildName:'--':'--'}}
+
+
单元 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName ?residentMoveOutRecordObj.unitName :'--':'--'}}
+
+
房屋 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName ?residentMoveOutRecordObj.homeName :'--':'--'}}
+
+
外迁地址 :
+
{{residentMoveOutRecordObj?residentMoveOutRecordObj.address ?residentMoveOutRecordObj.address:'--':'--'}}
+
@@ -623,8 +858,23 @@ export default {
residentPartyMemberInfoObj:{},//党员
residentResideInfoObj:{},//居住
residentFamilyInfoObj:{},//家庭
+ residentDeathRecordObj:{},//死亡
resiEconomyObj:{},
- educationDicton:[]
+ residentMoveOutRecordObj:{},//迁出
+ // 字典分割线
+ educationDictonArr:[],
+ disability_levelArr:[],
+ illnessArr:[],
+ householdArr:[],
+ houseArr:[],
+ unemploymentArr:[],
+ chronicArr:[],
+ resideArr:[],
+ marriageArr:[],
+ specialDtoArr:[],
+ spouseArr:[],
+ relationshipArr:[],
+ categoryDictArr:[]
}
},
computed: {
@@ -648,7 +898,26 @@ export default {
},
educationText(){
let text = '--'
- this.educationDicton.forEach(item=>{
+ this.educationDictonArr.forEach(item=>{
+ if(item.value == this.eduInfoDto.cultureLevel){
+ text = item.label
+ }
+ })
+ return text
+
+ },
+ hobbyCodeArr(){
+ let arr = []
+ if(this.hobbyInfoObj.hobbyCode){
+ arr = this.hobbyInfoObj.hobbyCode.split(',')
+ }else{
+ arr = []
+ }
+ return arr
+ },
+ educationText(){
+ let text = '--'
+ this.educationDictonArr.forEach(item=>{
if(item.value == this.eduInfoDto.cultureLevel){
text = item.label
}
@@ -656,6 +925,162 @@ export default {
return text
},
+ resiClass(){
+ let flag = true
+ var num = 0
+ if(this.resiDetailObj.categoryInfo != 'undefined'){
+ for (let key in this.resiDetailObj.categoryInfo) {
+ if(this.resiDetailObj.categoryInfo[key] == 0){
+ num++
+ if(num >= 21){
+ flag = false
+ }else {
+ flag = true
+ }
+ }
+ }
+ }else{
+ flag = false
+ }
+ return flag
+ },
+ categoryText(){
+ let text = '--'
+ this.categoryDictArr.forEach(item=>{
+ if(item.value == this.resiHealthInfonObj.disabilityCategoryCode){
+ text = item.label
+ }
+ })
+ return text
+
+ },
+ disabilityLevelText(){
+ let text = '--'
+ this.disability_levelArr.forEach(item=>{
+ if(item.value == this.resiHealthInfonObj.disabilityLevel){
+ text = item.label
+ }
+ })
+ return text
+
+ },
+ illnessText(){
+ let text = '--'
+ this.illnessArr.forEach(item=>{
+ if(item.value == this.resiHealthInfonObj.illnessCode){
+ text = item.label
+ }
+ })
+ return text
+ },
+ chronicText(){
+ let text = '--'
+ this.chronicArr.forEach(item=>{
+ if(item.value == this.resiHealthInfonObj.chronicDiseaseCode){
+ text = item.label
+ }
+ })
+ return text
+ },
+ householdText(){
+ let text = '--'
+ this.householdArr.forEach(item=>{
+ if(item.value == this.residentResideInfoObj.householdSituation){
+ text = item.label
+ }
+ })
+ return text
+ },
+ relationshipText(){
+ let text = '--'
+ this.relationshipArr.forEach(item=>{
+ if(item.value == this.residentFamilyInfoObj.houseHolderRel){
+ text = item.label
+ }
+ })
+ return text
+ },
+ elderlyRelationText(){
+ let text = '--'
+ this.relationshipArr.forEach(item=>{
+ if(item.value == this.residentFamilyInfoObj.elderlyRelation){
+ text = item.label
+ }
+ })
+ return text
+ },
+ resideText(){
+ let text = '--'
+ this.resideArr.forEach(item=>{
+ if(item.value == this.residentFamilyInfoObj.resideSituation){
+ text = item.label
+ }
+ })
+ return text
+ },
+ categoryDictText(){
+ let text = '--'
+ this.marriageArr.forEach(item=>{
+ if(item.value == this.residentFamilyInfoObj.marriage){
+ text = item.label
+ }
+ })
+ return text
+ },
+ spouseText(){
+ let text = '--'
+ this.spouseArr.forEach(item=>{
+ if(item.value == this.residentFamilyInfoObj.spouseSituation){
+ text = item.label
+ }
+ })
+ return text
+ },
+ houseText(){
+ let text = '--'
+ this.houseArr.forEach(item=>{
+ if(item.value == this.residentEnsureHouseObj.housingNature){
+ text = item.label
+ }
+ })
+ return text
+ },
+ unemploymentText(){
+ let text = '--'
+ console.log(this.unemploymentArr);
+ this.unemploymentArr.forEach(item=>{
+ if(item.value == this.residentUnemployedObj.unemploymentReason){
+ text = item.label
+ }
+ })
+ return text
+ },
+ volunteerCategoryArr(){
+ let arr = []
+ if(this.residentVolunteerObj.volunteerCategory){
+ arr = this.residentVolunteerObj.volunteerCategory.split(',')
+ }else{
+ arr = []
+ }
+ return arr
+ },
+ specialDtoArrText(){
+ let arr = []
+ let temp = []
+ if(this.residentSpecialObj.specialCategoryCode){
+ arr = this.residentSpecialObj.specialCategoryCode.split(',')
+ for (let i of arr) {
+ for(let tab of this.specialDtoArr){
+ if(i == tab.value){
+ temp.push(tab.label)
+ }
+ }
+ }
+ }else{
+ temp = []
+ }
+ return temp
+ },
},
watch: {
@@ -664,19 +1089,21 @@ export default {
this. getResiDetail()
this.getEduInfoDtoObj()
this.getEducation()
+ this.getdisabilityNationClass()
},
methods: {
getResiDetail(){
this.$http.post(`/actual/base/residentBaseInfo/detail/${this.resiId}`).then(res=>{
this.resiDetailObj = res.data.data
- console.log(resiDetailObj);
}).catch(err =>{
console.log(err);
})
},
+
handleClick(tab){
if(tab.index==0){
+ this.getEducation()
this.getEduInfoDtoObj()
}else if(tab.index == 1){
this.getResidentHobbyInfoObj()
@@ -684,20 +1111,31 @@ export default {
else if(tab.index == 2){
this.getResidentReligionObj()
}else if(tab.index == 3){
+ this.getdisabilityNation()
+ this.getillnessNation()
+ this.getchronicNation()
+
this.getHealthInfoDetailById()
}else if (tab.index == 4){
this.getResidentWorkInfoObj()
}else if (tab.index == 5){
this.getEconomyDetailById()
}else if (tab.index == 6){
+ this.getHouseholdNation()
this.getResideInfoDetailById()
}else if(tab.index == 7){
+ this.getrelationshipArr()
+ this.getSpouse()
+ this.getMarriageNation()
+ this.getResideNation()
this.getFamilyInfoDetailById()
}else if(tab.index == 8){
this.getResidentPartyMemberInfo()
}else if(tab.index == 9){
+ this.getHousing()
this.getResidentEnsureHouse()
}else if(tab.index == 10){
+ this.getUnemployment()
this.getResidentUnemployed()
}else if (tab.index == 11){
this.getVeteranDetailById()
@@ -708,11 +1146,15 @@ export default {
}else if(tab.index == 14){
this.getOldPeopleDetailById()
}else if(tab.index == 15){
+ this.getResidentNation()
this.getresidentSpecial()
}else if(tab.index == 16){
this.getResidentBirthRecord()
+ }else if(tab.index == 17){
+ this.getResidentDeathRecord()
+ }else if (tab.index == 18){
+ this.getResidentMoveOutRecord()
}
-
},
async getEduInfoDtoObj(){
try {
@@ -726,6 +1168,7 @@ export default {
console.log(error);
}
},
+
//获取兴趣爱好
async getResidentHobbyInfoObj(){
try {
@@ -790,6 +1233,32 @@ export default {
} catch (error) {
console.log(error);
}
+ },
+ //获取死亡人员详情
+ async getResidentDeathRecord(){
+ try {
+ const {data} = await this.$http.post(`/actual/base/residentDeathRecord/detail/${this.resiId}`)
+ if(data.data == null){
+ this.residentDeathRecordObj = {}
+ }else{
+ this.residentDeathRecordObj = data.data
+ }
+ } catch (error) {
+ console.log(error);
+ }
+ },
+ //获取迁出详情
+ async getResidentMoveOutRecord(){
+ try {
+ const {data} = await this.$http.post(`/actual/base/residentMoveOutRecord/detail/${this.resiId}`)
+ if(data.data == null){
+ this.residentMoveOutRecordObj = {}
+ }else{
+ this.residentMoveOutRecordObj = data.data
+ }
+ } catch (error) {
+ console.log(error);
+ }
},
//获取工作信息
async getResidentWorkInfoObj(){
@@ -808,11 +1277,8 @@ export default {
async getResidentPartyMemberInfo(){
try {
const {data} = await this.$http.get(`/actual/base/residentPartyMemberInfo/detail/${this.resiId}`)
- if(data.data == null){
- this.residentPartyMemberInfoObj = {}
- }else{
+
this.residentPartyMemberInfoObj = data.data
- }
} catch (error) {
console.log(error);
}
@@ -869,6 +1335,68 @@ export default {
console.log(error);
}
},
+ async getHousing(){
+ try {
+ let { data } = await this.$http.post('sys/dict/data/house',{formCode: "resi_base_info"})
+ this.houseArr = data.data
+ } catch (error) {
+ console.log(error,'获取住房性质字典');
+ }
+
+ },
+ //获取残疾类别字典
+ async getdisabilityNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'})
+
+ this.categoryDictArr = data.data
+
+ } catch (error) {
+ console.log(error,'获取残疾类别字典');
+ }},
+ async getResidentNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'})
+ this.specialDtoArr=data.data
+ } catch (error) {
+ console.log(error,'获取特殊人群字典');
+ }
+ },
+ async getMarriageNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'marriage'})
+ this.marriageArr = data.data
+ } catch (error) {
+ console.log(error,'获取婚姻状况字典');
+ }
+ },
+ // 获取残疾等级字典
+ async getdisabilityNationClass(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'})
+ this.disability_levelArr = data.data
+
+ } catch (error) {
+ console.log(error,'获取残疾等级字典');
+ }
+ },
+ async getSpouse(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'spouse_situation'})
+ this.spouseArr = data.data
+ } catch (error) {
+ console.log(error,'获取配偶情况字典');
+ }
+ },
+ async getrelationshipArr(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"})
+ this.relationshipArr = data.data
+ } catch (error) {
+ console.log(error,'获取户主关系字典');
+ }
+
+ },
//获取老年人信息详情
async getOldPeopleDetailById(){
try {
@@ -882,6 +1410,14 @@ export default {
console.log(error);
}
},
+ async getillnessNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'illness_code'})
+ this.illnessArr = data.data
+ } catch (error) {
+ console.log(error,'获取所患大病字典');
+ }
+ },
//居住
async getResideInfoDetailById(){
try {
@@ -938,12 +1474,44 @@ export default {
try {
let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})
- this.educationDicton = data.data
+ this.educationDictonArr = data.data
} catch (error) {
console.log(error,'获取学历字典');
}
},
+ async getchronicNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
+ this.chronicArr = data.data
+ } catch (error) {
+ console.log(error,'获取所患慢病字典');
+ }
+ },
+ async getHouseholdNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
+ this.householdArr = data.data
+ } catch (error) {
+ console.log(error,'获取人户状况字典');
+ }
+ },
+ async getResideNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'reside_situation'})
+ this.resideArr = data.data
+ } catch (error) {
+ console.log(error,'获取居住情况字典');
+ }
+ },
+ async getUnemployment(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'unemployment_reason'})
+ this.unemploymentArr = data.data
+ } catch (error) {
+ console.log(error,'获取失业原因字典');
+ }
+ },
async handleTuomin (type) {
const url = "/data/aggregator/epmetuser/detailByType";
@@ -1003,7 +1571,8 @@ export default {
}
.f-labels{
width: 100px;
- text-align: center;
+ text-align: right;
+ margin-right: 10px;
}
\ No newline at end of file
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index cae2f99f8..6117e18c7 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -174,20 +174,18 @@
{{ scope.row.gender == 1 ? "男" : "女" }}
- {{ scope.row.birthday.substr(0, 10) }}
+ {{scope.row.birthday?scope.row.birthday.substr(0, 10):'' }}
- {{
- `${scope.row.idNum.substr(0, 11)}` +
+ {{ scope.row.idNum?`${scope.row.idNum.substr(0, 11)}` +
"******" +
- `${scope.row.idNum.substr(16, 2)}`
- }}
+ `${scope.row.idNum.substr(16, 2)}`:''}}
{{
- `${scope.row.mobile.substr(0, 3)}` +
+ scope.row.mobile?`${scope.row.mobile.substr(0, 3)}` +
"******" +
- `${scope.row.mobile.substr(7, 4)}`
+ `${scope.row.mobile.substr(7, 4)}`:''
}}
@@ -566,7 +564,7 @@ export default {
{ columnName: "gridName", label: "所属网格" },
{ columnName: "homeName", label: "所属房屋" },
{ columnName: "idNum", label: "证件号", width: 200 },
- { columnName: "categoryInfo", label: "居民类别", width: 200 },
+ { columnName: "categoryInfo", label: "居民分类", width: 200 },
{ columnName: "mobile", label: "联系电话", width: 150 },
],
tabsList: [],
@@ -692,7 +690,6 @@ export default {
},
handleSearchFrom() {
let obj = this.$refs.myResiSearch.form
- console.log(obj,'1');
if (typeof obj.categoryKey == 'object'&&obj.categoryKey .length != 0) {
obj.categoryKey = obj.categoryKey.join(',')
} else {
@@ -832,12 +829,23 @@ export default {
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
- this.getTableData();
+ this.getTableData()
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
+ let obj = this.$refs.myResiSearch.form
+ if (typeof obj.categoryKey == 'object'&&obj.categoryKey .length != 0) {
+ obj.categoryKey = obj.categoryKey.join(',')
+ } else {
+ obj.categoryKey = "";
+ }
+ if (typeof obj.agencyId == 'object'&&obj.agencyId .length != 0) {
+ obj.agencyId = obj.agencyId.join(',')
+ } else {
+ obj.agencyId = "";
+ }
this.currentPage = val;
- this.getTableData();
+ this.getTableData(obj);
},
handleFilterSpan(row, item) {
let _val = "";