Browse Source

无房屋选不了

dev
wangyx 1 month ago
parent
commit
121db33bf3
  1. 31
      pagesA/sdPage/dfReport.vue
  2. 43
      pagesA/sdPage/sfReport.vue

31
pagesA/sdPage/dfReport.vue

@ -52,11 +52,7 @@
:value="multiIndex" :value="multiIndex"
:range="multiArray" :range="multiArray"
> >
<view class="uni-input">{{ <view class="uni-input">{{pickerDisplay}}</view>
multiArray[0][multiIndex[0]] +
multiArray[1][multiIndex[1]] +
multiArray[2][multiIndex[2]]
}}</view>
</picker> </picker>
</view> </view>
<view v-else @click="handleShowToast" style="color: #cbcbcb" <view v-else @click="handleShowToast" style="color: #cbcbcb"
@ -87,7 +83,6 @@
</view> </view>
<u-input <u-input
v-model="item.electricMeterNumber" v-model="item.electricMeterNumber"
type="digit"
placeholder="请输入电表号" placeholder="请输入电表号"
border="none" border="none"
:disabled="item.isSystemElectricMeterNumber" :disabled="item.isSystemElectricMeterNumber"
@ -278,6 +273,14 @@ export default {
this.getTree(); this.getTree();
// this.initMeterReadingTime(); // this.initMeterReadingTime();
}, },
computed: {
pickerDisplay() {
const a = this.multiArray?.[0]?.[this.multiIndex?.[0]] || ''
const b = this.multiArray?.[1]?.[this.multiIndex?.[1]] || ''
const c = (this.multiArray?.[2]?.length > 0) ? (this.multiArray[2][this.multiIndex?.[2]] || '') : ''
return [a, b, c].filter(Boolean).join('')
}
},
methods: { methods: {
// //
initMeterReadingTime() { initMeterReadingTime() {
@ -388,10 +391,12 @@ export default {
const houseArray = await this.getListByParentId("4", unitArray[0].id); const houseArray = await this.getListByParentId("4", unitArray[0].id);
// //
if (!houseArray || houseArray.length === 0) { // if (!houseArray || houseArray.length === 0) {
console.warn("未获取到户信息"); // console.warn("");
return; // return;
} // }
if(houseArray.length > 0 && houseArray[0]){
this.houseOptions = houseArray; this.houseOptions = houseArray;
const houseNames = houseArray.map((item) => item.name); const houseNames = houseArray.map((item) => item.name);
this.blockForm.houseId = houseArray[0].id; this.blockForm.houseId = houseArray[0].id;
@ -407,7 +412,11 @@ export default {
// fileList: [], // fileList: [],
// }); // });
// } // }
this.multiArray = [buildingNames, unitNames, houseNames]; this.multiArray = [buildingNames, unitNames, houseNames];
}else {
this.houseOptions = [];
this.multiArray = [buildingNames, unitNames, []];
}
if (this.energyMeterConfig == 1) { if (this.energyMeterConfig == 1) {
this.getHouseInfoBy(this.blockForm.houseId); this.getHouseInfoBy(this.blockForm.houseId);
} else if (this.energyMeterConfig == 2) { } else if (this.energyMeterConfig == 2) {

43
pagesA/sdPage/sfReport.vue

@ -52,11 +52,7 @@
:value="multiIndex" :value="multiIndex"
:range="multiArray" :range="multiArray"
> >
<view class="uni-input">{{ <view class="uni-input">{{pickerDisplay}}</view>
multiArray[0][multiIndex[0]] +
multiArray[1][multiIndex[1]] +
multiArray[2][multiIndex[2]]
}}</view>
</picker> </picker>
</view> </view>
<view v-else @click="handleShowToast" style="color: #cbcbcb" <view v-else @click="handleShowToast" style="color: #cbcbcb"
@ -82,7 +78,6 @@
</view> </view>
<u-input <u-input
v-model="item.waterMeterNumber" v-model="item.waterMeterNumber"
type="digit"
placeholder="请输入水表号" placeholder="请输入水表号"
border="none" border="none"
:disabled="item.isSystemWaterMeterNumber" :disabled="item.isSystemWaterMeterNumber"
@ -260,6 +255,14 @@ export default {
immediate: true, immediate: true,
}, },
}, },
computed: {
pickerDisplay() {
const a = this.multiArray?.[0]?.[this.multiIndex?.[0]] || ''
const b = this.multiArray?.[1]?.[this.multiIndex?.[1]] || ''
const c = (this.multiArray?.[2]?.length > 0) ? (this.multiArray[2][this.multiIndex?.[2]] || '') : ''
return [a, b, c].filter(Boolean).join('')
}
},
onLoad() { onLoad() {
this.getTree(); this.getTree();
}, },
@ -330,13 +333,13 @@ export default {
// //
const houseArray = await this.getListByParentId("4", unitArray[0].id); const houseArray = await this.getListByParentId("4", unitArray[0].id);
if (!houseArray || houseArray.length === 0) { // if (!houseArray || houseArray.length === 0) {
console.warn("未获取到户信息"); // console.warn("");
return; // return;
} // }
if(houseArray.length > 0 && houseArray[0]){
this.houseOptions = houseArray; this.houseOptions = houseArray;
const houseNames = houseArray.map((item) => item.name); const houseNames = houseArray.map((item) => item.name);
this.blockForm.houseId = houseArray[0].id; this.blockForm.houseId = houseArray[0].id;
this.waterMeterConfig = houseArray[0].waterMeterConfig; this.waterMeterConfig = houseArray[0].waterMeterConfig;
@ -344,6 +347,13 @@ export default {
let house = houseArray[0]; let house = houseArray[0];
this.multiArray = [buildingNames, unitNames, houseNames]; this.multiArray = [buildingNames, unitNames, houseNames];
}else {
this.houseOptions = [];
this.multiArray = [buildingNames, unitNames, []];
}
console.log(this.multiArray,"this.multiArray11");
if (this.waterMeterConfig == 1) { if (this.waterMeterConfig == 1) {
this.getHouseInfoBy(this.blockForm.houseId); this.getHouseInfoBy(this.blockForm.houseId);
} else if (this.waterMeterConfig == 2) { } else if (this.waterMeterConfig == 2) {
@ -371,6 +381,8 @@ export default {
} }
}, },
handleShowToast() { handleShowToast() {
console.log(this.multiArray,"this.multiArray");
uni.showToast({ title: "请选择乐业社区", icon: "none" }); uni.showToast({ title: "请选择乐业社区", icon: "none" });
}, },
async bindMultiPickerColumnChange(e) { async bindMultiPickerColumnChange(e) {
@ -575,11 +587,12 @@ export default {
(m) => String(m.roomId) === String(item.id) (m) => String(m.roomId) === String(item.id)
); );
if (meter) { if (meter) {
const hasMeterNum = !!(meter.meterNumber && meter.meterNumber.trim() !== '');
return { return {
...item, ...item,
lastMeterReading: meter.thisMeterReading || 0, lastMeterReading: meter.thisMeterReading || 0,
waterMeterNumber: meter.meterNumber || "", waterMeterNumber: meter.meterNumber || '',
isSystemWaterMeterNumber: !!(meter.meterNumber && meter.meterNumber.trim() !== ''), isSystemWaterMeterNumber: hasMeterNum, //
meterReadingTime: item.meterReadingTime || this.formatDateTime(new Date()), // meterReadingTime: item.meterReadingTime || this.formatDateTime(new Date()), //
}; };
} }

Loading…
Cancel
Save