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

优化

dev
wangyx 1 month ago
parent
121db33bf3
commit
6573f2ff59
2 changed files with 102 additions and 143 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 Download Patch File Download Diff File
  1. 118
      pagesA/sdPage/dfReport.vue
  2. 111
      pagesA/sdPage/sfReport.vue

118
pagesA/sdPage/dfReport.vue
View File

@ -81,8 +81,9 @@
> >
<text>电表号</text> <text>电表号</text>
</view> </view>
<u-input <u--input
v-model="item.electricMeterNumber" v-model="item.electricMeterNumber"
type="text"
placeholder="请输入电表号" placeholder="请输入电表号"
border="none" border="none"
:disabled="item.isSystemElectricMeterNumber" :disabled="item.isSystemElectricMeterNumber"
@ -445,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
);
// 验证单元数据
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( // 替换行 450：用 splice 确保响应式
"4", this.multiIndex.splice(e.detail.column, 1, e.detail.value)
unitArray[0].id
);
// 验证户数据 switch (e.detail.column) {
if (!houseArray || houseArray.length === 0) { case 0: {
console.warn("未获取到户信息"); const unitArray = await this.getListByParentId('3', this.buildingOptions[e.detail.value].id)
return; if (!unitArray || unitArray.length === 0) return
} this.unitOptions = unitArray
const unitNames = unitArray.map(item => item.name)
this.blockForm.unitId = unitArray[0].id
this.houseOptions = houseArray; const houseArray = await this.getListByParentId('4', unitArray[0].id)
const houseNames = houseArray.map((item) => item.name); if (!houseArray || houseArray.length === 0) return
this.blockForm.houseId = houseArray[0].id; this.houseOptions = houseArray
this.blockForm.roomId = houseArray[0].roomId; const houseNames = houseArray.map(item => item.name)
this.blockForm.houseId = houseArray[0].id
this.blockForm.roomId = houseArray[0].roomId
this.multiArray[1] = unitNames; // 替换行 485/486：用 $set 或整体替换
this.multiArray[2] = houseNames; this.$set(this.multiArray, 1, unitNames)
} //拖动第1列 this.$set(this.multiArray, 2, houseNames)
this.multiIndex.splice(1, 1, 0); // 重置后两列索引
this.multiIndex.splice(2, 1, 0); this.multiIndex.splice(1, 1, 0)
break; this.multiIndex.splice(2, 1, 0)
case 1: break
{ }
const houseArray = await this.getListByParentId( case 1: {
"4", const houseArray = await this.getListByParentId('4', this.unitOptions[e.detail.value].id)
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
// 验证户数据 // 替换行 508：用 $set
if (!houseArray || houseArray.length === 0) { this.$set(this.multiArray, 2, houseNames)
console.warn("未获取到户信息"); // 重置第三列索引
return; this.multiIndex.splice(2, 1, 0)
break
} }
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;
} //拖动第2列
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)) {

111
pagesA/sdPage/sfReport.vue
View File

@ -76,8 +76,9 @@
> >
<text>水表号</text> <text>水表号</text>
</view> </view>
<u-input <u--input
v-model="item.waterMeterNumber" v-model="item.waterMeterNumber"
type="text"
placeholder="请输入水表号" placeholder="请输入水表号"
border="none" border="none"
:disabled="item.isSystemWaterMeterNumber" :disabled="item.isSystemWaterMeterNumber"
@ -386,86 +387,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
);
// 验证单元数据 // 用 splice 保证响应式（替代 this.multiIndex[e.detail.column] = e.detail.value）
if (!unitArray || unitArray.length === 0) { this.multiIndex.splice(e.detail.column, 1, e.detail.value)
console.warn("未获取到单元信息");
return;
}
this.unitOptions = unitArray; switch (e.detail.column) {
const unitNames = unitArray.map((item) => item.name); case 0: {
this.blockForm.unitId = 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)
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) { this.$set(this.multiArray, 1, unitNames)
console.warn("未获取到户信息"); this.$set(this.multiArray, 2, houseNames)
return;
}
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.unitOptions[e.detail.value].id
);
// 验证户数据 this.$set(this.multiArray, 2, houseNames)
if (!houseArray || houseArray.length === 0) {
console.warn("未获取到户信息");
return;
}
this.houseOptions = houseArray; // 重置第三列索引
const houseNames = houseArray.map((item) => item.name); this.multiIndex.splice(2, 1, 0)
this.blockForm.houseId = houseArray[0].id; break
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) {
@ -598,6 +579,8 @@ export default {
} }
return item; return item;
}); });
console.log(this.form,"this.form11");
} }
}, },
// 初始化抄表时间 // 初始化抄表时间

Write Preview
Loading…
Cancel
Save