|
@@ -655,7 +655,7 @@ Page({
|
|
|
this.SubmitOldmanInfo({
|
|
|
id: this.data.nameArr[this.data.activeIndex]._id,
|
|
|
address: a,
|
|
|
- addressId:b
|
|
|
+ addressId: b
|
|
|
})
|
|
|
this.setData({
|
|
|
[arr]: this.data.oldInfo[this.data.activeIndex].chooseAdressArr1
|
|
@@ -3441,7 +3441,7 @@ Page({
|
|
|
}, {
|
|
|
name: "多重残疾"
|
|
|
}];
|
|
|
- let sickType = [{
|
|
|
+ let sickType = [{
|
|
|
name: "重大器官类疾病"
|
|
|
}, {
|
|
|
name: "心脑血管类疾病"
|
|
@@ -3676,16 +3676,16 @@ Page({
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
- if(item.majorDiseases[0]){
|
|
|
- let patorl = this.removeExcess(item.majorDiseases[0]);
|
|
|
- sickType.forEach(items => {
|
|
|
- patorl.forEach(itemss => {
|
|
|
- if (items.name == itemss) {
|
|
|
- items.checked = true;
|
|
|
- }
|
|
|
+ if (item.majorDiseases[0]) {
|
|
|
+ let patorl = this.removeExcess(item.majorDiseases[0]);
|
|
|
+ sickType.forEach(items => {
|
|
|
+ patorl.forEach(itemss => {
|
|
|
+ if (items.name == itemss) {
|
|
|
+ items.checked = true;
|
|
|
+ }
|
|
|
+ })
|
|
|
})
|
|
|
- })
|
|
|
- }
|
|
|
+ }
|
|
|
loveRequire.forEach(itemss => {
|
|
|
item.demand.forEach(item => {
|
|
|
if (itemss.name == item) {
|
|
@@ -3712,17 +3712,18 @@ Page({
|
|
|
// chooseAdressArr1 = [];
|
|
|
// }
|
|
|
// }
|
|
|
- if (item.nativePlace) {
|
|
|
- let patrol = this.removeExcess(item.nativePlace);
|
|
|
- console.log(patrol,"返回。。。。。。。。。。。。。。。。。。。。。。。。。。");
|
|
|
-
|
|
|
- chooseAdressArr = patrol;
|
|
|
+ if (item.nativePlace) {
|
|
|
+ let nativePlaces = item.nativePlace.split('/');
|
|
|
+ console.log(nativePlaces, "返回。。。。。。。。。。。。。。。。。。。。。。。。。。");
|
|
|
+ chooseAdressArr = nativePlaces;
|
|
|
+ console.log(chooseAdressArr);
|
|
|
+
|
|
|
if (item.isSameWithAddress == '是') {
|
|
|
isSameWithAddresss.forEach(item => {
|
|
|
item.checked = true;
|
|
|
})
|
|
|
chooseAdressArr1 = chooseAdressArr;
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
chooseAdressArr1 = [];
|
|
|
}
|
|
|
}
|
|
@@ -3734,13 +3735,13 @@ Page({
|
|
|
if (item.nativePlaceExt) {
|
|
|
nativePlaceExts = item.nativePlaceExt
|
|
|
}
|
|
|
- if (item.address ) {
|
|
|
- let patrol = this.removeExcess(item.address);
|
|
|
- chooseAdressArr1 = patrol;
|
|
|
+ if (item.address) {
|
|
|
+ let address = item.address.split('/')
|
|
|
+ chooseAdressArr1 = address;
|
|
|
}
|
|
|
return {
|
|
|
...item,
|
|
|
- sickType:sickType,
|
|
|
+ sickType: sickType,
|
|
|
oldSex: oldSex.map(items => {
|
|
|
if (items.name == item.sex) {
|
|
|
return {
|
|
@@ -4474,7 +4475,7 @@ Page({
|
|
|
} else {
|
|
|
console.log(value, "onLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoad");
|
|
|
this.chooseAdress();
|
|
|
- this.huixian1(value.id, value.name);
|
|
|
+ //this.huixian1(value.id, value.name);
|
|
|
}
|
|
|
},
|
|
|
huixian1(id, name) {
|