From c5c9afe5ea509698fa54b7fe436a2120c5e74483 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 30 Aug 2023 18:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=BF=E5=B1=8B=E5=B1=85?=
=?UTF-8?q?=E6=B0=91=E7=BA=A7=E8=81=94=E6=A1=86=E7=94=A8=E6=88=B7=E4=BD=93?=
=?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
subpages/addResi/pages/addResi/addResi.js | 42 +++++++++++++++-----
subpages/addResi/pages/addResi/addResi.wxml | 2 +-
subpages/addhouse/pages/addhouse/addhouse.js | 34 ++++++++++++++--
3 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index f7163c6..431a990 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/subpages/addResi/pages/addResi/addResi.js
@@ -402,6 +402,10 @@ Page({
this.setData({
'form.gridName': selectedVillage.label,
"form.gridId": selectedVillage.value,
+ 'form.villageId':'',
+ 'form.buildId':'',
+ 'form.unitId':'',
+ 'form.homeId':'',
villageName:'',
villageList:[],
buildingName:'',
@@ -435,7 +439,16 @@ Page({
this.setData({
villageName: selectedVillage.label,
- "form.villageId": selectedVillage.value
+ "form.villageId": selectedVillage.value,
+ 'form.buildId':'',
+ 'form.unitId':'',
+ 'form.homeId':'',
+ buildingName:'',
+ buildingList:[],
+ unitName:'',
+ unitList:[],
+ houseName:'',
+ houseList:[],
});
this.getBuildingoption(selectedVillage.value);
@@ -459,7 +472,13 @@ Page({
const selectedVillage = this.data.buildingList[selectedIndex];
this.setData({
buildingName: selectedVillage.label,
- "form.buildId": selectedVillage.value
+ "form.buildId": selectedVillage.value,
+ 'form.unitId':'',
+ 'form.homeId':'',
+ unitName:'',
+ unitList:[],
+ houseName:'',
+ houseList:[],
});
this.getUnitoption(selectedVillage.value);
}
@@ -470,7 +489,7 @@ Page({
const unitName = this.data.unitList.filter(item => item.value == id)[0].label;
this.setData({
unitName: unitName,
- "form.unitId": id
+ "form.unitId": id,
});
this.getHouseoption(id);
this.setData({
@@ -481,15 +500,13 @@ Page({
const selectedVillage = this.data.unitList[selectedIndex];
this.setData({
unitName: selectedVillage.label,
- "form.unitId": selectedVillage.value
+ "form.unitId": selectedVillage.value,
+ 'form.homeId':'',
+ houseName:'',
+ houseList:[],
});
this.getHouseoption(selectedVillage.value);
}
- // this.setData({
- // unitName:this.data.unitList[e.detail.value].label,
- // "form.unitId" :this.data.unitList[e.detail.value].value
- // })
- // this.getHouseoption(this.data.unitList[e.detail.value].value)
},
bindPickerChangeHouse(e){
if (this.data.isFirstLoadHouse) {
@@ -714,5 +731,10 @@ Page({
wx.navigateBack({
delta: 1
})
- },
+ },
+ handelJump(){
+ wx.navigateTo({
+ url: '/subpages/addhouse/pages/addhouse/addhouse',
+ })
+ }
})
\ No newline at end of file
diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml
index 6433812..cb5a9a3 100644
--- a/subpages/addResi/pages/addResi/addResi.wxml
+++ b/subpages/addResi/pages/addResi/addResi.wxml
@@ -84,7 +84,7 @@
- 选项中如无该房屋,请先 新增房屋
+ 选项中如无该房屋,请先 新增房屋
diff --git a/subpages/addhouse/pages/addhouse/addhouse.js b/subpages/addhouse/pages/addhouse/addhouse.js
index 0aa6faf..d491645 100644
--- a/subpages/addhouse/pages/addhouse/addhouse.js
+++ b/subpages/addhouse/pages/addhouse/addhouse.js
@@ -277,6 +277,11 @@ Page({
this.setData({
gridName:selectedVillage.label,
gridId:selectedVillage.value,
+ 'form.neighborHoodId':'',
+ 'form.buildingId':'',
+ 'form.buildingUnitId':'',
+ 'form.doorName':'',
+ 'form.coding':'',
neighborHoodIdName:'',
neighborHoodIdList:[],
buildingName:'',
@@ -309,7 +314,17 @@ Page({
this.setData({
neighborHoodIdName: selectedVillage.label,
- "form.neighborHoodId": selectedVillage.value
+ "form.neighborHoodId": selectedVillage.value,
+ 'form.buildingId':'',
+ 'form.buildingUnitId':'',
+ 'form.doorName':'',
+ 'form.coding':'',
+ buildingName:'',
+ buildingList:[],
+ unitName:'',
+ unitList:[],
+ doorName:'',
+ houseList:[],
});
this.getBuildingoption(selectedVillage.value);
@@ -333,7 +348,14 @@ Page({
const selectedVillage = this.data.buildingList[selectedIndex];
this.setData({
buildingName: selectedVillage.label,
- "form.buildingId": selectedVillage.value
+ "form.buildingId": selectedVillage.value,
+ 'form.buildingUnitId':'',
+ 'form.doorName':'',
+ 'form.coding':'',
+ unitName:'',
+ unitList:[],
+ doorName:'',
+ houseList:[],
});
this.getUnitoption(selectedVillage.value);
}
@@ -344,7 +366,8 @@ Page({
const unitName = this.data.unitList.filter(item => item.value == id)[0].label;
this.setData({
unitName: unitName,
- "form.buildingUnitId": id
+ "form.buildingUnitId": id,
+
});
this.getHouseoption(id);
this.setData({
@@ -355,7 +378,10 @@ Page({
const selectedVillage = this.data.unitList[selectedIndex];
this.setData({
unitName: selectedVillage.label,
- "form.buildingUnitId": selectedVillage.value
+ "form.buildingUnitId": selectedVillage.value,
+ 'form.doorName':'',
+ 'form.coding':'',
+ doorName:'',
});
this.getHouseoption(selectedVillage.value);
}