elink-star
/
epmet-apartment-work-mp
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: elink-star:9a9ad911c9bd1732e41cbc36aae06ad751a836a1
Branches Tags
elink-star:815
elink-star:dev
elink-star:fenbao
elink-star:master
elink-star:wyx
...
compare: elink-star:6573f2ff59ca26014a31868bd0dc84faca8d6027
Branches Tags
elink-star:815
elink-star:dev
elink-star:fenbao
elink-star:master
elink-star:wyx

2 Commits
9a9ad911c9 ... 6573f2ff59

Author SHA1 Message Date
wangyx 6573f2ff59 优化
1 month ago
wangyx 121db33bf3 无房屋选不了
1 month ago
2 changed files with 150 additions and 169 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 151
      pagesA/sdPage/dfReport.vue
  2. 168
      pagesA/sdPage/sfReport.vue

151
pagesA/sdPage/dfReport.vue
View File

@ -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"
@ -85,9 +81,9 @@
> >
<text>电表号</text> <text>电表号</text>
</view> </view>
<u-input <u--input
v-model="item.electricMeterNumber" v-model="item.electricMeterNumber"
type="digit" type="text"
placeholder="请输入电表号" placeholder="请输入电表号"
border="none" border="none"
:disabled="item.isSystemElectricMeterNumber" :disabled="item.isSystemElectricMeterNumber"
@ -278,6 +274,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 +392,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 +413,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) {
@ -436,91 +446,66 @@ export default {
uni.showToast({ title: "请选择乐业社区", icon: "none" }); uni.showToast({ title: "请选择乐业社区", icon: "none" });
}, },
async bindMultiPickerColumnChange(e) { async bindMultiPickerColumnChange(e) {
if (!this.multiArray[0].length) return; if (!this.multiArray[0].length) return
this.multiIndex[e.detail.column] = e.detail.value;
switch (e.detail.column) {
case 0:
{
const unitArray = await this.getListByParentId(
"3",
this.buildingOptions[e.detail.value].id
);
// 验证单元数据 // 替换行 450：用 splice 确保响应式
if (!unitArray || unitArray.length === 0) { this.multiIndex.splice(e.detail.column, 1, e.detail.value)
console.warn("未获取到单元信息");
return;
}
this.unitOptions = unitArray;
const unitNames = unitArray.map((item) => item.name);
this.blockForm.unitId = unitArray[0].id;
const houseArray = await this.getListByParentId( switch (e.detail.column) {
"4", case 0: {
unitArray[0].id const unitArray = await this.getListByParentId('3', this.buildingOptions[e.detail.value].id)
); if (!unitArray || unitArray.length === 0) return
this.unitOptions = unitArray
// 验证户数据 const unitNames = unitArray.map(item => item.name)
if (!houseArray || houseArray.length === 0) { this.blockForm.unitId = unitArray[0].id
console.warn("未获取到户信息");
return;
}
this.houseOptions = houseArray;
const houseNames = houseArray.map((item) => item.name);
this.blockForm.houseId = houseArray[0].id;
this.blockForm.roomId = houseArray[0].roomId;
this.multiArray[1] = unitNames;
this.multiArray[2] = houseNames;
} //拖动第1列
this.multiIndex.splice(1, 1, 0);
this.multiIndex.splice(2, 1, 0);
break;
case 1:
{
const houseArray = await this.getListByParentId(
"4",
this.unitOptions[e.detail.value].id
);
// 验证户数据 const houseArray = await this.getListByParentId('4', unitArray[0].id)
if (!houseArray || houseArray.length === 0) { if (!houseArray || houseArray.length === 0) return
console.warn("未获取到户信息"); this.houseOptions = houseArray
return; const houseNames = houseArray.map(item => item.name)
} this.blockForm.houseId = houseArray[0].id
this.blockForm.roomId = houseArray[0].roomId
this.houseOptions = houseArray; // 替换行 485/486：用 $set 或整体替换
const houseNames = houseArray.map((item) => item.name); this.$set(this.multiArray, 1, unitNames)
this.blockForm.houseId = houseArray[0].id; this.$set(this.multiArray, 2, houseNames)
this.blockForm.roomId = houseArray[0].roomId; // 重置后两列索引
this.multiArray[2] = houseNames; this.multiIndex.splice(1, 1, 0)
} //拖动第2列 this.multiIndex.splice(2, 1, 0)
this.multiIndex.splice(2, 1, 0); break
}
case 1: {
const houseArray = await this.getListByParentId('4', this.unitOptions[e.detail.value].id)
if (!houseArray || houseArray.length === 0) return
this.houseOptions = houseArray
const houseNames = houseArray.map(item => item.name)
this.blockForm.houseId = houseArray[0].id
this.blockForm.roomId = houseArray[0].roomId
break; // 替换行 508：用 $set
this.$set(this.multiArray, 2, houseNames)
// 重置第三列索引
this.multiIndex.splice(2, 1, 0)
break
}
case 2: { case 2: {
this.blockForm.houseId = this.houseOptions[e.detail.value].id; // 第三列索引同样需要响应式设置（虽然上面已统一 splice，这里再确保一次）
this.blockForm.roomId = this.houseOptions[e.detail.value].roomId; this.multiIndex.splice(2, 1, e.detail.value)
this.waterMeterConfig = this.blockForm.houseId = this.houseOptions[e.detail.value].id
this.houseOptions[e.detail.value].waterMeterConfig; this.blockForm.roomId = this.houseOptions[e.detail.value].roomId
this.energyMeterConfig = this.waterMeterConfig = this.houseOptions[e.detail.value].waterMeterConfig
this.houseOptions[e.detail.value].energyMeterConfig; this.energyMeterConfig = this.houseOptions[e.detail.value].energyMeterConfig
break
} }
} }
// 确保在调用方法之前有有效的配置
if (this.energyMeterConfig && this.blockForm.houseId) { if (this.energyMeterConfig && this.blockForm.houseId) {
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) {
this.getRoomByHouseId(this.blockForm.houseId); this.getRoomByHouseId(this.blockForm.houseId)
} }
} }
this.$forceUpdate();
}, },
onDelete(event, index) { onDelete(event, index) {
if (this.form[index] && Array.isArray(this.form[index].fileList)) { if (this.form[index] && Array.isArray(this.form[index].fileList)) {

168
pagesA/sdPage/sfReport.vue
View File

@ -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"
@ -80,9 +76,9 @@
> >
<text>水表号</text> <text>水表号</text>
</view> </view>
<u-input <u--input
v-model="item.waterMeterNumber" v-model="item.waterMeterNumber"
type="digit" type="text"
placeholder="请输入水表号" placeholder="请输入水表号"
border="none" border="none"
:disabled="item.isSystemWaterMeterNumber" :disabled="item.isSystemWaterMeterNumber"
@ -260,6 +256,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 +334,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 +348,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,89 +382,71 @@ 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) {
if (!this.multiArray[0].length) return; if (!this.multiArray[0].length) return
this.multiIndex[e.detail.column] = e.detail.value;
// 用 splice 保证响应式（替代 this.multiIndex[e.detail.column] = e.detail.value）
this.multiIndex.splice(e.detail.column, 1, e.detail.value)
switch (e.detail.column) { switch (e.detail.column) {
case 0: case 0: {
{ const unitArray = await this.getListByParentId('3', this.buildingOptions[e.detail.value].id)
const unitArray = await this.getListByParentId( if (!unitArray || unitArray.length === 0) return
"3", this.unitOptions = unitArray
this.buildingOptions[e.detail.value].id const unitNames = unitArray.map(item => item.name)
); this.blockForm.unitId = unitArray[0].id
// 验证单元数据
if (!unitArray || unitArray.length === 0) {
console.warn("未获取到单元信息");
return;
}
this.unitOptions = unitArray;
const unitNames = unitArray.map((item) => item.name);
this.blockForm.unitId = unitArray[0].id;
const houseArray = await this.getListByParentId( const houseArray = await this.getListByParentId('4', unitArray[0].id)
"4", if (!houseArray || houseArray.length === 0) return
unitArray[0].id this.houseOptions = houseArray
); const houseNames = houseArray.map(item => item.name)
this.blockForm.houseId = houseArray[0].id
// 验证户数据 this.blockForm.roomId = houseArray[0].roomId
if (!houseArray || houseArray.length === 0) {
console.warn("未获取到户信息"); // 更新列数据
return; this.$set(this.multiArray, 1, unitNames)
} this.$set(this.multiArray, 2, houseNames)
this.houseOptions = houseArray; // 重置后两列索引
const houseNames = houseArray.map((item) => item.name); this.multiIndex.splice(1, 1, 0)
this.blockForm.houseId = houseArray[0].id; this.multiIndex.splice(2, 1, 0)
this.blockForm.roomId = houseArray[0].roomId; break
this.multiArray[1] = unitNames; }
this.multiArray[2] = houseNames; case 1: {
} const houseArray = await this.getListByParentId('4', this.unitOptions[e.detail.value].id)
this.multiIndex.splice(1, 1, 0); if (!houseArray || houseArray.length === 0) return
this.multiIndex.splice(2, 1, 0); this.houseOptions = houseArray
break; const houseNames = houseArray.map(item => item.name)
case 1: this.blockForm.houseId = houseArray[0].id
{ this.blockForm.roomId = houseArray[0].roomId
const houseArray = await this.getListByParentId(
"4", this.$set(this.multiArray, 2, houseNames)
this.unitOptions[e.detail.value].id
); // 重置第三列索引
this.multiIndex.splice(2, 1, 0)
// 验证户数据 break
if (!houseArray || houseArray.length === 0) { }
console.warn("未获取到户信息");
return;
}
this.houseOptions = houseArray;
const houseNames = houseArray.map((item) => item.name);
this.blockForm.houseId = houseArray[0].id;
this.blockForm.roomId = houseArray[0].roomId;
this.multiArray[2] = houseNames;
}
this.multiIndex.splice(2, 1, 0);
break;
case 2: { case 2: {
this.blockForm.houseId = this.houseOptions[e.detail.value].id; // 第三列仅变更索引，也需要 splice 才能触发视图更新（已在顶部统一处理）
this.blockForm.roomId = this.houseOptions[e.detail.value].roomId; this.blockForm.houseId = this.houseOptions[e.detail.value].id
this.waterMeterConfig = this.blockForm.roomId = this.houseOptions[e.detail.value].roomId
this.houseOptions[e.detail.value].waterMeterConfig; this.waterMeterConfig = this.houseOptions[e.detail.value].waterMeterConfig
break
} }
} }
// 确保在调用方法之前有有效的配置 // 依据配置加载数据
if (this.waterMeterConfig && this.blockForm.houseId) { if (this.waterMeterConfig && this.blockForm.houseId) {
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) {
this.getRoomByHouseId(this.blockForm.houseId); this.getRoomByHouseId(this.blockForm.houseId)
} }
} }
this.$forceUpdate();
}, },
//图片超过大小时取消上传 //图片超过大小时取消上传
oversize(e) { oversize(e) {
@ -575,16 +568,19 @@ 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()), // 确保有抄表时间
}; };
} }
return item; return item;
}); });
console.log(this.form,"this.form11");
} }
}, },
// 初始化抄表时间 // 初始化抄表时间

Write Preview
Loading…
Cancel
Save