From 9b431750132af3f200cc0a2ee6fc7049df904609 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 20 Mar 2024 14:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E4=BD=8F=E4=BF=A1=E6=81=AF=E5=9F=BA?=
=?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E6=8B=93=E5=B1=95=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=B9=E5=AD=97=E6=AE=B5,=E5=B1=85?=
=?UTF-8?q?=E6=B0=91=E6=90=9C=E7=B4=A2=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
subpages/addResi/pages/addResi/addResi.js | 207 ++++++++++++++++-
subpages/addResi/pages/addResi/addResi.wxml | 215 ++++++++++--------
subpages/addResi/pages/addResi/addResi.wxss | 3 +-
.../pages/searchResult/searchResult.js | 6 +-
4 files changed, 330 insertions(+), 101 deletions(-)
diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index ff3120e..daa94cd 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/subpages/addResi/pages/addResi/addResi.js
@@ -42,7 +42,7 @@ Page({
desc: '',
},
], //步骤条数据
- activeForm: 0,
+ activeForm: 2,
/** 步骤条状态 */
form: {
baseInfoDto: {
@@ -167,8 +167,45 @@ Page({
spouseSituationList: [], //配偶情况
unemploymentReasonList: [], //失业原因
employmentWishList: [], //就业意愿
-
+ genderList: [{ label: '男', value: '1' }, { label: '女', value: '2' }],
+ idTypeList : [
+ {
+ label: '其他',
+ value: 0
+ },
+ {
+ label: '身份证',
+ value: 1
+ },
+ {
+ label: '护照',
+ value: 2
+ },
+ {
+ label: '港澳通行证',
+ value: 3
+ },
+ {
+ label: '军人证',
+ value: 4
+ },
+ {
+ label: '台胞证',
+ value: 5
+ }
+ ],
+ binaryOptionList : [
+ {
+ label: '是',
+ value: 1
+ },
+ {
+ label: '否',
+ value: 0
+ }
+ ]
},
+
},
/**
@@ -601,7 +638,171 @@ Page({
this.setData({
'form.resideInfoDtos':this.data.form.resideInfoDtos
})
- }
+ },
//**房屋逻辑end */
+ //**基础信息start */
+ bindNameInput(e){
+ this.setData({
+ ['form.baseInfoDto.name']: e.detail.value,
+ })
+ },
+ bindPickerChangeIdType(e){
+ const selectedIndex = e.detail.value;
+ const selectedVillage = this.data.dicts.idTypeList[selectedIndex]
+ this.setData({
+ idTypeName:selectedVillage.label,
+ 'form.baseInfoDto.idType':selectedVillage.value
+ })
+ },
+ bindIdNumInput(e){
+ this.setData({
+ 'form.baseInfoDto.name': e.detail.value,
+ })
+ },
+ bindPickerChangeNationality(e){
+ const selectedIndex = e.detail.value;
+ const selectedVillage = this.data.dicts.nationalityList[selectedIndex]
+ this.setData({
+ nationalityName:selectedVillage.label,
+ 'form.baseInfoDto.nationality':selectedVillage.value
+ })
+ },
+ bindMobileInput(e){
+ this.setData({
+ 'form.baseInfoDto.mobile': e.detail.value,
+ })
+ },
+ bindPickerChangeGender(){
+ this.setData({
+ genderName: this.data.genderList[e.detail.value].label,
+ "form.gender": this.data.genderList[e.detail.value].value
+ })
+ },
+ bindDateChange(e) {
+ this.setData({
+ 'form.baseInfoDto.birthday': e.detail.value
+ })
+ },
+
+ bindPickerChangeNation(e) {
+ this.setData({
+ "form.baseInfoDto.nation": this.data.dicts.nationList[e.detail.value].value
+ })
+ },
+ bindPickerChangeEducation(e){
+ this.setData({
+ "form.eduInfoDto.cultureLevel": this.data.dicts.educationList[e.detail.value].value
+ })
+ },
+ bindPickerChangeMarriage(e) {
+ this.setData({
+ "form.familyInfoDto.marriage": this.data.dicts.marriageList[e.detail.value].value,
+ marriageName: this.data.dicts.marriageList[e.detail.value].label,
+ })
+ },
+ bindPickerChangeSpouse(e){
+ this.setData({
+ "form.familyInfoDto.spouseSituation": this.data.dicts.spouseSituationList[e.detail.value].value,
+ spouseSituationName: this.data.dicts.spouseSituationList[e.detail.value].label,
+ })
+ },
+ bindNativePlaceInput(e) {
+ this.setData({
+ 'form.baseInfoDto.nativePlace': e.detail.value
+ })
+ },
+ bindLocalResidenceFlag(e){
+ this.setData({
+ 'form.baseInfoDto.localResidenceFlag': e.detail.value
+ })
+ },
+ //**基础信息end */
+
+ //**拓展信息start */
+ bindReligionInput(e) {
+ this.setData({
+ "form.religionDto.religion": e.detail.value
+ })
+ },
+ bindCareerStatus(e){
+ this.setData({
+ "form.workInfoDto.careerStatus":this.data.dicts.careerStatusList[e.detail.value].value,
+ careerStatusName:this.data.dicts.careerStatusList[e.detail.value].label
+ })
+ },
+ bindWorkUnit(e){
+ this.setData({
+ "form.workInfoDto.workUnit": e.detail.value
+ })
+ },
+ bindWorkOccupation(e){
+ this.setData({
+ "form.workInfoDto.occupation": e.detail.value
+ })
+ },
+ bindMonthIncome(e){
+ this.setData({
+ "form.economyDto.monthIncome": e.detail.value
+ })
+ },
+ bindOriginWorkUnit(e){
+ this.setData({
+ "form.unemployedDto.originWorkUnit": e.detail.value
+ })
+ },
+ bindUnemploymentTime(e){
+ this.setData({
+ "form.unemployedDto.unemploymentTime": e.detail.value
+ })
+ },
+ bindUnemploymentNum(e){
+ this.setData({
+ "form.unemployedDto.unemploymentNum": e.detail.value
+ })
+ },
+ bindUnemploymentReason(e){
+ this.setData({
+ "form.unemployedDto.unemploymentReason":this.data.dicts.unemploymentReasonList[e.detail.value].value,
+ unemploymentReasonName:this.data.dicts.unemploymentReasonList[e.detail.value].label
+ })
+ },
+ bindEmploymentNum(e){
+ this.setData({
+ "form.unemployedDto.employmentNum": e.detail.value
+ })
+ },
+ bindSpecialSkill(e){
+ this.setData({
+ "form.unemployedDto.specialSkill": e.detail.value
+ })
+ },
+ bindUnempCompensationFlag(e){
+ this.setData({
+ "form.unemployedDto.unempCompensationFlag": Number(e.detail.value)
+ })
+ },
+ bindEmploymentHardFlag(e){
+ this.setData({
+ "form.unemployedDto.employmentHardFlag": Number(e.detail.value)
+ })
+ },
+ bindEmploymentWish(e){
+ this.setData({
+ "form.unemployedDto.employmentWish":this.data.dicts.employmentWishList[e.detail.value].value,
+ employmentWishName:this.data.dicts.employmentWishList[e.detail.value].label
+ })
+ },
+ bindElderlyRelation(e){
+ this.setData({
+ "form.familyInfoDto.elderlyRelation":this.data.dicts.houseHolderRelList[e.detail.value].value,
+ elderlyRelationName:this.data.dicts.houseHolderRelList[e.detail.value].label
+ })
+ },
+ bindDependantMobile(e){
+ this.setData({
+ "form.familyInfoDto.dependantMobile": e.detail.value
+ })
+ }
+ //**拓展信息end */
})
\ No newline at end of file
diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml
index 02c6543..ad58528 100644
--- a/subpages/addResi/pages/addResi/addResi.wxml
+++ b/subpages/addResi/pages/addResi/addResi.wxml
@@ -2,8 +2,8 @@
-
-
+
+
选择居住房屋{{indexP+1}}
@@ -41,7 +41,7 @@
所在楼栋
-
+
{{form.resideInfoDtos[indexP].buildingName ? form.resideInfoDtos[indexP].buildingName : '请选择'}}
@@ -55,7 +55,7 @@
所在单元
-
+
{{form.resideInfoDtos[indexP].unitName ? form.resideInfoDtos[indexP].unitName : '请选择'}}
@@ -82,7 +82,7 @@
人房关系
-
+
{{form.resideInfoDtos[indexP].resiHouseRelName ? form.resideInfoDtos[indexP].resiHouseRelName : '请选择'}}
@@ -96,7 +96,7 @@
与户主关系
-
+
{{form.resideInfoDtos[indexP].houseHolderRelName ? form.resideInfoDtos[indexP].houseHolderRelName : '请选择'}}
@@ -104,14 +104,13 @@
-
+
户籍所在地
-
-
+
@@ -120,18 +119,16 @@
现居住地址
-
-
+
- *
迁出时间
-
+
{{form.resideInfoDtos[indexP].outOfTime ? form.resideInfoDtos[indexP].outOfTime : '请选择'}}
@@ -140,8 +137,8 @@
-
-
+
+
@@ -149,13 +146,16 @@
+
+ 基础信息登记
+
*
姓名
-
+
@@ -165,9 +165,9 @@
证件类型
-
+
- {{genderName ? genderName : '请选择'}}
+ {{idTypeName ? idTypeName : '请选择'}}
@@ -180,8 +180,7 @@
证件号
-
-
+
@@ -191,9 +190,9 @@
国籍
-
-
- {{genderName ? genderName : '请选择'}}
+
+
+ {{nationalityName ? nationalityName : '请选择'}}
@@ -218,8 +217,8 @@
性别
-
-
+
+
{{genderName ? genderName : '请选择'}}
@@ -247,9 +246,9 @@
民族
-
-
- {{form.nation ? nation[form.nation].label : '请选择'}}
+
+
+ {{form.baseInfoDto.nation ? dicts.nationList[form.baseInfoDto.nation].label : '请选择'}}
@@ -260,9 +259,9 @@
文化程度
-
+
- {{form.eduInfoDto.cultureLevel ? education[form.eduInfoDto.cultureLevel].label : '请选择'}}
+ {{form.eduInfoDto.cultureLevel ? dicts.educationList[form.eduInfoDto.cultureLevel].label : '请选择'}}
@@ -273,8 +272,8 @@
婚姻状况
-
-
+
+
{{marriageName ? marriageName : '请选择'}}
@@ -286,9 +285,9 @@
配偶情况
-
-
- {{marriageName ? marriageName : '请选择'}}
+
+
+ {{spouseSituationName ? spouseSituationName : '请选择'}}
@@ -300,7 +299,7 @@
籍贯
-
+
@@ -309,9 +308,9 @@
本地户籍
-
-
- {{marriageName ? marriageName : '请选择'}}
+
+
+ {{form.baseInfoDto.localResidenceFlag ?dicts.binaryOptionList[form.baseInfoDto.localResidenceFlag].label : '请选择'}}
@@ -320,25 +319,26 @@
+
+ 拓展信息登记
+
-
宗教信仰
-
+
-
就业状态
-
-
- {{genderName ? genderName : '请选择'}}
+
+
+ {{careerStatusName ? careerStatusName : '请选择'}}
@@ -350,7 +350,7 @@
工作单位
-
+
@@ -359,7 +359,7 @@
职业
-
+
@@ -368,7 +368,7 @@
月收入
-
+
@@ -377,7 +377,7 @@
原工作单位
-
+
@@ -387,9 +387,9 @@
失业时间
-
-
- {{form.birthday ? form.birthday : '请选择'}}
+
+
+ {{form.unemployedDto.unemploymentTime ? form.unemployedDto.unemploymentTime : '请选择'}}
@@ -401,7 +401,7 @@
失业证号
-
+
@@ -410,9 +410,9 @@
失业原因
-
-
- {{genderName ? genderName : '请选择'}}
+
+
+ {{unemploymentReasonName ? unemploymentReasonName : '请选择'}}
@@ -424,7 +424,7 @@
再就业优惠证号
-
+
@@ -433,7 +433,7 @@
技术特长
-
+
@@ -442,7 +442,7 @@
是否领取失业金
-
+
是
否
@@ -454,7 +454,7 @@
是否就业困难对象
-
+
是
否
@@ -466,9 +466,9 @@
劳动就业愿望
-
-
- {{genderName ? genderName : '请选择'}}
+
+
+ {{employmentWishName ? employmentWishName : '请选择'}}
@@ -486,38 +486,65 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 与赡养人关系
+
+
+
+
+ {{elderlyRelationName ? elderlyRelationName : '请选择'}}
+
+
+
+
+
+
+
+ 赡养人联系电话
+
+
+
+
+
+
+
+
+
+ 人员标签
+
+
+
+ 政治面貌
+
+
+
+ 群众
+ 党员
+ 共青团员
+
+
+
+
+
+
+ 健康状况
+
+
+
+ 残疾
+
+
+
+ 是
+ 否
+
+
+
+
+
+
diff --git a/subpages/addResi/pages/addResi/addResi.wxss b/subpages/addResi/pages/addResi/addResi.wxss
index f1da2d6..8e6ee3f 100644
--- a/subpages/addResi/pages/addResi/addResi.wxss
+++ b/subpages/addResi/pages/addResi/addResi.wxss
@@ -86,7 +86,7 @@ page {
.form_card .form_item{
display: flex;
align-items: center;
- border-bottom: 1px solid #EAEAEA;
+ border-top: 1px solid #EAEAEA;
height: 100rpx;
}
.form_card .form_item .label{
@@ -135,6 +135,7 @@ page {
width: 100%;
display: flex;
justify-content: space-around;
+ align-items: center;
}
.bot_btn{
display: flex;
diff --git a/subpages/searchResult/pages/searchResult/searchResult.js b/subpages/searchResult/pages/searchResult/searchResult.js
index 0bee7e4..ade6e01 100644
--- a/subpages/searchResult/pages/searchResult/searchResult.js
+++ b/subpages/searchResult/pages/searchResult/searchResult.js
@@ -1,5 +1,5 @@
// subpages/searchResult/pages/searchResult/searchResult.js
-import {getCommunityHouse,getResidentBaseInfo} from "../../../../utils/api"
+import {getCommunityHouse,getResidentBaseInfoPage} from "../../../../utils/api"
const app = getApp()
Page({
@@ -91,12 +91,12 @@ Page({
loadMoreType: "more",
})
let parm ={
- searchKey:this.data.keyWord,
+ name:this.data.keyWord,
pageSize:this.data.pageSize,
pageNo:this.data.pageNo
}
if(this.data.type == 'resi'){
- getResidentBaseInfo(parm).then(res=>{
+ getResidentBaseInfoPage(parm).then(res=>{
this.setData({
loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
tableData: this.data.tableData.concat(res.data.list),