|
|
@@ -201,20 +201,33 @@ export default {
|
|
|
// let result = e.detail.value;
|
|
|
that.house.master = '';
|
|
|
that.house.area = '';
|
|
|
+
|
|
|
if (room)
|
|
|
{
|
|
|
searchType = 'houseRoom'
|
|
|
addressResult = hood + '/' + build + '/' + unit + '/' + room
|
|
|
}
|
|
|
if(build && unit && !room){
|
|
|
+ if (build === "请选择房号")
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
searchType = 'houseNumber'
|
|
|
addressResult = hood + '/' + build + '/' + unit
|
|
|
}
|
|
|
if(build && !unit){
|
|
|
+ if (build === "请选择单元")
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
searchType = 'houseUnit'
|
|
|
addressResult = hood + '/' + build
|
|
|
}
|
|
|
if(!build && !unit){
|
|
|
+ if (build === "请选择楼栋")
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
searchType = 'houseBuilding'
|
|
|
addressResult = hood
|
|
|
}
|
|
|
@@ -272,34 +285,47 @@ export default {
|
|
|
switch (type){
|
|
|
case 'houseBuilding':
|
|
|
that.buildList = [];
|
|
|
+
|
|
|
+ let c = {
|
|
|
+ name:'请选择楼栋'
|
|
|
+ }
|
|
|
+ that.buildList.push(c);
|
|
|
+
|
|
|
for (let key in obj) {
|
|
|
let child = {
|
|
|
name:obj[key]
|
|
|
}
|
|
|
that.buildList.push(child)
|
|
|
}
|
|
|
- that.searchDetail(that.hoodName,that.buildList[0].name)
|
|
|
+ //that.searchDetail(that.hoodName,that.buildList[0].name)
|
|
|
break;
|
|
|
case 'houseUnit':
|
|
|
that.unitList = [];
|
|
|
+ let uc = {
|
|
|
+ name:'请选择单元'
|
|
|
+ }
|
|
|
+ that.unitList.push(uc);
|
|
|
for (let key in obj) {
|
|
|
let child = {
|
|
|
name:obj[key]
|
|
|
}
|
|
|
that.unitList.push(child)
|
|
|
}
|
|
|
- that.searchDetail(that.hoodName,that.buildList[that.buildIndex].name,that.unitList[0].name)
|
|
|
+ //that.searchDetail(that.hoodName,that.buildList[that.buildIndex].name,that.unitList[0].name)
|
|
|
break;
|
|
|
case 'houseNumber':
|
|
|
that.numList = [];
|
|
|
+ let nc = {
|
|
|
+ name:'请选择房号'
|
|
|
+ }
|
|
|
+ that.numList.push(nc);
|
|
|
for (let key in obj) {
|
|
|
let child = {
|
|
|
name:obj[key]
|
|
|
}
|
|
|
that.numList.push(child)
|
|
|
}
|
|
|
- that.numList[that.numIndex].name = that.numList[0].name
|
|
|
- that.searchDetail(that.hoodName,that.buildList[that.buildIndex].name,that.unitList[that.unitIndex].name,that.numList[0].name);
|
|
|
+ //that.searchDetail(that.hoodName,that.buildList[that.buildIndex].name,that.unitList[that.unitIndex].name,that.numList[0].name);
|
|
|
break;
|
|
|
case 'houseRoom':
|
|
|
that.house.master = obj.name;
|