|
@@ -35,9 +35,21 @@ Page({
|
|
}
|
|
}
|
|
],
|
|
],
|
|
nameArr: [],
|
|
nameArr: [],
|
|
|
|
+ oldCard: [{
|
|
|
|
+ name: false
|
|
|
|
+ }],
|
|
|
|
+ oldCard1: [{
|
|
|
|
+ name: false
|
|
|
|
+ }],
|
|
|
|
+ oldCard2: [{
|
|
|
|
+ name: false
|
|
|
|
+ }],
|
|
// tab1老人信息
|
|
// tab1老人信息
|
|
oldInfo: [{
|
|
oldInfo: [{
|
|
name: '',
|
|
name: '',
|
|
|
|
+ isSameWithAddress: [{
|
|
|
|
+ name: '现居地址与户籍地址一致'
|
|
|
|
+ }],
|
|
oldSex: [{
|
|
oldSex: [{
|
|
name: '男'
|
|
name: '男'
|
|
}, {
|
|
}, {
|
|
@@ -547,8 +559,20 @@ Page({
|
|
},
|
|
},
|
|
success: (res) => {
|
|
success: (res) => {
|
|
if (res.data.code == 0) {
|
|
if (res.data.code == 0) {
|
|
|
|
+ this.data.oldCard.push({
|
|
|
|
+ name: false
|
|
|
|
+ })
|
|
|
|
+ this.data.oldCard1.push({
|
|
|
|
+ name: false
|
|
|
|
+ })
|
|
|
|
+ this.data.oldCard2.push({
|
|
|
|
+ name: false
|
|
|
|
+ })
|
|
this.data.oldInfo.push({
|
|
this.data.oldInfo.push({
|
|
name: this.data.addOldname1,
|
|
name: this.data.addOldname1,
|
|
|
|
+ isSameWithAddress: [{
|
|
|
|
+ name: '现居地址与户籍地址一致'
|
|
|
|
+ }],
|
|
oldSex: [{
|
|
oldSex: [{
|
|
name: '男'
|
|
name: '男'
|
|
}, {
|
|
}, {
|
|
@@ -558,7 +582,7 @@ Page({
|
|
idNumber: '',
|
|
idNumber: '',
|
|
phone: '',
|
|
phone: '',
|
|
chooseAdressArr: [],
|
|
chooseAdressArr: [],
|
|
- chooseAdressArr1: [],
|
|
|
|
|
|
+ chooseAdressArr1: [],
|
|
oldMarry: [{
|
|
oldMarry: [{
|
|
name: "未婚"
|
|
name: "未婚"
|
|
}, {
|
|
}, {
|
|
@@ -1112,33 +1136,55 @@ Page({
|
|
// 身份证号
|
|
// 身份证号
|
|
tab1Change4: function (e) {
|
|
tab1Change4: function (e) {
|
|
console.log('身份证变化了')
|
|
console.log('身份证变化了')
|
|
|
|
+ let Info = 'oldCard[' + this.data.activeIndex + '].name'
|
|
|
|
+ let Info1 = 'oldCard1[' + this.data.activeIndex + '].name'
|
|
if (e.detail.value == null || e.detail.value == '') {
|
|
if (e.detail.value == null || e.detail.value == '') {
|
|
this.setData({
|
|
this.setData({
|
|
- oldCard: true,
|
|
|
|
- oldCard1: false
|
|
|
|
|
|
+ [Info]: true
|
|
})
|
|
})
|
|
return
|
|
return
|
|
} else {
|
|
} else {
|
|
this.setData({
|
|
this.setData({
|
|
- oldCard: false
|
|
|
|
|
|
+ [Info]: false
|
|
})
|
|
})
|
|
}
|
|
}
|
|
if (!(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(e.detail.value)) && e.detail.value.length != 18) {
|
|
if (!(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(e.detail.value)) && e.detail.value.length != 18) {
|
|
this.setData({
|
|
this.setData({
|
|
- oldCard1: true
|
|
|
|
|
|
+ [Info1]: true
|
|
})
|
|
})
|
|
return
|
|
return
|
|
} else {
|
|
} else {
|
|
this.setData({
|
|
this.setData({
|
|
- oldCard1: false
|
|
|
|
|
|
+ [Info1]: false
|
|
})
|
|
})
|
|
- let idNumber = 'oldInfo[' + this.data.activeIndex + '].idNumber'
|
|
|
|
|
|
+ }
|
|
|
|
+ this.IdCard(e.detail.value)
|
|
|
|
+ let idNumber = 'oldInfo[' + this.data.activeIndex + '].idNumber'
|
|
|
|
+ this.setData({
|
|
|
|
+ [idNumber]: e.detail.value
|
|
|
|
+ })
|
|
|
|
+ this.SubmitOldmanInfo({
|
|
|
|
+ id: this.data.nameArr[this.data.activeIndex]._id,
|
|
|
|
+ idNumber: e.detail.value
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ IdCard(UUserCard) {
|
|
|
|
+ //获取年龄
|
|
|
|
+ let Info2 = 'oldCard2[' + this.data.activeIndex + '].name'
|
|
|
|
+ var myDate = new Date();
|
|
|
|
+ var month = myDate.getMonth() + 1;
|
|
|
|
+ var day = myDate.getDate();
|
|
|
|
+ var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
|
|
|
|
+ if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
|
|
|
|
+ age++;
|
|
|
|
+ }
|
|
|
|
+ if (age < 60) {
|
|
this.setData({
|
|
this.setData({
|
|
- [idNumber]: e.detail.value
|
|
|
|
|
|
+ [Info2]: true
|
|
})
|
|
})
|
|
- this.SubmitOldmanInfo({
|
|
|
|
- id: this.data.nameArr[this.data.activeIndex]._id,
|
|
|
|
- idNumber: e.detail.value
|
|
|
|
|
|
+ }else{
|
|
|
|
+ this.setData({
|
|
|
|
+ [Info2]: false
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -1169,27 +1215,45 @@ Page({
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- // 补充户籍地址
|
|
|
|
- tab1Change6(e) {
|
|
|
|
- console.log(e.detail.value)
|
|
|
|
|
|
+ // 补充户籍地址
|
|
|
|
+ tab1Change6(e) {
|
|
|
|
+ console.log(e.detail.value)
|
|
|
|
+ this.SubmitOldmanInfo({
|
|
|
|
+ id: this.data.nameArr[this.data.activeIndex]._id,
|
|
|
|
+ nativePlaceExt: e.detail.value
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ // 现居地址与户籍地址一致
|
|
|
|
+ tab1change6_1(e) {
|
|
|
|
+ console.log(e.detail.value)
|
|
|
|
+ let Info = 'oldInfo[' + this.data.activeIndex + '].chooseAdressArr1'
|
|
|
|
+ if (e.detail.value[0] == '现居地址与户籍地址一致') {
|
|
this.SubmitOldmanInfo({
|
|
this.SubmitOldmanInfo({
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
- nativePlaceExt: e.detail.value
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
- // 现居地址与户籍地址一致
|
|
|
|
- tab1change6_1(e) {
|
|
|
|
- console.log(e)
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- // 补充现居住地址
|
|
|
|
- tab1Change7(e) {
|
|
|
|
- console.log(e.detail.value)
|
|
|
|
|
|
+ isSameWithAddress: '是'
|
|
|
|
+ })
|
|
|
|
+ this.setData({
|
|
|
|
+ [Info]: this.data.oldInfo[this.data.activeIndex].chooseAdressArr,
|
|
|
|
+ })
|
|
|
|
+ } else {
|
|
this.SubmitOldmanInfo({
|
|
this.SubmitOldmanInfo({
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
- addressExt: e.detail.value
|
|
|
|
|
|
+ isSameWithAddress: '否'
|
|
|
|
+ })
|
|
|
|
+ this.setData({
|
|
|
|
+ [Info]: null
|
|
})
|
|
})
|
|
- },
|
|
|
|
|
|
+ console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr1)
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ // 补充现居住地址
|
|
|
|
+ tab1Change7(e) {
|
|
|
|
+ console.log(e.detail.value)
|
|
|
|
+ this.SubmitOldmanInfo({
|
|
|
|
+ id: this.data.nameArr[this.data.activeIndex]._id,
|
|
|
|
+ addressExt: e.detail.value
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 婚姻以及配偶情况
|
|
// 婚姻以及配偶情况
|
|
tab1Change8: function (e) {
|
|
tab1Change8: function (e) {
|
|
console.log(e.detail.value)
|
|
console.log(e.detail.value)
|
|
@@ -2590,17 +2654,9 @@ Page({
|
|
regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
|
|
regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
|
|
})
|
|
})
|
|
},
|
|
},
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
formSubmit(e) {
|
|
formSubmit(e) {
|
|
console.log('form发生了submit事件,携带数据为:', e.detail.value)
|
|
console.log('form发生了submit事件,携带数据为:', e.detail.value)
|
|
},
|
|
},
|
|
- chooseAdress() {
|
|
|
|
- this.setData({
|
|
|
|
- adressShow: true
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
removeExcess(data) {
|
|
removeExcess(data) {
|
|
if (data) {
|
|
if (data) {
|
|
data = JSON.parse(data);
|
|
data = JSON.parse(data);
|
|
@@ -2615,14 +2671,16 @@ Page({
|
|
this.setData({
|
|
this.setData({
|
|
showBj: false,
|
|
showBj: false,
|
|
showBj1: false,
|
|
showBj1: false,
|
|
|
|
+ showAdress: false,
|
|
|
|
+ showAdress1: false,
|
|
nameArr: [],
|
|
nameArr: [],
|
|
activeIndex: 0,
|
|
activeIndex: 0,
|
|
familyFid: id,
|
|
familyFid: id,
|
|
color: 'transparent',
|
|
color: 'transparent',
|
|
})
|
|
})
|
|
- console.log(this.data.showBj , "关闭提示添加");
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ console.log(this.data.showBj, "关闭提示添加");
|
|
|
|
+
|
|
|
|
+
|
|
var that = this;
|
|
var that = this;
|
|
wx.request({
|
|
wx.request({
|
|
url: util.globalData.publicUrl + '/wxinfo/listByFid',
|
|
url: util.globalData.publicUrl + '/wxinfo/listByFid',
|
|
@@ -2682,24 +2740,6 @@ Page({
|
|
name: "女"
|
|
name: "女"
|
|
}];
|
|
}];
|
|
let abc = data.map(item => {
|
|
let abc = data.map(item => {
|
|
- let visitWays = [{
|
|
|
|
- name: '电话问候'
|
|
|
|
- }, {
|
|
|
|
- name: '上门巡访'
|
|
|
|
- }, {
|
|
|
|
- name: '其它'
|
|
|
|
- }];
|
|
|
|
- let visitTimes = [{
|
|
|
|
- name: '每天'
|
|
|
|
- }, {
|
|
|
|
- name: '每周'
|
|
|
|
- }, {
|
|
|
|
- name: '每月'
|
|
|
|
- }, {
|
|
|
|
- name: '每季'
|
|
|
|
- }, {
|
|
|
|
- name: '其它'
|
|
|
|
- }];
|
|
|
|
let otherInfo = ''
|
|
let otherInfo = ''
|
|
let imgPath = ''
|
|
let imgPath = ''
|
|
if (item.photo) {
|
|
if (item.photo) {
|
|
@@ -2923,8 +2963,6 @@ Page({
|
|
if (item.oldType.includes("失能老人")) {
|
|
if (item.oldType.includes("失能老人")) {
|
|
oldTypeArr[7].checked = true;
|
|
oldTypeArr[7].checked = true;
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
disabilityAyyss.forEach(itemss => {
|
|
disabilityAyyss.forEach(itemss => {
|
|
item.disabilityCategory.forEach(item => {
|
|
item.disabilityCategory.forEach(item => {
|
|
if (itemss.name == item) {
|
|
if (itemss.name == item) {
|
|
@@ -2947,6 +2985,7 @@ Page({
|
|
}
|
|
}
|
|
})
|
|
})
|
|
})
|
|
})
|
|
|
|
+
|
|
loveRequire.forEach(itemss => {
|
|
loveRequire.forEach(itemss => {
|
|
item.demand.forEach(item => {
|
|
item.demand.forEach(item => {
|
|
if (itemss.name == item) {
|
|
if (itemss.name == item) {
|
|
@@ -2954,6 +2993,26 @@ Page({
|
|
}
|
|
}
|
|
})
|
|
})
|
|
})
|
|
})
|
|
|
|
+ let chooseAdressArr = [];
|
|
|
|
+ let chooseAdressArr1 = [];
|
|
|
|
+ if (item.nativePlace && item.nativePlaceId) {
|
|
|
|
+ let nativePlaces = item.nativePlace.split('/');
|
|
|
|
+ let nativePlaceId = item.nativePlaceId.split(',');
|
|
|
|
+ chooseAdressArr = nativePlaces.map((item, i) => ({
|
|
|
|
+ CIVILREGIONALISMNAME: item,
|
|
|
|
+ CIVILREGIONALISMID: nativePlaceId[i]
|
|
|
|
+ }));
|
|
|
|
+ }
|
|
|
|
+ if (item.address && item.nativePlaceId) {
|
|
|
|
+ let address = item.address.split('/');
|
|
|
|
+ let addressId = item.addressId.split(',');
|
|
|
|
+ chooseAdressArr1 = address.map((item, i) => ({
|
|
|
|
+ CIVILREGIONALISMNAME: item,
|
|
|
|
+ CIVILREGIONALISMID: addressId[i]
|
|
|
|
+ }));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
return {
|
|
return {
|
|
...item,
|
|
...item,
|
|
oldSex: oldSex.map(items => {
|
|
oldSex: oldSex.map(items => {
|
|
@@ -3013,7 +3072,9 @@ Page({
|
|
liveStatus: accompanyArr,
|
|
liveStatus: accompanyArr,
|
|
oftenMan: lookAfterArr,
|
|
oftenMan: lookAfterArr,
|
|
loveRequire: loveRequire,
|
|
loveRequire: loveRequire,
|
|
- oldType: oldTypeArr
|
|
|
|
|
|
+ oldType: oldTypeArr,
|
|
|
|
+ chooseAdressArr: chooseAdressArr,
|
|
|
|
+ chooseAdressArr1: chooseAdressArr1,
|
|
}
|
|
}
|
|
})
|
|
})
|
|
let def = data.map(item => {
|
|
let def = data.map(item => {
|
|
@@ -3324,7 +3385,6 @@ Page({
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
console.log("我是没有fid的");
|
|
console.log("我是没有fid的");
|
|
-
|
|
|
|
let oldInfo = [{
|
|
let oldInfo = [{
|
|
name: '',
|
|
name: '',
|
|
oldSex: [{
|
|
oldSex: [{
|
|
@@ -3332,11 +3392,14 @@ Page({
|
|
}, {
|
|
}, {
|
|
name: '女'
|
|
name: '女'
|
|
}],
|
|
}],
|
|
|
|
+ isSameWithAddress: [{
|
|
|
|
+ name: '现居地址与户籍地址一致'
|
|
|
|
+ }],
|
|
nation: '', //民族
|
|
nation: '', //民族
|
|
idNumber: '', //身份证号
|
|
idNumber: '', //身份证号
|
|
phone: '',
|
|
phone: '',
|
|
chooseAdressArr: [],
|
|
chooseAdressArr: [],
|
|
- chooseAdressArr1: [],
|
|
|
|
|
|
+ chooseAdressArr1: [],
|
|
oldMarry: [{
|
|
oldMarry: [{
|
|
name: "未婚"
|
|
name: "未婚"
|
|
}, {
|
|
}, {
|
|
@@ -3591,6 +3654,8 @@ Page({
|
|
}]
|
|
}]
|
|
this.setData({
|
|
this.setData({
|
|
showBj: true,
|
|
showBj: true,
|
|
|
|
+ showAdress: false,
|
|
|
|
+ showAdress1: false,
|
|
nameArr: [],
|
|
nameArr: [],
|
|
oldInfo: oldInfo,
|
|
oldInfo: oldInfo,
|
|
childInfo: childInfo,
|
|
childInfo: childInfo,
|
|
@@ -3603,6 +3668,7 @@ Page({
|
|
|
|
|
|
},
|
|
},
|
|
chooseAdress() {
|
|
chooseAdress() {
|
|
|
|
+ console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr)
|
|
if (this.data.oldInfo[this.data.activeIndex].chooseAdressArr.length == 0) {
|
|
if (this.data.oldInfo[this.data.activeIndex].chooseAdressArr.length == 0) {
|
|
wx.request({
|
|
wx.request({
|
|
url: util.globalData.publicUrl + '/civilregionalism/deptList',
|
|
url: util.globalData.publicUrl + '/civilregionalism/deptList',
|
|
@@ -3615,6 +3681,7 @@ Page({
|
|
showAdress: true,
|
|
showAdress: true,
|
|
provinceArr: res.data.data
|
|
provinceArr: res.data.data
|
|
})
|
|
})
|
|
|
|
+ console.log(this.data.provinceArr)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -3672,9 +3739,17 @@ Page({
|
|
})
|
|
})
|
|
}
|
|
}
|
|
if (this.data.oldInfo[this.data.activeIndex].chooseAdressArr.length == 5) {
|
|
if (this.data.oldInfo[this.data.activeIndex].chooseAdressArr.length == 5) {
|
|
|
|
+ let nativePlaceId = '';
|
|
|
|
+ let nativePlace = '';
|
|
|
|
+ for (let value of this.data.oldInfo[this.data.activeIndex].chooseAdressArr) {
|
|
|
|
+ nativePlace += value.CIVILREGIONALISMNAME + '/'
|
|
|
|
+ nativePlaceId += value.CIVILREGIONALISMID + ','
|
|
|
|
+ console.log(value, "打印下");
|
|
|
|
+ }
|
|
this.SubmitOldmanInfo({
|
|
this.SubmitOldmanInfo({
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
- // childInfo: JSON.stringify(this.data.childInfo[this.data.activeIndex].Info)
|
|
|
|
|
|
+ nativePlace: nativePlace.substring(0, nativePlace.length - 1),
|
|
|
|
+ nativePlaceId: nativePlaceId.substring(0, nativePlaceId.length - 1),
|
|
})
|
|
})
|
|
}
|
|
}
|
|
console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr, '我是添加的数组')
|
|
console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr, '我是添加的数组')
|
|
@@ -3711,12 +3786,20 @@ Page({
|
|
})
|
|
})
|
|
}
|
|
}
|
|
if (this.data.oldInfo[this.data.activeIndex].chooseAdressArr1.length == 5) {
|
|
if (this.data.oldInfo[this.data.activeIndex].chooseAdressArr1.length == 5) {
|
|
|
|
+ let addressId = '';
|
|
|
|
+ let address = '';
|
|
|
|
+ for (let value of this.data.oldInfo[this.data.activeIndex].chooseAdressArr1) {
|
|
|
|
+ address += value.CIVILREGIONALISMNAME + '/'
|
|
|
|
+ addressId += value.CIVILREGIONALISMID + ','
|
|
|
|
+ console.log(value, "打印下");
|
|
|
|
+ }
|
|
this.SubmitOldmanInfo({
|
|
this.SubmitOldmanInfo({
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
- // childInfo: JSON.stringify(this.data.childInfo[this.data.activeIndex].Info)
|
|
|
|
|
|
+ address: address.substring(0, address.length - 1),
|
|
|
|
+ addressId: addressId.substring(0, addressId.length - 1),
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr, '我是添加的数组')
|
|
|
|
|
|
+ console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr1, '我是添加的数组')
|
|
wx.hideLoading()
|
|
wx.hideLoading()
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -3861,8 +3944,8 @@ Page({
|
|
this.setData({
|
|
this.setData({
|
|
showBj: false
|
|
showBj: false
|
|
})
|
|
})
|
|
- console.log(this.data.showBj , "我关闭页面隐藏属性");
|
|
|
|
-
|
|
|
|
|
|
+ console.log(this.data.showBj, "我关闭页面隐藏属性");
|
|
|
|
+
|
|
},
|
|
},
|
|
//获取位置
|
|
//获取位置
|
|
getSelfLocation: function (varSendOrgId) {
|
|
getSelfLocation: function (varSendOrgId) {
|