diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index a2ef7801d..1f4962d6c 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -420,6 +420,20 @@ img {
height: 24px;
vertical-align: middle;
overflow: hidden;
+ @keyframes flicker {
+ /* 旋转沿x轴旋转-10度,再绕y轴旋转 */
+ 0% {
+ opacity: 0.1;
+ }
+
+ 100% {
+ opacity: 1;
+ }
+ }
+
+ &.z-on {
+ animation: flicker 0.9s linear infinite;
+ }
img {
position: relative;
display: block;
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index da6eeaa7f..d493fc4c5 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -299,6 +299,7 @@ export default {
this.dataForm.oldDept = "";
this.dataForm.oldAddress = data.houseName;
this.dataForm.ownerName = data.ownerName;
+ this.dataForm.oldHouseMergeId = data.id;
} else {
this.$message.error(msg);
}
@@ -511,12 +512,16 @@ export default {
async saveForm() {
// saveOutOfInfo
- const url = "/epmetuser/changeRelocation/moveOutHome";
+ const url = "/actual/base/residentMoveOutRecord/saveOutOfInfo";
let noData = new Date();
noData = util.dateFormatter(noData, "time");
this.dataForm.transferTime = noData;
- const { data, code, msg } = await requestPost(url, this.dataForm);
+ const { data, code, msg } = await requestPost(url, {
+ ...this.dataForm,
+ deptId: this.dataForm.gridId,
+ deptName: this.dataForm.gridName,
+ });
if (code === 0) {
this.$message.success("操作成功");
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 3fcc1186a..f031fb5f4 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -23,79 +23,83 @@
+ label-width="100px">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- {{ ns.label }}
-
+ :key="ns.value"
+ size="small"
+ v-model.trim="form[item.formName]"
+ :label="ns.value">
+ {{ ns.label }}
@@ -166,24 +170,25 @@
:key="item.groupId"
:label="item.label"
:name="'group' + item.groupId">
-
+
-
+
-
- {{ ns.label }}
-
+
+ {{ ns.label }}
+
-
-
-
+
-
-
+ v-model="form[itemj.id][itemk.formName]">
+
@@ -287,680 +292,708 @@ export default {
validateFlag:null,
disabilityCategoryCode:[],
// 基本信息input
- basicInformation:[{
- label:"本地户籍",
- itemType:"radio",
- formName:"localResidenceFlag",
- opction:[
- {label:'是',value:'1'},
- {label:'否',value:'0'}
- ],
- },
- {
- label:"居民姓名",
- itemType:"input",
- requiredFlag:true,
- formName:"name",
- rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
- opction:[
-
- ],
- },
- {
- label:"联系电话",
- itemType:"input",
- formName:"mobile",
- opction:[
-
- ],
- },
- {
- label:"证件号",
- itemType:"input",
- formName:"idNum",
- rules:[{required:true,message:'证件号不能为空'},
- { validator: (rule, value, callback) => {
- if(!/^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/.test(value)){
- // console.log(/^[a-zA-Z]\w{5,17}$/.test(value));
- return callback(new Error('证件格式不符合'));
- }
- callback()
- },trigger:'change' | blur }
- ],
- opction:[
-
- ],
- },{
- label:"性别",
- itemType:"radio",
- formName:"gender",
- opction:[
- {label:'男',value:'1'},
- {label:'女',value:'2'}
- ],
- },
- {
- label:"民族",
- itemType:"select",
- formName:"nation",
- opction:[],
- },{
- label:'生日',
- itemType:"datepicker",
- formName:'birthday'
- },{
- label:'备注',
- itemType:"textarea",
- formName:'remark'
- },{
- label:'居民分类',
- itemType:"checkbox",
- opction:[{label:'党员',value:'0', formName:"partyFlag",},{label:'低保人员',value:'0', formName:"subsistenceAllowanceFlag ",},{label:'保障房人员',value:'0', formName:"ensureHouseFlag",},{label:'失业人员',value:'0', formName:"unemployedFlag",},{label:'育龄妇女',value:'0', formName:"fertileWomanFlag",},{label:'退役军人',value:'0', formName:"veteranFlag",},{label:'统战人员',value:'0', formName:"unitedFrontFlag",},{label:'信访人员',value:'0', formName:"petitionOfficerFlag",},{label:'志愿者',value:'0', formName:"volunteerFlag",},{label:'失独人员',value:'0', formName:"bereavedPersonFlag",},{label:'租户',value:'0', formName:"tenantFlag",},{label:'流动人口',value:'0', formName:"floatingFlag",},{label:'特殊人群',value:'0', formName:"specialCrowdFlag",},{label:'老年人',value:'0', formName:"oldPeopleFlag",},{label:'空巢老人',value:'0', formName:"emptyNesterFlag",},{label:'独居老人',value:'0', formName:"liveAloneFlag",},{label:'失能老人',value:'0', formName:"disabledFlag",},{label:'失智老人',value:'0', formName:"dementedFlag",},{label:'残疾',value:'0', formName:"disabilityFlag",},{label:'大病',value:'0', formName:"seriousIllnessFlag",},{label:'慢病',value:'0', formName:"chronicDiseaseFlag",}]
- }
- ],
- // 底部input
- footerInputList:[
- {id:'eduInfoDto',
- children:[{
- label:"文化程度",
- itemType:"select1",
- formName:"cultureLevel",
- opction:[
-
- ]},
+ basicInformation: [
{
- label:"备注",
- itemType:"textarea1",
- formName:"eduRemark",
- opction:[
- ]}
- ]
- },
- {
- id:'hobbyInfoDto',
- children:[{
- label:"兴趣特长",
- itemType:"checkbox",
- formName:"hobbyCode",
+ label:"本地户籍",
+ itemType:"radio",
+ formName:"localResidenceFlag",
opction:[
- {label:'治安巡逻',formName:'hobbyCode1'},
- {label:'人民调解',formName:'hobbyCode2'},
- {label:'民情采集',formName:'hobbyCode3'},
- {label:'问题辅导',formName:'hobbyCode4'},
- {label:'结对帮扶',formName:'hobbyCode5'},
- {label:'应急处理',formName:'hobbyCode6'},
- {label:'义务理发',formName:'hobbyCode7'},
- {label:'家电维修',formName:'hobbyCode8'},
- {label:'其他',formName:'9'},
- ]},
- {
- label:'兴趣',
- itemType:"input1",
- formName:"interestDesc",
+ {label:'是',value:'1'},
+ {label:'否',value:'0'}
+ ],
},
{
- label:'备注',
- itemType:"textarea1",
- formName:"hobbyRemark",
- }
- ]
- },
- {id:'religionDto',
- children:[{
- label:"宗教",
- itemType:"input1",
- formName:"religion",
- opction:[
-
- ]},
- {
- label:"备注",
- itemType:"textarea1",
- formName:"religionRemark",
- opction:[
- ]}
- ]
- },
- {id:'healthDto',
- children:[{
- label:"残疾类别",
- itemType:"select1",
- formName:"disabilityCategoryCode",
- opction:this.disabilityCategoryCode
- },
- {
- label:"残疾等级",
- itemType:"select1",
- formName:"disabilityLevel",
- opction:[
- {label:'一级',value:'0'},
- {label:'二级',value:'1'}
- ]},
- {
- label:"残疾证号",
- itemType:"input1",
- formName:"disabilityNum",
- opction:[
- ]},
- {
- label:"残疾说明",
- itemType:"input1",
- formName:"disabilityDesc",
- opction:[
- ]},
- {
- label:"监护人",
- itemType:"radio1",
- formName:"guardianFlag",
- opction:[
- {label:'有',formName:'',value:1},
- {label:'无',formName:'',value:0}
- ]},
- {
- label:"技能特长",
- itemType:"radio1",
- formName:"specialSkillFlag",
- opction:[
- {label:'有',formName:'',value:1},
- {label:'无',formName:'',value:0}
- ]},
- {
- label:"劳动能力",
- itemType:"radio1",
- formName:"workCapacityFlag",
- opction:[
- {label:'有',formName:'',value:1},
- {label:'无',formName:'',value:0}
- ]},
- {
- label:"非义务教育阶段助学",
- itemType:"radio1",
- formName:"voluntaryEducationFlag",
- opction:[
- {label:'有',formName:'',value:1},
- {label:'无',formName:'',value:0}
- ]},
- {
- label:"所患大病",
- itemType:"select1",
- formName:"illnessCode",
- opction:[
-
- ]},
- {
- label:"大病患病时间",
- itemType:"datepicker1",
- formName:"illnessTime",
- opction:[
-
- ]},
- {
- label:"所患慢性病",
- itemType:"select1",
- formName:"chronicDiseaseCode",
- opction:[
-
- ]},
- {
- label:"慢病患病时间",
- itemType:"datepicker1",
- formName:"chronicDiseaseTime",
- opction:[
-
- ]},
- {
- label:"是否参保",
- itemType:"radio1",
- formName:"insuredFlag",
- opction:[
- {label:'是',formName:'',value:1},
- {label:'否',formName:'',value:0}
- ]},
- {
- label:"自付金额",
- itemType:"input1",
- formName:"selfPayAmount",
- opction:[
- ]},
- {
- label:"救助金额",
- itemType:"input1",
- formName:"deliveranceAmount",
- opction:[
- ]},
- {
- label:"救助时间",
- itemType:"datepicker1",
- formName:"deliveranceTime",
- opction:[
-
- ]},
- {
- label:"享受救助明细序号",
- itemType:"input1",
- formName:"deliveranceNum",
- opction:[
- ]},
- {
- label:"备注",
- itemType:"textarea1",
- formName:"healthRemark",
- opction:[
- ]}
- ]
- },
- {id:'workInfoDto',
- children:[{
- label:"工作单位",
- itemType:"input1",
- formName:"workUnit",
- opction:[
-
- ]},
- {
- label:"职业",
- itemType:"input1",
- formName:"occupation",
- opction:[
- ]},
- {
- label:"离退休时间",
- itemType:"datepicker1",
- formName:"retireTime",
- opction:[
- ]},
- {
- label:"备注",
- itemType:"textarea1",
- formName:"workRemark",
- opction:[
- ]}
- ]
- },{
- id:"economyDto",
- children:[
- {
- label:"退休金额",
- itemType:"input1",
- formName:"retirementAmount",
- opction:[
- ]},
- {
- label:"月收入",
- itemType:"input1",
- formName:"monthIncome",
- opction:[
- ]},
- ]
- },{
- id:"resideInfoDto",
- children:[
- {
- label:"籍贯",
- itemType:"input1",
- formName:"nativePlace",
- opction:[
- ]},
- {
- label:"户籍所在地",
- itemType:"input1",
- formName:"placeOfDomicile",
- opction:[
- ]},
- {
- label:"现居住地址",
- itemType:"input1",
- formName:"currentResidence",
- opction:[
- ]},
+ label:"居民姓名",
+ itemType:"input",
+ requiredFlag:true,
+ formName:"name",
+ rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
+ opction:[],
+ },
{
- label:"人户状况",
- itemType:"select1",
- formName:"householdSituation",
- opction:[
- ]},
+ label:"联系电话",
+ itemType:"input",
+ formName:"mobile",
+ opction:[],
+ },
{
- label:"备注",
- itemType:"textarea1",
- formName:"resiRemark",
- opction:[
- ]}
- ]
- },{
- id:"familyInfoDto",
- children:[
+ label:"证件号",
+ itemType:"input",
+ formName:"idNum",
+ rules:[{required:true,message:'证件号不能为空'},
+ { validator: (rule, value, callback) => {
+ if(!/^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/.test(value)){
+ // console.log(/^[a-zA-Z]\w{5,17}$/.test(value));
+ return callback(new Error('证件格式不符合'));
+ }
+ callback()
+ },trigger:'change' | blur }
+ ],
+ opction:[],
+ },
{
- label:"与户主关系",
- itemType:"select1",
- formName:"houseHolderRel",
- opction:[
- ]},
+ label:"性别",
+ itemType:"radio",
+ formName:"gender",
+ opction:[
+ {label:'男',value:'1'},
+ {label:'女',value:'2'}
+ ],
+ },
{
- label:"居住情况",
- itemType:"select1",
- formName:"resideSituation",
- opction:[
- ]},
+ label:"民族",
+ itemType:"select",
+ formName:"nation",
+ opction:[],
+ },
{
- label:"婚姻状况",
- itemType:"select1",
- formName:"marriage",
- opction:[
- ]},
+ label:'生日',
+ itemType:"datepicker",
+ formName:'birthday'
+ },
{
- label:"配偶情况",
- itemType:"select1",
- formName:"spouseSituation",
- opction:[
- ]},
+ label:'备注',
+ itemType:"textarea",
+ formName:'remark'
+ },
{
- label:"该居民有无赡养人",
- itemType:"radio1",
- formName:"elderlyFlag",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0}
- ]},
- {
- label:"该居民与赡养人关系",
- itemType:"select1",
- formName:"elderlyRelation",
- opction:[
- ]},
+ label:'居民分类',
+ itemType:"checkbox",
+ opction:[
+ {label:'党员',value:'0', formName:"partyFlag"},
+ {label:'低保人员',value:'0', formName:"subsistenceAllowanceFlag "},
+ {label:'保障房人员',value:'0', formName:"ensureHouseFlag"},
+ {label:'失业人员',value:'0', formName:"unemployedFlag"},
+ {label:'育龄妇女',value:'0', formName:"fertileWomanFlag"},
+ {label:'退役军人',value:'0', formName:"veteranFlag"},
+ {label:'统战人员',value:'0', formName:"unitedFrontFlag"},
+ {label:'信访人员',value:'0', formName:"petitionOfficerFlag"},
+ {label:'志愿者',value:'0', formName:"volunteerFlag"},
+ {label:'失独人员',value:'0', formName:"bereavedPersonFlag"},
+ {label:'租户',value:'0', formName:"tenantFlag"},
+ {label:'流动人口',value:'0', formName:"floatingFlag"},
+ {label:'特殊人群',value:'0', formName:"specialCrowdFlag"},
+ {label:'老年人',value:'0', formName:"oldPeopleFlag"},
+ {label:'空巢老人',value:'0', formName:"emptyNesterFlag"},
+ {label:'独居老人',value:'0', formName:"liveAloneFlag"},
+ {label:'失能老人',value:'0', formName:"disabledFlag"},
+ {label:'失智老人',value:'0', formName:"dementedFlag"},
+ {label:'残疾',value:'0', formName:"disabilityFlag"},
+ {label:'大病',value:'0', formName:"seriousIllnessFlag"},
+ {label:'慢病',value:'0', formName:"chronicDiseaseFlag"}
+ ]
+ }
+ ],
+ // 底部input
+ footerInputList:[
{
- label:"赡养人联系电话",
- itemType:"input1",
- formName:"dependantMobile",
- opction:[
- ]}, {
- label:"备注",
- itemType:"textarea1",
- formName:"familyInfoRemark",
- opction:[
- ]}
- ]
- },{
- id:"parymemberInfoDto",
- children:[
+ id:'eduInfoDto',
+ children:[
+ {
+ label:"文化程度",
+ itemType:"select1",
+ formName:"cultureLevel",
+ opction:[]
+ },
+ {
+ label:"备注",
+ itemType:"textarea1",
+ formName:"eduRemark",
+ opction:[]
+ }
+ ]
+ },
{
- label:"入党时间",
- itemType:"datepicker1",
- formName:"joinTime",
- opction:[
- ]},
+ id:'hobbyInfoDto',
+ children:[{
+ label:"兴趣特长",
+ itemType:"checkbox",
+ formName:"hobbyCode",
+ opction:[
+ {label:'治安巡逻',formName:'hobbyCode1'},
+ {label:'人民调解',formName:'hobbyCode2'},
+ {label:'民情采集',formName:'hobbyCode3'},
+ {label:'问题辅导',formName:'hobbyCode4'},
+ {label:'结对帮扶',formName:'hobbyCode5'},
+ {label:'应急处理',formName:'hobbyCode6'},
+ {label:'义务理发',formName:'hobbyCode7'},
+ {label:'家电维修',formName:'hobbyCode8'},
+ {label:'其他',formName:'9'},
+ ]},
+ {
+ label:'兴趣',
+ itemType:"input1",
+ formName:"interestDesc",
+ },
+ {
+ label:'备注',
+ itemType:"textarea1",
+ formName:"hobbyRemark",
+ }]
+ },
{
- label:"转正时间",
- itemType:"datepicker1",
- formName:"positiveTime",
- opction:[
- ]},
+ id:'religionDto',
+ children:[
+ {
+ label:"宗教",
+ itemType:"input1",
+ formName:"religion",
+ opction:[]
+ },
+ {
+ label:"备注",
+ itemType:"textarea1",
+ formName:"religionRemark",
+ opction:[]
+ }
+ ]
+ },
{
- label:"所属支部",
- itemType:"cascader1",
- formName:"branchId",
- opction:[
- ]},
+ id:'healthDto',
+ children:[
+ {
+ label:"残疾类别",
+ itemType:"select1",
+ formName:"disabilityCategoryCode",
+ opction:this.disabilityCategoryCode
+ },
+ {
+ label:"残疾等级",
+ itemType:"select1",
+ formName:"disabilityLevel",
+ opction:[
+ {label:'一级',value:'0'},
+ {label:'二级',value:'1'}
+ ]
+ },
+ {
+ label:"残疾证号",
+ itemType:"input1",
+ formName:"disabilityNum",
+ opction:[]
+ },
+ {
+ label:"残疾说明",
+ itemType:"input1",
+ formName:"disabilityDesc",
+ opction:[]
+ },
+ {
+ label:"监护人",
+ itemType:"radio1",
+ formName:"guardianFlag",
+ opction:[
+ {label:'有',formName:'',value:1},
+ {label:'无',formName:'',value:0}
+ ]
+ },
+ {
+ label:"技能特长",
+ itemType:"radio1",
+ formName:"specialSkillFlag",
+ opction:[
+ {label:'有',formName:'',value:1},
+ {label:'无',formName:'',value:0}
+ ]
+ },
+ {
+ label:"劳动能力",
+ itemType:"radio1",
+ formName:"workCapacityFlag",
+ opction:[
+ {label:'有',formName:'',value:1},
+ {label:'无',formName:'',value:0}
+ ]
+ },
+ {
+ label:"非义务教育阶段助学",
+ itemType:"radio1",
+ formName:"voluntaryEducationFlag",
+ opction:[
+ {label:'有',formName:'',value:1},
+ {label:'无',formName:'',value:0}
+ ]
+ },
+ {
+ label:"所患大病",
+ itemType:"select1",
+ formName:"illnessCode",
+ opction:[]
+ },
+ {
+ label:"大病患病时间",
+ itemType:"datepicker1",
+ formName:"illnessTime",
+ opction:[]
+ },
+ {
+ label:"所患慢性病",
+ itemType:"select1",
+ formName:"chronicDiseaseCode",
+ opction:[]
+ },
+ {
+ label:"慢病患病时间",
+ itemType:"datepicker1",
+ formName:"chronicDiseaseTime",
+ opction:[]
+ },
+ {
+ label:"是否参保",
+ itemType:"radio1",
+ formName:"insuredFlag",
+ opction:[
+ {label:'是',formName:'',value:1},
+ {label:'否',formName:'',value:0}
+ ]
+ },
+ {
+ label:"自付金额",
+ itemType:"input1",
+ formName:"selfPayAmount",
+ opction:[]
+ },
+ {
+ label:"救助金额",
+ itemType:"input1",
+ formName:"deliveranceAmount",
+ opction:[]
+ },
+ {
+ label:"救助时间",
+ itemType:"datepicker1",
+ formName:"deliveranceTime",
+ opction:[]
+ },
+ {
+ label:"享受救助明细序号",
+ itemType:"input1",
+ formName:"deliveranceNum",
+ opction:[]
+ },
+ {
+ label:"备注",
+ itemType:"textarea1",
+ formName:"healthRemark",
+ opction:[]
+ }
+ ]
+ },
{
- label:"流动党员",
- itemType:"radio1",
- formName:"flowFlag",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0},
- ]},
+ id:'workInfoDto',
+ children:[
+ {
+ label:"工作单位",
+ itemType:"input1",
+ formName:"workUnit",
+ opction:[]
+ },
+ {
+ label:"职业",
+ itemType:"input1",
+ formName:"occupation",
+ opction:[]
+ },
+ {
+ label:"离退休时间",
+ itemType:"datepicker1",
+ formName:"retireTime",
+ opction:[]
+ },
+ {
+ label:"备注",
+ itemType:"textarea1",
+ formName:"workRemark",
+ opction:[]
+ }
+ ]
+ },{
+ id:"economyDto",
+ children:[
+ {
+ label:"退休金额",
+ itemType:"input1",
+ formName:"retirementAmount",
+ opction:[]
+ },
+ {
+ label:"月收入",
+ itemType:"input1",
+ formName:"monthIncome",
+ opction:[]
+ },
+ ]
+ },
{
- label:"流动党员活动证号",
- itemType:"input1",
- formName:"flowActNum",
- opction:[
-
- ]},
- {
- label:"职务",
- itemType:"select1",
- formName:"partyJob",
- opction:[
- ]},
+ id:"resideInfoDto",
+ children:[
+ {
+ label:"籍贯",
+ itemType:"input1",
+ formName:"nativePlace",
+ opction:[]
+ },
+ {
+ label:"户籍所在地",
+ itemType:"input1",
+ formName:"placeOfDomicile",
+ opction:[]
+ },
+ {
+ label:"现居住地址",
+ itemType:"input1",
+ formName:"currentResidence",
+ opction:[]
+ },
+ {
+ label:"人户状况",
+ itemType:"select1",
+ formName:"householdSituation",
+ opction:[]
+ },
+ {
+ label:"备注",
+ itemType:"textarea1",
+ formName:"resiRemark",
+ opction:[]
+ }
+ ]
+ },
{
- label:"是否退休",
- itemType:"radio1",
- formName:"retiredFlag",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0},
- ]}, {
- label:"党员中心户",
- itemType:"radio1",
- formName:"centerFlag",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0},
- ]},{
- label:"入党时所在党支部 ",
- itemType:"input1",
- formName:"joinBranchName",
- opction:[
+ id:"familyInfoDto",
+ children:[
+ {
+ label:"与户主关系",
+ itemType:"select1",
+ formName:"houseHolderRel",
+ opction:[]
+ },
+ {
+ label:"居住情况",
+ itemType:"select1",
+ formName:"resideSituation",
+ opction:[]
+ },
+ {
+ label:"婚姻状况",
+ itemType:"select1",
+ formName:"marriage",
+ opction:[]
+ },
+ {
+ label:"配偶情况",
+ itemType:"select1",
+ formName:"spouseSituation",
+ opction:[]
+ },
+ {
+ label:"该居民有无赡养人",
+ itemType:"radio1",
+ formName:"elderlyFlag",
+ opction:[
+ {label:'是',value:1},
+ {label:'否',value:0}
+ ]
+ },
+ {
+ label:"该居民与赡养人关系",
+ itemType:"select1",
+ formName:"elderlyRelation",
+ opction:[]
+ },
+ {
+ label:"赡养人联系电话",
+ itemType:"input1",
+ formName:"dependantMobile",
+ opction:[
+ ]}, {
+ label:"备注",
+ itemType:"textarea1",
+ formName:"familyInfoRemark",
+ opction:[
+ ]}
+ ]
+ },{
+ id:"parymemberInfoDto",
+ children:[
+ {
+ label:"入党时间",
+ itemType:"datepicker1",
+ formName:"joinTime",
+ opction:[
+ ]},
+ {
+ label:"转正时间",
+ itemType:"datepicker1",
+ formName:"positiveTime",
+ opction:[
+ ]},
+ {
+ label:"所属支部",
+ itemType:"cascader1",
+ formName:"branchId",
+ opction:[
+ ]},
+ {
+ label:"流动党员",
+ itemType:"radio1",
+ formName:"flowFlag",
+ opction:[
+ {label:'是',value:1},
+ {label:'否',value:0},
+ ]},
+ {
+ label:"流动党员活动证号",
+ itemType:"input1",
+ formName:"flowActNum",
+ opction:[
- ]},{
- label:"组织关系转入社区时间",
- itemType:"datepicker1",
- formName:"joinCommunityTime",
- opction:[
- ]},{
- label:"是否请长假",
- itemType:"radio1",
- formName:"longHolidayFlag",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0},
- ]}
- ]
- },{
- id:'ensureHouseDto',
- children:[
+ ]},
+ {
+ label:"职务",
+ itemType:"select1",
+ formName:"partyJob",
+ opction:[
+ ]},
+ {
+ label:"是否退休",
+ itemType:"radio1",
+ formName:"retiredFlag",
+ opction:[
+ {label:'是',value:1},
+ {label:'否',value:0},
+ ]}, {
+ label:"党员中心户",
+ itemType:"radio1",
+ formName:"centerFlag",
+ opction:[
+ {label:'是',value:1},
+ {label:'否',value:0},
+ ]},{
+ label:"入党时所在党支部 ",
+ itemType:"input1",
+ formName:"joinBranchName",
+ opction:[
- {
- label:"住房性质",
- itemType:"select1",
- formName:"housingNature",
- opction:[
- ]},
- {
- label:"保障类型",
- itemType:"input1",
- formName:"securityType",
- opction:[
- ]},{
- label:"发证日期",
- itemType:"datepicker1",
- formName:"certificateDate",
- opction:[
- ]},
- {
- label:"补贴编号",
- itemType:"input1",
- formName:"subsidyNum",
- opction:[
+ ]},{
+ label:"组织关系转入社区时间",
+ itemType:"datepicker1",
+ formName:"joinCommunityTime",
+ opction:[
+ ]},{
+ label:"是否请长假",
+ itemType:"radio1",
+ formName:"longHolidayFlag",
+ opction:[
+ {label:'是',value:1},
+ {label:'否',value:0},
+ ]}
+ ]
+ },{
+ id:'ensureHouseDto',
+ children:[
+
+ {
+ label:"住房性质",
+ itemType:"select1",
+ formName:"housingNature",
+ opction:[
+ ]},
+ {
+ label:"保障类型",
+ itemType:"input1",
+ formName:"securityType",
+ opction:[
+ ]},{
+ label:"发证日期",
+ itemType:"datepicker1",
+ formName:"certificateDate",
+ opction:[
+ ]},
+ {
+ label:"补贴编号",
+ itemType:"input1",
+ formName:"subsidyNum",
+ opction:[
- ]},
- {
- label:"补贴金额 ",
- itemType:"input1",
- formName:"subsidyAmount",
- opction:[
- ]}
- ]
- },{
- id:'unemployedDto',
- children:[
- {
- label:"原工作单位",
- itemType:"input1",
- formName:"originWorkUnit",
- },
- {
- label:"失业时间",
- itemType:"datepicker1",
- formName:"unemploymentTime",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0},
- ]},{
- label:"失业证号",
- itemType:"input1",
- formName:"unemploymentNum",
- opction:[
- ]},
- {
- label:"再就业优惠证号",
- itemType:"input1",
- formName:"employmentNum",
- opction:[
+ ]},
+ {
+ label:"补贴金额 ",
+ itemType:"input1",
+ formName:"subsidyAmount",
+ opction:[
+ ]}
+ ]
+ },{
+ id:'unemployedDto',
+ children:[
+ {
+ label:"原工作单位",
+ itemType:"input1",
+ formName:"originWorkUnit",
+ },
+ {
+ label:"失业时间",
+ itemType:"datepicker1",
+ formName:"unemploymentTime",
+ opction:[
+ {label:'是',value:1},
+ {label:'否',value:0},
+ ]},{
+ label:"失业证号",
+ itemType:"input1",
+ formName:"unemploymentNum",
+ opction:[
+ ]},
+ {
+ label:"再就业优惠证号",
+ itemType:"input1",
+ formName:"employmentNum",
+ opction:[
- ]},
- {
- label:"技术特长",
- itemType:"input1",
- formName:"specialSkill",
- opction:[
- ]},{
- label:"失业原因",
- itemType:"input1",
- formName:"unemploymentReason",
- opction:[
- ]} ,{
- label:"是否就业困难对象",
- itemType:"radio1",
- formName:"employmentHardFlag",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0}
- ]}, {
- label:"劳动能力就业愿望",
- itemType:"input1",
- formName:"employmentWish",
- opction:[
- ]}
- ]
- },{
- id:'veteranDto',
- children:[
- {
- label:"入伍时间",
- itemType:"datepicker1",
- formName:"joinArmyTime",
- opction:[
- ]},
- {
- label:"退伍时间",
- itemType:"datepicker1",
- formName:"leaveArmyTime",
- opction:[
- ]},
- {
- label:"服役单位",
- itemType:"input1",
- formName:"serviceUnit",
- opction:[
- ]},
- {
- label:"接收单位",
- itemType:"input1",
- formName:"receiveUnit ",
- opction:[
- ]},
- {
- label:"待安置补助金",
- itemType:"input1",
- formName:"settlementAmount",
- opction:[
+ ]},
+ {
+ label:"技术特长",
+ itemType:"input1",
+ formName:"specialSkill",
+ opction:[
+ ]},{
+ label:"失业原因",
+ itemType:"input1",
+ formName:"unemploymentReason",
+ opction:[
+ ]} ,{
+ label:"是否就业困难对象",
+ itemType:"radio1",
+ formName:"employmentHardFlag",
+ opction:[
+ {label:'是',value:1},
+ {label:'否',value:0}
+ ]}, {
+ label:"劳动能力就业愿望",
+ itemType:"input1",
+ formName:"employmentWish",
+ opction:[
+ ]}
+ ]
+ },{
+ id:'veteranDto',
+ children:[
+ {
+ label:"入伍时间",
+ itemType:"datepicker1",
+ formName:"joinArmyTime",
+ opction:[
+ ]},
+ {
+ label:"退伍时间",
+ itemType:"datepicker1",
+ formName:"leaveArmyTime",
+ opction:[
+ ]},
+ {
+ label:"服役单位",
+ itemType:"input1",
+ formName:"serviceUnit",
+ opction:[
+ ]},
+ {
+ label:"接收单位",
+ itemType:"input1",
+ formName:"receiveUnit ",
+ opction:[
+ ]},
+ {
+ label:"待安置补助金",
+ itemType:"input1",
+ formName:"settlementAmount",
+ opction:[
- ]},
- {
- label:"培训状况",
- itemType:"input1",
- formName:"trainDesc",
- opction:[
- ]},
- {
- label:"参战时间开始日期",
- itemType:"datepicker1",
- formName:"joinWarStartTime",
- opction:[
- ]},
- {
- label:"参战时间截止日期",
- itemType:"datepicker1",
- formName:"joinWarEndTime",
- opction:[
- ]} ,
- {
- label:"现就业情况",
- itemType:"input1",
- formName:"employmentSituation",
- opction:[
- ]},
- {
- label:"是否办理公益性岗位",
- itemType:"radio1",
- formName:"pubWelfareJobFlag",
- opction:[
- {label:'是',value:1},
- {label:'否',value:0},
- ]}
- ]
- },
- {
- id:'unitedFrontDto',
- children:[{
- label:"职务",
+ ]},
+ {
+ label:"培训状况",
itemType:"input1",
- formName:"duty",
- },
- {
- label:"探亲情况 ",
+ formName:"trainDesc",
+ opction:[
+ ]},
+ {
+ label:"参战时间开始日期",
+ itemType:"datepicker1",
+ formName:"joinWarStartTime",
+ opction:[
+ ]},
+ {
+ label:"参战时间截止日期",
+ itemType:"datepicker1",
+ formName:"joinWarEndTime",
+ opction:[
+ ]} ,
+ {
+ label:"现就业情况",
itemType:"input1",
- formName:"visitation",
- }]
- },{
- id:'volunteerDto',
- children:[{
- label:"志愿者类别",
- itemType:"checkbox",
- formName:"volunteerCategory",
+ formName:"employmentSituation",
+ opction:[
+ ]},
+ {
+ label:"是否办理公益性岗位",
+ itemType:"radio1",
+ formName:"pubWelfareJobFlag",
opction:[
- {label:'文化队伍',formName:'hobbyCode1'},
- {label:'楼委会',formName:'hobbyCode2'},
- {label:'能人达人',formName:'hobbyCode3'},
- {label:'老友俱乐部',formName:'hobbyCode4'},
- {label:'代办员',formName:'hobbyCode5'},
- {label:'调解员',formName:'hobbyCode6'},
- {label:'采集员',formName:'hobbyCode7'},
- {label:'治安巡逻员',formName:'9'},
- ]},
+ {label:'是',value:1},
+ {label:'否',value:0},
+ ]}
+ ]
+ },
{
- label:'备注',
- itemType:"textarea1",
- formName:"volunteerRemark",
+ id:'unitedFrontDto',
+ children:[{
+ label:"职务",
+ itemType:"input1",
+ formName:"duty",
+ },
+ {
+ label:"探亲情况 ",
+ itemType:"input1",
+ formName:"visitation",
+ }]
+ },{
+ id:'volunteerDto',
+ children:[{
+ label:"志愿者类别",
+ itemType:"checkbox",
+ formName:"volunteerCategory",
+ opction:[
+ {label:'文化队伍',formName:'hobbyCode1'},
+ {label:'楼委会',formName:'hobbyCode2'},
+ {label:'能人达人',formName:'hobbyCode3'},
+ {label:'老友俱乐部',formName:'hobbyCode4'},
+ {label:'代办员',formName:'hobbyCode5'},
+ {label:'调解员',formName:'hobbyCode6'},
+ {label:'采集员',formName:'hobbyCode7'},
+ {label:'治安巡逻员',formName:'9'},
+ ]},
+ {
+ label:'备注',
+ itemType:"textarea1",
+ formName:"volunteerRemark",
+ }
+ ]
+ },{
+ id:'oldPeopleDto',
+ children:[ {
+ label:'高龄补助',
+ itemType:"input1",
+ formName:"oldSubsidy",
+ },]
+ },{
+ id:'specialDto',
+ children:[ {
+ label:'人群类别',
+ itemType:"select1",
+ formName:"specialCategoryCode",
+ opction:[]
+ },]
}
- ]
- },{
- id:'oldPeopleDto',
- children:[ {
- label:'高龄补助',
- itemType:"input1",
- formName:"oldSubsidy",
- },]
- },{
- id:'specialDto',
- children:[ {
- label:'人群类别',
- itemType:"select1",
- formName:"specialCategoryCode",
- opction:[]
- },]
- }
-
],
newForm: {},
form:{
@@ -1132,7 +1165,14 @@ export default {
},
// 底部tabs选项
tabsList:[
- {groupId:'eduInfoDto',label:'教育'},{groupId:'hobbyInfoDto',label:'兴趣爱好'},{groupId:'religionDto',label:'宗教信仰'},{groupId:'healthDto',label:'健康'},{groupId:'workInfoDto',label:'工作'},{groupId:'economyDto',label:'经济情况'},{groupId:'resideInfoDto',label:'居住'},{groupId:'familyInfoDto',label:'家庭'},
+ {groupId:'eduInfoDto',label:'教育'},
+ {groupId:'hobbyInfoDto',label:'兴趣爱好'},
+ {groupId:'religionDto',label:'宗教信仰'},
+ {groupId:'healthDto',label:'健康'},
+ {groupId:'workInfoDto',label:'工作'},
+ {groupId:'economyDto',label:'经济情况'},
+ {groupId:'resideInfoDto',label:'居住'},
+ {groupId:'familyInfoDto',label:'家庭'}
]
}
},
@@ -1155,7 +1195,6 @@ export default {
this.setNewForm()
},
methods: {
-
submit_from(){
this.setJSON()
var flag = false
@@ -1165,9 +1204,9 @@ export default {
})
if(flag){
- return this.newForm
- }
- return this.newForm
+ return JSON.stringify(this.newForm)
+ }
+ return false
},
async old_from(data) {
this.getFormData(data)
@@ -1175,63 +1214,56 @@ export default {
await this.getBuildList()
await this.getUniList()
await this.getHouseList()
- // await this.getClassInfo()
await this.residentEduInfo(this.form.resiId)
},
getAllNation(){
- // 民族字典
- this.getDictList()
- // 关系字典
- this.getRelationship()
- // 学历信息
- this.getEducation()
- //残疾类别
- this.getdisabilityNation()
- this.getdisabilityNationClass()
- this.getillnessNation()
- this.getchronicNation()
- this.getHouseholdNation()
- this.getMarriageNation()
- this.getResideNation()
- this.getSpouseNation()
- this.getBranchlist()
- this.getPartyNation()
- this.getResidentNation()
- this.getHousing()
+ // 民族字典
+ this.getDictList()
+ // 关系字典
+ this.getRelationship()
+ // 学历信息
+ this.getEducation()
+ //残疾类别
+ this.getdisabilityNation()
+ this.getdisabilityNationClass()
+ this.getillnessNation()
+ this.getchronicNation()
+ this.getHouseholdNation()
+ this.getMarriageNation()
+ this.getResideNation()
+ this.getSpouseNation()
+ this.getBranchlist()
+ this.getPartyNation()
+ this.getResidentNation()
+ this.getHousing()
},
- getGridList () {
- const { user } = this.$store.state
- this.$http
- .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' })
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- } else {
- console.log('获取查询详情成功', res.data)
- this.optionsG = res.data
- }
- })
- .catch(() => {
- return this.$message.error('网络错误')
- })
- },
- getValiheList () {
- const { user } = this.$store.state
- this.$http
- .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.gridId, agencyId: user.agencyId })
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- } else {
- console.log('获取查询详情成功', res.data)
- this.optionsV = res.data
- }
- })
- .catch(() => {
- return this.$message.error('网络错误')
- })
- },
- async getdisabilityNation(){
+ getGridList () {
+ const { user } = this.$store.state
+ this.$http.post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' }).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取查询详情成功', res.data)
+ this.optionsG = res.data
+ }
+ }).catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ getValiheList () {
+ const { user } = this.$store.state
+ this.$http.post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.gridId, agencyId: user.agencyId }).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取查询详情成功', res.data)
+ this.optionsV = res.data
+ }
+ }).catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ async getdisabilityNation(){
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'})
this.footerInputList.forEach(c => {
@@ -1247,8 +1279,8 @@ export default {
console.log(error,'获取残疾字典');
}
- },
- async getdisabilityNationClass(){
+ },
+ async getdisabilityNationClass(){
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'})
this.footerInputList.forEach(c => {
@@ -1264,8 +1296,8 @@ export default {
console.log(error,'获取残疾等级字典');
}
- },
- async getillnessNation(){
+ },
+ async getillnessNation(){
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'illness_code'})
this.footerInputList.forEach(c => {
@@ -1279,428 +1311,423 @@ export default {
} catch (error) {
console.log(error,'获取所患大病字典');
}
- },
- async getchronicNation(){
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
- this.footerInputList.forEach(c => {
- for(let i of c.children){
- if(i.formName == 'chronicDiseaseCode'){
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error,'获取所患慢病字典');
- }
- },
- async getHouseholdNation(){
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
- this.footerInputList.forEach(c => {
- for(let i of c.children){
- if(i.formName == 'householdSituation'){
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error,'获取人户状况字典');
- }
- },
- async getMarriageNation(){
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'marriage'})
- this.footerInputList.forEach(c => {
- for(let i of c.children){
- if(i.formName == 'marriage'){
- i.opction = data.data
- }
- }
- })
-
- } catch (error) {
- console.log(error,'获取婚姻状况字典');
- }
- },
- async getResideNation(){
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'reside_situation'})
- this.footerInputList.forEach(c => {
- for(let i of c.children){
- if(i.formName == 'resideSituation'){
- i.opction = data.data
- }
- }
- })
+ },
+ async getchronicNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
+ this.footerInputList.forEach(c => {
+ for(let i of c.children){
+ if(i.formName == 'chronicDiseaseCode'){
+ i.opction = data.data
+ }
+ }
+ })
- } catch (error) {
- console.log(error,'获取居住情况字典');
- }
- },
- async getSpouseNation(){
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'spouse_situation'})
- this.footerInputList.forEach(c => {
- for(let i of c.children){
- if(i.formName == 'spouseSituation'){
- i.opction = data.data
- }
- }
- })
+ } catch (error) {
+ console.log(error,'获取所患慢病字典');
+ }
+ },
+ async getHouseholdNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
+ this.footerInputList.forEach(c => {
+ for(let i of c.children){
+ if(i.formName == 'householdSituation'){
+ i.opction = data.data
+ }
+ }
+ })
- } catch (error) {
- console.log(error,'获取配偶情况字典');
- }
- },
- async getResidentNation(){
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'})
- this.footerInputList.forEach(c => {
- for(let i of c.children){
- if(i.formName == 'specialCategoryCode'){
- i.opction = data.data
- }
- }
- })
+ } catch (error) {
+ console.log(error,'获取人户状况字典');
+ }
+ },
+ async getMarriageNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'marriage'})
+ this.footerInputList.forEach(c => {
+ for(let i of c.children){
+ if(i.formName == 'marriage'){
+ i.opction = data.data
+ }
+ }
+ })
- } catch (error) {
- console.log(error,'获取配偶情况字典');
- }
- },
- async getPartyNation(){
- try {
- const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'party_job'})
- this.footerInputList.forEach(c => {
- for(let i of c.children){
- if(i.formName == 'partyJob'){
- i.opction = data.data
- }
- }
- })
+ } catch (error) {
+ console.log(error,'获取婚姻状况字典');
+ }
+ },
+ async getResideNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'reside_situation'})
+ this.footerInputList.forEach(c => {
+ for(let i of c.children){
+ if(i.formName == 'resideSituation'){
+ i.opction = data.data
+ }
+ }
+ })
- } catch (error) {
- console.log(error,'获取职务字典');
- }
- },
- getBuildList () {
- this.$http
- .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.villageId })
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- } else {
- console.log('获取查询详情成功', res.data)
- this.optionsB = res.data
- }
- })
- .catch(() => {
- return this.$message.error('网络错误')
- })
- },
- getUniList () {
- this.$http
- .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.buildId })
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- } else {
- console.log('获取查询详情成功', res.data)
- this.optionsD = res.data
- }
- })
- .catch(() => {
- return this.$message.error('网络错误')
- })
- },
- getHouseList () {
- this.$http
- .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId })
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- } else {
- console.log('获取查询详情成功', res.data)
- this.optionsH = res.data
- }
- })
- .catch(() => {
- return this.$message.error('网络错误')
- })
- },
- handleChangeCheckbox(e,val){
- this.handleTabShow(val,e)
- },
- handleTabShow(val,e){
- if(e == 1){
- if(val.formName == 'partyFlag'){
- this.tabsList.push({label:'党员信息',id:'0',groupId:'parymemberInfoDto'})
- }else if(val.formName == 'ensureHouseFlag'){
- this.tabsList.push({label:'保障房信息',id:'1',groupId:'ensureHouseDto'})
- }else if(val.formName == 'unemployedFlag'){
- this.tabsList.push({label:'失业',id:'2',groupId:'unemployedDto'})
- }else if(val.formName == 'veteranFlag'){
- this.tabsList.push({label:'退役军人',id:'3',groupId:'veteranDto'})
- }else if(val.formName == 'unitedFrontFlag'){
- this.tabsList.push({label:'统战',id:'4',groupId:'unitedFrontDto'})
- }else if(val.formName == 'volunteerFlag'){
- this.tabsList.push({label:'志愿者信息',id:'5',groupId:'volunteerDto'})
- }else if(val.formName == 'oldPeopleFlag'){
- this.tabsList.push({label:'老年人',id:'6',groupId:'oldPeopleDto'})
- }else if(val.formName == 'specialCrowdFlag') {
- this.tabsList.push({label:'特殊人群',id:'7',groupId:'specialDto'})
+ } catch (error) {
+ console.log(error,'获取居住情况字典');
+ }
+ },
+ async getSpouseNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'spouse_situation'})
+ this.footerInputList.forEach(c => {
+ for(let i of c.children){
+ if(i.formName == 'spouseSituation'){
+ i.opction = data.data
}
- }else {
- let i = val.formName == 'partyFlag'?'0': val.formName == 'ensureHouseFlag'?'1':val.formName == 'unemployedFlag'?'2':val.formName == 'veteranFlag'?'3':val.formName == 'unitedFrontFlag'?'4':val.formName == 'volunteerFlag'?'5':val.formName == 'oldPeopleFlag'?'6':val.formName == 'specialCrowdFlag'?'7':''
+ }
+ })
- if(i != ''){
- this.tabsList.forEach(item =>{
- if(i != item.id){
- this.tabsList = this.tabsList.filter(items=>items.id!=i)
- }
- })
- }
- }
+ } catch (error) {
+ console.log(error,'获取配偶情况字典');
+ }
+ },
+ async getResidentNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'})
+ this.footerInputList.forEach(c => {
+ for(let i of c.children){
+ if(i.formName == 'specialCategoryCode'){
+ i.opction = data.data
+ }
+ }
+ })
- },
- handleChangeGrid (val) {
- console.log('val', val)
- for(let n of this.optionsG){
- if(n.value == val){
- this.form.gridName = n.label
- }
+ } catch (error) {
+ console.log(error,'获取配偶情况字典');
+ }
+ },
+ async getPartyNation(){
+ try {
+ const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'party_job'})
+ this.footerInputList.forEach(c => {
+ for(let i of c.children){
+ if(i.formName == 'partyJob'){
+ i.opction = data.data
+ }
+ }
+ })
+ } catch (error) {
+ console.log(error,'获取职务字典');
+ }
+ },
+ getBuildList () {
+ this.$http.post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.villageId }).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取查询详情成功', res.data)
+ this.optionsB = res.data
}
- this.form.villageId = ''
- this.form.buildId = ''
- this.form.unitId = ''
- this.form.homeId = ''
- this.getValiheList()
- if (!val) {
- this.getBuildList()
- this.getUniList()
- this.getHouseList()
+ }).catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ getUniList () {
+ this.$http.post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.buildId }).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取查询详情成功', res.data)
+ this.optionsD = res.data
}
- },
- validateIdcard (idCard, type) {
- this.$http
- .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- } else {
- console.log('获取查询详情成功', res.data)
-
- if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
- else this.form.volunteerFlag = false
-
- if (res.data.isPartyMember == '1') {
- this.form.partyFlag = true
- this.isParty = true
- this.partyInfo = res.data.detail.ic_party_member
- } else this.form.partyFlag = false
- }
- })
- .catch(() => {
- return this.$message.error('网络错误')
+ }).catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ getHouseList () {
+ this.$http.post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId }).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取查询详情成功', res.data)
+ this.optionsH = res.data
+ }
+ }).catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ handleChangeCheckbox(e,val){
+ this.handleTabShow(val,e)
+ },
+ handleTabShow(val,e){
+ if(e == 1){
+ if(val.formName == 'partyFlag'){
+ this.tabsList.push({label:'党员信息',id:'0',groupId:'parymemberInfoDto'})
+ }else if(val.formName == 'ensureHouseFlag'){
+ this.tabsList.push({label:'保障房信息',id:'1',groupId:'ensureHouseDto'})
+ }else if(val.formName == 'unemployedFlag'){
+ this.tabsList.push({label:'失业',id:'2',groupId:'unemployedDto'})
+ }else if(val.formName == 'veteranFlag'){
+ this.tabsList.push({label:'退役军人',id:'3',groupId:'veteranDto'})
+ }else if(val.formName == 'unitedFrontFlag'){
+ this.tabsList.push({label:'统战',id:'4',groupId:'unitedFrontDto'})
+ }else if(val.formName == 'volunteerFlag'){
+ this.tabsList.push({label:'志愿者信息',id:'5',groupId:'volunteerDto'})
+ }else if(val.formName == 'oldPeopleFlag'){
+ this.tabsList.push({label:'老年人',id:'6',groupId:'oldPeopleDto'})
+ }else if(val.formName == 'specialCrowdFlag') {
+ this.tabsList.push({label:'特殊人群',id:'7',groupId:'specialDto'})
+ }
+ } else {
+ let i = val.formName == 'partyFlag'?'0':
+ val.formName == 'ensureHouseFlag'?'1':
+ val.formName == 'unemployedFlag'?'2':
+ val.formName == 'veteranFlag'?'3':
+ val.formName == 'unitedFrontFlag'?'4':
+ val.formName == 'volunteerFlag'?'5':
+ val.formName == 'oldPeopleFlag'?'6':
+ val.formName == 'specialCrowdFlag'?'7':''
+ if(i != ''){
+ this.tabsList.forEach(item =>{
+ if(i != item.id){
+ this.tabsList = this.tabsList.filter(items=>items.id!=i)
+ }
})
- },
- // 身份证号失去焦点事件
- handleValidBlur (item) {
- console.log('n---', item)
- if (item.formName !== 'idNum') return
- if (!isCard(this.form.idNum) && !isPassport(this.form.idNum)) return
- const { user } = this.$store.state
- let huji = '', i = 0
- if (user.areaCodePath && user.areaCodePath.length > 0) {
- i = user.areaCodePath.length - 1
- huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
- }
-
- if (this.form.idNum.length === 18 || this.form.idNum.length === 15) {
- const _id = this.form.idNum.substr(0, 6)
- const { sex, birth, age } = computedCard(this.form.idNum)
- this.form.birthday = birth
- this.form.gender = sex == 1 ? '1' : '2'
- this.form.oldPeopleFlag = age >= 60 ? 1 : 0
- // this.form.IS_BDHJ = huji == _id ? '1' : ''
- this.validateIdcard(this.form.idNum)
- console.log('age-----', age, _id)
+ }
+ }
+ },
+ handleChangeGrid (val) {
+ console.log('val', val)
+ for(let n of this.optionsG){
+ if(n.value == val){
+ this.form.gridName = n.label
}
-
- },
- handleChangeV (val) {
- console.log('val', val)
- this.form.buildId = ''
- this.form.unitId = ''
- this.form.homeId = ''
+ }
+ this.form.villageId = ''
+ this.form.buildId = ''
+ this.form.unitId = ''
+ this.form.homeId = ''
+ this.getValiheList()
+ if (!val) {
this.getBuildList()
this.getUniList()
this.getHouseList()
- },
- handleChangeB (val) {
- console.log('val', val)
- this.form.unitId = ''
- this.form.homeId = ''
- this.getUniList()
- this.getHouseList()
- },
- handleChangeD () {
- this.form.homeId = ''
- this.getHouseList()
- },
- async handleClick (tab, event) {
- if (event.toElement.innerText == '教育') {
- if (!this.form.resiId) {
- this.newForm.eduInfoDto = this.form.eduInfoDto
- } else {
- await this.residentEduInfo(this.form.resiId)
- }
- } else if (event.toElement.innerText == '兴趣爱好') {
- if (!this.form.resiId) {
- this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
- } else {
- await this.residentHobbyInfo(this.form.resiId)
- }
- } else if (event.toElement.innerText == '宗教信仰') {
- if (!this.form.resiId) {
- this.newForm.religionDto = this.form.religionDto
- } else {
- await this.residentReligion(this.form.resiId)
- }
- } else if (event.toElement.innerText == '健康') {
- if (!this.form.resiId) {
- this.newForm.healthDto = this.form.healthDto
- } else {
- await this.getHealthInfoDetailById(this.form.resiId)
- }
- } else if (event.toElement.innerText == '工作') {
- if (!this.form.resiId) {
- this.newForm.workInfoDto = this.form.workInfoDto
- } else {
- await this.residentWorkInfo(this.form.resiId)
- }
- } else if (event.toElement.innerText == '经济情况') {
- if (!this.form.resiId) {
- this.newForm.economyDto = this.form.economyDto
- } else {
- await this.getEconomyDetailById(this.form.resiId)
- }
- } else if (event.toElement.innerText == '居住') {
- if (!this.form.resiId) {
- this.newForm.resideInfoDto = this.form.resideInfoDto
- } else {
- await this.getResideInfoDetailById(this.form.resiId)
- }
- } else if (event.toElement.innerText == '家庭') {
- if (!this.form.resiId) {
- this.newForm.familyInfoDto = this.form.familyInfoDto
- } else {
- await this.getFamilyInfoDetailById(this.form.resiId)
- }
- } else if (event.toElement.innerText == '党员信息') {
- if (!this.form.resiId) {
- this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
- } else {
- await this.residentPartyMemberInfo(this.form.resiId)
- }
- } else if (event.toElement.innerText == '保障房信息') {
- if (!this.form.resiId) {
- this.newForm.ensureHouseDto = this.form.ensureHouseDto
- } else {
- await this.residentEnsureHouse(this.form.resiId)
- }
- } else if (event.toElement.innerText == '失业') {
- if (!this.form.resiId) {
- this.newForm.unemployedDto = this.form.unemployedDto
- } else {
- await this.residentUnemployed(this.form.resiId)
- }
- } else if (event.toElement.innerText == '退役军人') {
- if (!this.form.resiId) {
- this.newForm.veteranDto = this.form.veteranDto
- } else {
- await this.getVeteranDetailById(this.form.resiId)
- }
- } else if (event.toElement.innerText == '统战') {
- if (!this.form.resiId) {
- this.newForm.unitedFrontDto = this.form.unitedFrontDto
- } else {
- await this.residentUnitedFront(this.form.resiId)
- }
- } else if (event.toElement.innerText == '志愿者信息') {
- if (!this.form.resiId) {
- this.newForm.volunteerDto = this.form.volunteerDto
- } else {
- await this.getVolunteerDetailById(this.form.resiId)
- }
- } else if (event.toElement.innerText == '特殊人群') {
- if (!this.form.resiId) {
- this.newForm.specialDto = this.form.specialDto
- } else {
- await this.residentSpecial(this.form.resiId)
- }
- } else if (event.toElement.innerText == '老年人') {
- if (!this.form.resiId) {
- this.newForm.oldPeopleDto = this.form.oldPeopleDto
+ }
+ },
+ validateIdcard (idCard, type) {
+ this.$http
+ .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
} else {
- await this.getOldPeopleDetailById(this.form.resiId)
+ console.log('获取查询详情成功', res.data)
+
+ if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
+ else this.form.volunteerFlag = false
+
+ if (res.data.isPartyMember == '1') {
+ this.form.partyFlag = true
+ this.isParty = true
+ this.partyInfo = res.data.detail.ic_party_member
+ } else this.form.partyFlag = false
}
+ })
+ .catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ // 身份证号失去焦点事件
+ handleValidBlur (item) {
+ console.log('n---', item)
+ if (item.formName !== 'idNum') return
+ if (!isCard(this.form.idNum) && !isPassport(this.form.idNum)) return
+ const { user } = this.$store.state
+ let huji = '', i = 0
+ if (user.areaCodePath && user.areaCodePath.length > 0) {
+ i = user.areaCodePath.length - 1
+ huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
}
- },
- handleForm () {
- let newForm = []
- this.$refs[this.formId].validate((valid) => {
- if (valid) {
- var hash = {}
- var i = 0
- var res = []
- this.tempFormList.forEach(function (item) {
- var name = item.tableName
- hash[name] ? res[hash[name] - 1].list.push(item) : hash[name] = ++i && res.push({
- list: [item],
- tableName: name
- })
+
+ if (this.form.idNum.length === 18 || this.form.idNum.length === 15) {
+ const _id = this.form.idNum.substr(0, 6)
+ const { sex, birth, age } = computedCard(this.form.idNum)
+ this.form.birthday = birth
+ this.form.gender = sex == 1 ? '1' : '2'
+ this.form.oldPeopleFlag = age >= 60 ? 1 : 0
+ // this.form.IS_BDHJ = huji == _id ? '1' : ''
+ this.validateIdcard(this.form.idNum)
+ console.log('age-----', age, _id)
+ }
+
+ },
+ handleChangeV (val) {
+ console.log('val', val)
+ this.form.buildId = ''
+ this.form.unitId = ''
+ this.form.homeId = ''
+ this.getBuildList()
+ this.getUniList()
+ this.getHouseList()
+ },
+ handleChangeB (val) {
+ console.log('val', val)
+ this.form.unitId = ''
+ this.form.homeId = ''
+ this.getUniList()
+ this.getHouseList()
+ },
+ handleChangeD () {
+ this.form.homeId = ''
+ this.getHouseList()
+ },
+ async handleClick (tab, event) {
+ if (event.toElement.innerText == '教育') {
+ if (!this.form.resiId) {
+ this.newForm.eduInfoDto = this.form.eduInfoDto
+ } else {
+ await this.residentEduInfo(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '兴趣爱好') {
+ if (!this.form.resiId) {
+ this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
+ } else {
+ await this.residentHobbyInfo(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '宗教信仰') {
+ if (!this.form.resiId) {
+ this.newForm.religionDto = this.form.religionDto
+ } else {
+ await this.residentReligion(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '健康') {
+ if (!this.form.resiId) {
+ this.newForm.healthDto = this.form.healthDto
+ } else {
+ await this.getHealthInfoDetailById(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '工作') {
+ if (!this.form.resiId) {
+ this.newForm.workInfoDto = this.form.workInfoDto
+ } else {
+ await this.residentWorkInfo(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '经济情况') {
+ if (!this.form.resiId) {
+ this.newForm.economyDto = this.form.economyDto
+ } else {
+ await this.getEconomyDetailById(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '居住') {
+ if (!this.form.resiId) {
+ this.newForm.resideInfoDto = this.form.resideInfoDto
+ } else {
+ await this.getResideInfoDetailById(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '家庭') {
+ if (!this.form.resiId) {
+ this.newForm.familyInfoDto = this.form.familyInfoDto
+ } else {
+ await this.getFamilyInfoDetailById(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '党员信息') {
+ if (!this.form.resiId) {
+ this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
+ } else {
+ await this.residentPartyMemberInfo(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '保障房信息') {
+ if (!this.form.resiId) {
+ this.newForm.ensureHouseDto = this.form.ensureHouseDto
+ } else {
+ await this.residentEnsureHouse(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '失业') {
+ if (!this.form.resiId) {
+ this.newForm.unemployedDto = this.form.unemployedDto
+ } else {
+ await this.residentUnemployed(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '退役军人') {
+ if (!this.form.resiId) {
+ this.newForm.veteranDto = this.form.veteranDto
+ } else {
+ await this.getVeteranDetailById(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '统战') {
+ if (!this.form.resiId) {
+ this.newForm.unitedFrontDto = this.form.unitedFrontDto
+ } else {
+ await this.residentUnitedFront(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '志愿者信息') {
+ if (!this.form.resiId) {
+ this.newForm.volunteerDto = this.form.volunteerDto
+ } else {
+ await this.getVolunteerDetailById(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '特殊人群') {
+ if (!this.form.resiId) {
+ this.newForm.specialDto = this.form.specialDto
+ } else {
+ await this.residentSpecial(this.form.resiId)
+ }
+ } else if (event.toElement.innerText == '老年人') {
+ if (!this.form.resiId) {
+ this.newForm.oldPeopleDto = this.form.oldPeopleDto
+ } else {
+ await this.getOldPeopleDetailById(this.form.resiId)
+ }
+ }
+ },
+ handleForm () {
+ let newForm = []
+ this.$refs[this.formId].validate((valid) => {
+ if (valid) {
+ var hash = {}
+ var i = 0
+ var res = []
+ this.tempFormList.forEach(function (item) {
+ var name = item.tableName
+ hash[name] ? res[hash[name] - 1].list.push(item) : hash[name] = ++i && res.push({
+ list: [item],
+ tableName: name
})
- const itemTypes = ['cascader', 'daterange', 'timerange']
- res.forEach(item => {
- let _form = {}
- item.list.filter(n => n.isChange).forEach(r => {
- _form[r.columnName] = r.multiSelect || itemTypes.includes(r.itemType) ? this.form[r.columnName].toString() : this.form[r.columnName]
- // return _form
- })
- if (this.fixed) {
- for (let n in this.fixedList) {
- _form[n] = this.fixedList[n]
- }
+ })
+ const itemTypes = ['cascader', 'daterange', 'timerange']
+ res.forEach(item => {
+ let _form = {}
+ item.list.filter(n => n.isChange).forEach(r => {
+ _form[r.columnName] = r.multiSelect || itemTypes.includes(r.itemType) ? this.form[r.columnName].toString() : this.form[r.columnName]
+ // return _form
+ })
+ if (this.fixed) {
+ for (let n in this.fixedList) {
+ _form[n] = this.fixedList[n]
}
- newForm.push({
- tableName: item.tableName,
- supportAdd: this.supportAdd,
- list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
- })
- console.log(newForm);
+ }
+ newForm.push({
+ tableName: item.tableName,
+ supportAdd: this.supportAdd,
+ list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
})
- return newForm
- } else {
- console.log('error submit!!')
- return false
- }
- })
- if (this.supportAdd) newForm = this.handlerMuscForm()
- return newForm
- },
- // 为了实现根据房屋类型改版是否租户的需求
- handleChangeH (val) {
- let item = this.optionsH.find(item => item.value === val);
- if (item && item.type == '1') {
- this.form.IS_TENANT = '1'
- console.log('item-----', item)
- } else this.form.IS_TENANT = '0'
- },
- //获取民族字典
- async getDictList(){
+ console.log(newForm);
+ })
+ return newForm
+ } else {
+ console.log('error submit!!')
+ return false
+ }
+ })
+ if (this.supportAdd) newForm = this.handlerMuscForm()
+ return newForm
+ },
+ // 为了实现根据房屋类型改版是否租户的需求
+ handleChangeH (val) {
+ let item = this.optionsH.find(item => item.value === val);
+ if (item && item.type == '1') {
+ this.form.IS_TENANT = '1'
+ console.log('item-----', item)
+ } else this.form.IS_TENANT = '0'
+ },
+ //获取民族字典
+ async getDictList(){
try {
const { data } = await this.$http.post('sys/dict/data/nation',{formCode: "resi_base_info"})
this.dictList = data
@@ -1710,14 +1737,12 @@ export default {
console.log(c.opction);
}
})
-
} catch (error) {
console.log(error,'获取民族字典');
}
-
- },
- // 获取人物关系字典
- async getRelationship(){
+ },
+ // 获取人物关系字典
+ async getRelationship(){
try {
const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"})
this.footerInputList.forEach(c => {
@@ -1727,13 +1752,11 @@ export default {
}
}
})
-
} catch (error) {
console.log(error,'获取民族字典');
}
-
- },
- async getBranchlist(){
+ },
+ async getBranchlist(){
try {
const { data } = await this.$http.post('resi/partymember/icPartyOrg/branchlist',{formCode: "resi_base_info"})
this.footerInputList.forEach(c => {
@@ -1743,12 +1766,11 @@ export default {
}
}
})
-
} catch (error) {
console.log(error,'获取支部字典');
}
- },
- getTreeData (data) {
+ },
+ getTreeData (data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
@@ -1763,8 +1785,7 @@ export default {
});
return arr;
},
-
- async getEducation(){
+ async getEducation(){
try {
let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})
data.data = this.getTreeData(data.data)
@@ -1779,9 +1800,8 @@ export default {
} catch (error) {
console.log(error,'获取民族字典');
}
-
- },
- async getHousing(){
+ },
+ async getHousing(){
try {
let { data } = await this.$http.post('sys/dict/data/house',{formCode: "resi_base_info"})
data.data = this.getTreeData(data.data)
@@ -1792,96 +1812,98 @@ export default {
}
}
})
-
- } catch (error) {
- console.log(error,'获取住房性质字典');
- }
-
- },
- getFormData(data) {
- this.form.categoryId = '111222333',// 临时写死
- this.form.resiId = data.resiId
- this.form.buildId = data.houseInfo.buildId
- this.form.gridId = data.houseInfo.gridId
- this.form.gridName = data.houseInfo.gridName
- this.form.homeId = data.houseInfo.homeId
- this.form.homeName = data.houseInfo.homeName
- this.form.houseMergeId = data.houseInfo.mergeId
- this.form.unitId = data.houseInfo.unitId
- this.form.villageId = data.houseInfo.villageId
- this.form.birthday = data.birthday
- this.form.gender = data.gender
- this.form.idNum = data.idNum
- this.form.localResidenceFlag = data.localResidenceFlag.toString()
- this.form.mobile = data.mobile
- this.form.name = data.name
- this.form.nation = data.nation ? data.nation : ''
- this.form.remark = data.remark ? data.remark : ''
- if (data.categoryInfo) {
- this.form.partyFlag = data.categoryInfo.partyFlag.toString()
- this.form.subsistenceAllowanceFlag = data.categoryInfo.subsistenceAllowanceFlag.toString()
- this.form.ensureHouseFlag = data.categoryInfo.ensureHouseFlag.toString()
- this.form.unemployedFlag = data.categoryInfo.unemployedFlag.toString()
- this.form.fertileWomanFlag = data.categoryInfo.fertileWomanFlag.toString()
- this.form.veteranFlag = data.categoryInfo.veteranFlag.toString()
- this.form.unitedFrontFlag = data.categoryInfo.unitedFrontFlag.toString()
- this.form.petitionOfficerFlag = data.categoryInfo.petitionOfficerFlag.toString()
- this.form.volunteerFlag = data.categoryInfo.volunteerFlag.toString()
- this.form.oldPeopleFlag = data.categoryInfo.oldPeopleFlag.toString()
- this.form.emptyNesterFlag = data.categoryInfo.emptyNesterFlag.toString()
- this.form.bereavedPersonFlag = data.categoryInfo.bereavedPersonFlag.toString()
- this.form.disabledFlag = data.categoryInfo.disabledFlag.toString()
- this.form.dementedFlag = data.categoryInfo.dementedFlag.toString()
- this.form.disabilityFlag = data.categoryInfo.disabilityFlag.toString()
- this.form.seriousIllnessFlag = data.categoryInfo.seriousIllnessFlag.toString()
- this.form.chronicDiseaseFlag = data.categoryInfo.chronicDiseaseFlag.toString()
- this.form.specialCrowdFlag = data.categoryInfo.specialCrowdFlag.toString()
- this.form.tenantFlag = data.categoryInfo.tenantFlag.toString()
- this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
- this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.toString()
- }
- let old_Form = {
- categoryId: '111222333',// 临时写死
- resiId: data.resiId,
- buildId: data.houseInfo.buildId,
- gridId: data.houseInfo.gridId,
- gridName: data.houseInfo.gridName,
- homeId: data.houseInfo.homeId,
- homeName: data.houseInfo.homeName,
- houseMergeId: data.houseInfo.mergeId,
- unitId: data.houseInfo.unitId,
- villageId: data.houseInfo.villageId,
- birthday: data.birthday,
- gender: data.gender,
- idNum: data.idNum,
- localResidenceFlag: data.localResidenceFlag.toString(),
- mobile: data.mobile,
- name: data.name,
- nation: data.nation ? data.nation : '',
- remark: data.remark ? data.remark : '',
- partyFlag: data.categoryInfo.partyFlag.toString(),
- subsistenceAllowanceFlag: data.categoryInfo.subsistenceAllowanceFlag.toString(),
- ensureHouseFlag: data.categoryInfo.ensureHouseFlag.toString(),
- unemployedFlag: data.categoryInfo.unemployedFlag.toString(),
- fertileWomanFlag: data.categoryInfo.fertileWomanFlag.toString(),
- veteranFlag: data.categoryInfo.veteranFlag.toString(),
- unitedFrontFlag: data.categoryInfo.unitedFrontFlag.toString(),
- petitionOfficerFlag: data.categoryInfo.petitionOfficerFlag.toString(),
- volunteerFlag: data.categoryInfo.volunteerFlag.toString(),
- oldPeopleFlag: data.categoryInfo.oldPeopleFlag.toString(),
- emptyNesterFlag: data.categoryInfo.emptyNesterFlag.toString(),
- bereavedPersonFlag: data.categoryInfo.bereavedPersonFlag.toString(),
- disabledFlag: data.categoryInfo.disabledFlag.toString(),
- dementedFlag: data.categoryInfo.dementedFlag.toString(),
- disabilityFlag: data.categoryInfo.disabilityFlag.toString(),
- seriousIllnessFlag: data.categoryInfo.seriousIllnessFlag.toString(),
- chronicDiseaseFlag: data.categoryInfo.chronicDiseaseFlag.toString(),
- specialCrowdFlag: data.categoryInfo.specialCrowdFlag.toString(),
- tenantFlag: data.categoryInfo.tenantFlag.toString(),
- floatingFlag: data.categoryInfo.floatingFlag.toString(),
- liveAloneFlag: data.categoryInfo.liveAloneFlag.toString(),
+ } catch (error) {
+ console.log(error,'获取住房性质字典');
}
- this.newForm = old_Form
+ },
+ getFormData(data) {
+ this.form.categoryId = data.categoryInfo.id,// 临时写死
+ this.form.resiId = data.resiId
+ this.form.buildId = data.houseInfo.buildId
+ this.form.gridId = data.houseInfo.gridId
+ this.form.gridName = data.houseInfo.gridName
+ this.form.homeId = data.houseInfo.homeId
+ this.form.homeName = data.houseInfo.homeName
+ this.form.houseMergeId = data.houseInfo.mergeId
+ this.form.unitId = data.houseInfo.unitId
+ this.form.villageId = data.houseInfo.villageId
+ this.form.birthday = data.birthday
+ this.form.gender = data.gender
+ this.form.idNum = data.idNum
+ this.form.localResidenceFlag = data.localResidenceFlag ? data.localResidenceFlag.toString() : ''
+ this.form.mobile = data.mobile ? data.mobile : ''
+ this.form.name = data.name
+ this.form.nation = data.nation ? data.nation : ''
+ this.form.remark = data.remark ? data.remark : ''
+ if (data.categoryInfo) {
+ this.form.partyFlag = data.categoryInfo.partyFlag.toString()
+ this.form.subsistenceAllowanceFlag = data.categoryInfo.subsistenceAllowanceFlag.toString()
+ this.form.ensureHouseFlag = data.categoryInfo.ensureHouseFlag.toString()
+ this.form.unemployedFlag = data.categoryInfo.unemployedFlag.toString()
+ this.form.fertileWomanFlag = data.categoryInfo.fertileWomanFlag.toString()
+ this.form.veteranFlag = data.categoryInfo.veteranFlag.toString()
+ this.form.unitedFrontFlag = data.categoryInfo.unitedFrontFlag.toString()
+ this.form.petitionOfficerFlag = data.categoryInfo.petitionOfficerFlag.toString()
+ this.form.volunteerFlag = data.categoryInfo.volunteerFlag.toString()
+ this.form.oldPeopleFlag = data.categoryInfo.oldPeopleFlag.toString()
+ this.form.emptyNesterFlag = data.categoryInfo.emptyNesterFlag.toString()
+ this.form.bereavedPersonFlag = data.categoryInfo.bereavedPersonFlag.toString()
+ this.form.disabledFlag = data.categoryInfo.disabledFlag.toString()
+ this.form.dementedFlag = data.categoryInfo.dementedFlag.toString()
+ this.form.disabilityFlag = data.categoryInfo.disabilityFlag.toString()
+ this.form.seriousIllnessFlag = data.categoryInfo.seriousIllnessFlag.toString()
+ this.form.chronicDiseaseFlag = data.categoryInfo.chronicDiseaseFlag.toString()
+ this.form.specialCrowdFlag = data.categoryInfo.specialCrowdFlag.toString()
+ this.form.tenantFlag = data.categoryInfo.tenantFlag.toString()
+ this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
+ this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.toString()
+ }
+ let {categoryId, resiId, buildId, gridId, gridName, homeId, homeName,houseMergeId,unitId,
+ villageId,birthday,gender,idNum,localResidenceFlag,mobile,name,nation,remark,
+ partyFlag,subsistenceAllowanceFlag,ensureHouseFlag,unemployedFlag,fertileWomanFlag,veteranFlag,unitedFrontFlag,
+ petitionOfficerFlag,volunteerFlag,oldPeopleFlag,emptyNesterFlag,bereavedPersonFlag,disabledFlag,
+ dementedFlag,disabilityFlag,seriousIllnessFlag,chronicDiseaseFlag,specialCrowdFlag,tenantFlag,floatingFlag,liveAloneFlag} = this.form
+ this.newForm = {
+ categoryId,
+ resiId,
+ buildId,
+ gridId,
+ gridName,
+ homeId,
+ homeName,
+ houseMergeId,
+ unitId,
+ villageId,
+ birthday,
+ gender,
+ idNum,
+ localResidenceFlag,
+ mobile,
+ name,
+ nation,
+ remark,
+ partyFlag,
+ subsistenceAllowanceFlag,
+ ensureHouseFlag,
+ unemployedFlag,
+ fertileWomanFlag,
+ veteranFlag,
+ unitedFrontFlag,
+ petitionOfficerFlag,
+ volunteerFlag,
+ oldPeopleFlag,
+ emptyNesterFlag,
+ bereavedPersonFlag,
+ disabledFlag,
+ dementedFlag,
+ disabilityFlag,
+ seriousIllnessFlag,
+ chronicDiseaseFlag,
+ specialCrowdFlag,
+ tenantFlag,
+ floatingFlag,
+ liveAloneFlag,
+ }
},
// 教育信息详情
residentEduInfo(id) {
@@ -1903,6 +1925,9 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
+ if (res.data) {
+ res.data.hobbyCode = res.data.hobbyCode.split(',')
+ }
this.form.hobbyInfoDto = res.data ? res.data : { //兴趣爱好
hobbyCode:[],//兴趣特长
interestDesc:'',//兴趣
@@ -1922,6 +1947,7 @@ export default {
religion:'',
religionRemark:''
}
+
this.newForm.religionDto = this.form.religionDto
}
})
@@ -1968,6 +1994,7 @@ export default {
retireTime:'',//离退休时间
workRemark:'',//备注
}
+
this.newForm.workInfoDto = this.form.workInfoDto
}
})
@@ -2125,10 +2152,14 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
+ if (res.data) {
+ res.data.volunteerCategory = res.data.volunteerCategory.split(',')
+ }
this.form.volunteerDto = res.data ? res.data : {//志愿者信息
volunteerCategory:[],//志愿者类别
volunteerRemark:''//备注
}
+
this.newForm.volunteerDto = this.form.volunteerDto
}
})
@@ -2142,6 +2173,7 @@ export default {
this.form.oldPeopleDto = res.data ? res.data : {
oldSubsidy:''//高龄补助
}
+
this.newForm.oldPeopleDto = this.form.oldPeopleDto
}
})
@@ -2152,9 +2184,13 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
+ if (res.data) {
+ res.data.specialCategoryCode = res.data.specialCategoryCode.split(',')
+ }
this.form.specialDto = res.data ? res.data : {//特殊人群
specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；
}
+
this.newForm.specialDto = this.form.specialDto
}
})
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 6c5e20478..aca11fa54 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -890,7 +890,7 @@ export default {
}
-