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

预约提醒图标 

水电表一房一表也上传roomid,上次表数不是必填
815
wangyx 1 week ago
parent
769024c1c7
commit
7c3acf015c
3 changed files with 68 additions and 113 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. 2
      pagesA/kfPage/list.vue
  2. 120
      pagesA/sdPage/dfReport.vue
  3. 57
      pagesA/sdPage/sfReport.vue

2
pagesA/kfPage/list.vue
View File

@ -39,7 +39,7 @@
> >
<!-- 卡片头部 --> <!-- 卡片头部 -->
<view class="card-header"> <view class="card-header">
<u-icon name="/static/img/kf.png" size="20" color="#08B3B3"></u-icon> <u-icon name="/static/img/kf.png" size="16" color="#08B3B3"></u-icon>
<text class="community-info" <text class="community-info"
>{{ item.apartmentName }} | {{ item.houseTypeName||'' }}</text >{{ item.apartmentName }} | {{ item.houseTypeName||'' }}</text
> >

120
pagesA/sdPage/dfReport.vue
View File

@ -100,9 +100,9 @@
<view class="meter-row"> <view class="meter-row">
<view class="meter-label"> <view class="meter-label">
<view style="color: #f93838; margin-right: 4rpx; font-size: 24rpx" <!-- <view style="color: #f93838; margin-right: 4rpx; font-size: 24rpx"
>*</view >*</view
> > -->
<text>上次表数</text> <text>上次表数</text>
</view> </view>
<u-input <u-input
@ -270,18 +270,12 @@ export default {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
queryDeptDropdownList({ type, id }).then((res) => { queryDeptDropdownList({ type, id }).then((res) => {
resolve(res.data); resolve(res.data);
console.log(res.data, "res.data");
}); });
}); });
}, },
async onPickerChange(e, type) { async onPickerChange(e, type) {
if (type == "乐业社区") { if (type == "乐业社区") {
console.log("e", e);
const apartmentInfo = this.deptOptions[e.detail.value]; const apartmentInfo = this.deptOptions[e.detail.value];
console.log("社区信息", apartmentInfo);
console.log("社区信息11", this.deptOptions);
this.blockForm.apartmentName = apartmentInfo.deptName; this.blockForm.apartmentName = apartmentInfo.deptName;
this.blockForm.apartmentId = apartmentInfo.deptId; this.blockForm.apartmentId = apartmentInfo.deptId;
// 楼 // 楼
@ -290,9 +284,7 @@ export default {
apartmentInfo.deptId apartmentInfo.deptId
); );
this.buildingOptions = buildingArray; this.buildingOptions = buildingArray;
console.log("楼信息", buildingArray);
const buildingNames = buildingArray.map((item) => item.name); const buildingNames = buildingArray.map((item) => item.name);
console.log("buildingNames:", buildingNames);
this.blockForm.buildingId = buildingArray[0].id; this.blockForm.buildingId = buildingArray[0].id;
// 单元 // 单元
@ -301,7 +293,6 @@ export default {
buildingArray[0].id buildingArray[0].id
); );
this.unitOptions = unitArray; this.unitOptions = unitArray;
console.log("unitArray:", unitArray);
const unitNames = unitArray.map((item) => item.name); const unitNames = unitArray.map((item) => item.name);
this.blockForm.unitId = unitArray[0].id; this.blockForm.unitId = unitArray[0].id;
@ -313,6 +304,8 @@ export default {
this.energyMeterConfig = houseArray[0].energyMeterConfig; this.energyMeterConfig = houseArray[0].energyMeterConfig;
this.waterMeterConfig = houseArray[0].waterMeterConfig; this.waterMeterConfig = houseArray[0].waterMeterConfig;
let house = houseArray[0]; let house = houseArray[0];
this.blockForm.roomId = houseArray[0].roomId;
// for (let index = 0; index < house.type; index++) { // for (let index = 0; index < house.type; index++) {
// this.form.waterMeters.push({ // this.form.waterMeters.push({
// waterMeter: "", // waterMeter: "",
@ -325,7 +318,6 @@ export default {
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);
} }
} }
}, },
@ -334,9 +326,7 @@ export default {
}, },
async bindMultiPickerColumnChange(e) { async bindMultiPickerColumnChange(e) {
if (!this.multiArray[0].length) return; if (!this.multiArray[0].length) return;
console.log(
"修改的列为：" + e.detail.column + "，值为：" + e.detail.value
);
this.multiIndex[e.detail.column] = e.detail.value; this.multiIndex[e.detail.column] = e.detail.value;
switch (e.detail.column) { switch (e.detail.column) {
case 0: case 0:
@ -392,17 +382,7 @@ export default {
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.getLastMeter();
} }
console.log(
this.waterMeterConfig,
this.energyMeterConfig,
"this.waterMeterConfig, this.energyMeterConfig"
);
console.log(this.houseOptions[e.detail.value]);
this.$forceUpdate(); this.$forceUpdate();
}, },
onDelete(event, index) { onDelete(event, index) {
@ -461,6 +441,8 @@ export default {
const res = await getHouseInfo(id); const res = await getHouseInfo(id);
if (res.code == 200) { if (res.code == 200) {
if (this.energyMeterConfig == 1) { if (this.energyMeterConfig == 1) {
this.getRoomByHouseId(id);
this.form = [ this.form = [
{ {
electricMeterNumber: res.data.electricMeterNumber, electricMeterNumber: res.data.electricMeterNumber,
@ -477,11 +459,11 @@ export default {
}, },
// 获取上次抄表 // 获取上次抄表
async getLastMeter(item) { async getLastMeter(item) {
let roomId = ''; let roomId = "";
if(this.energyMeterConfig == 1){ if (this.waterMeterConfig == 1) {
roomId = this.blockForm.houseId; roomId = this.form[0].id;
} else if (this.energyMeterConfig == 2) { } else {
// roomId = this.form.map((item) => item.id).join(','); roomId = this.blockForm.roomId;
} }
const params = { const params = {
houseId: this.blockForm.houseId, houseId: this.blockForm.houseId,
@ -491,35 +473,17 @@ export default {
}; };
const res = await queryLastMeterReading(params); const res = await queryLastMeterReading(params);
if (this.energyMeterConfig == 1) { if (this.energyMeterConfig == 1) {
this.form = [ this.form = this.form.map((item) => ({
{ ...item,
electricMeterNumber: res.data[0].meterNumber, lastMeterReading: res.data[0].thisMeterReading,
lastMeterReading: res.data[0].thisMeterReading, electricMeterNumber: res.data[0].meterNumber,
}, }));
];
} else if (this.energyMeterConfig == 2) { } else if (this.energyMeterConfig == 2) {
this.form = this.form.map((item) => { this.form = this.form.map((item) => {
// 找到 getLastMeter 返回的对应项 // 找到 getLastMeter 返回的对应项
const meter = res.data.find( const meter = res.data.find(
(m) => String(m.roomId) === String(item.id) (m) => String(m.roomId) === String(item.id)
); );
console.log(meter, "meter");
if (meter) {
return {
...item,
lastMeterReading: meter.thisMeterReading,
electricMeterNumber: meter.meterNumber,
};
}
return item;
});
this.form = this.form.map((item) => {
// 找到 getLastMeter 返回的对应项
const meter = res.data.find(
(m) => String(m.roomId) === String(item.id)
);
console.log(meter, "meter");
if (meter) { if (meter) {
return { return {
@ -531,42 +495,19 @@ export default {
return item; return item;
}); });
} }
// if (Array.isArray(res.data) && res.data.length > 0) {
// } else {
// // res.data 为空时，显示一个空表单
// this.form = [
// {
// lastMeterReading: "",
// // meterNumber: "",
// thisMeterReading: "",
// },
// ];
// }
}, },
async getRoomByHouseId(id) { async getRoomByHouseId(id) {
const res = await getRoomByHouseId({ houseId: id }); const res = await getRoomByHouseId({ houseId: id });
if (res.code == 200) { if (res.code == 200) {
console.log(res.data, "res.data");
const data = res.data;
if (this.energyMeterConfig == 1) { if (this.energyMeterConfig == 1) {
this.form = [{}]; this.form = this.form.map((item) => ({
...item,
id: res.data[0].id,
}));
} else if (this.energyMeterConfig == 2) { } else if (this.energyMeterConfig == 2) {
this.form = res.data; this.form = res.data;
this.getLastMeter(); this.getLastMeter();
} }
console.log(this.form, "this.form");
// if (this.waterMeterConfig == 1 && this.energyMeterConfig == 1) {
// this.sbList = [];
// this.dbList = [];
// } else if (this.waterMeterConfig == 1 && this.energyMeterConfig == 2) {
// this.sbList = [];
// this.dbList = data;
// } else if (this.waterMeterConfig == 2 && this.energyMeterConfig == 1) {
// this.sbList = data;
// this.dbList = [];
// }
} }
}, },
onSubmit() { onSubmit() {
@ -621,13 +562,13 @@ export default {
// }); // });
// return; // return;
// } // }
if (!item.lastMeterReading && item.lastMeterReading !== 0) { // if (!item.lastMeterReading && item.lastMeterReading !== 0) {
uni.showToast({ // uni.showToast({
title: `请填写上次表数`, // title: `请填写上次表数`,
icon: "none", // icon: "none",
}); // });
return; // return;
} // }
if (!item.thisMeterReading && item.thisMeterReading !== 0) { if (!item.thisMeterReading && item.thisMeterReading !== 0) {
uni.showToast({ uni.showToast({
title: `请填写本次表数`, title: `请填写本次表数`,
@ -645,7 +586,6 @@ export default {
} }
} }
this.submitAdd(); this.submitAdd();
console.log("onSubmit", this.form);
}, },
async submitAdd() { async submitAdd() {
let params = this.form.map((item) => ({ let params = this.form.map((item) => ({
@ -653,7 +593,7 @@ export default {
meterType: 1, meterType: 1,
houseId: this.blockForm.houseId, houseId: this.blockForm.houseId,
roomId: item.id || "", roomId: item.id || "",
lastMeterReading: parseFloat(item.lastMeterReading).toFixed(4), lastMeterReading: isNaN(parseFloat(item.lastMeterReading)) ? '' : parseFloat(item.lastMeterReading).toFixed(4),
thisMeterReading: parseFloat(item.thisMeterReading).toFixed(4), thisMeterReading: parseFloat(item.thisMeterReading).toFixed(4),
images: (item.fileList || []).map((f) => ({ images: (item.fileList || []).map((f) => ({
url: f.url, url: f.url,
@ -664,7 +604,6 @@ export default {
remark: item.remark || "", remark: item.remark || "",
})); }));
console.log(params, "params"); console.log(params, "params");
const res = await submitWaterAndElectricity(params); const res = await submitWaterAndElectricity(params);
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ uni.showToast({
@ -687,7 +626,6 @@ export default {
icon: "none", icon: "none",
}); });
} }
console.log(res, "reeees");
}, },
}, },
}; };

57
pagesA/sdPage/sfReport.vue
View File

@ -93,9 +93,9 @@
</view> </view>
<view class="meter-row"> <view class="meter-row">
<view class="meter-label"> <view class="meter-label">
<view style="color: #f93838; margin-right: 4rpx; font-size: 24rpx" <!-- <view style="color: #f93838; margin-right: 4rpx; font-size: 24rpx"
>*</view >*</view
> > -->
<text>上次表数</text> <text>上次表数</text>
</view> </view>
<u-input <u-input
@ -429,7 +429,9 @@ export default {
async getHouseInfoBy(id) { async getHouseInfoBy(id) {
const res = await getHouseInfo(id); const res = await getHouseInfo(id);
if (res.code == 200) { if (res.code == 200) {
if (this.waterMeterConfig == 1) { if (this.waterMeterConfig == 1) {
this.getRoomByHouseId(id);
this.form = [ this.form = [
{ {
waterMeterNumber: res.data.waterMeterNumber, waterMeterNumber: res.data.waterMeterNumber,
@ -445,22 +447,29 @@ export default {
} }
}, },
async getLastMeter(waterMeterNumber) { async getLastMeter(waterMeterNumber) {
console.log(this.form, "this.formgetHouseInfoBy");
let roomId = ''
if (this.waterMeterConfig == 1) {
roomId = this.form[0].id
}else {
roomId = this.blockForm.roomId
}
const params = { const params = {
houseId: this.blockForm.houseId, houseId: this.blockForm.houseId,
roomId: this.blockForm.roomId, roomId: roomId,
meterType: 2, // 2水表 meterType: 2, // 2水表
meterNumber: waterMeterNumber, meterNumber: waterMeterNumber,
}; };
const res = await queryLastMeterReading(params); const res = await queryLastMeterReading(params);
console.log(res.data, "res.data"); console.log(res.data, "res.data");
console.log(this.form, "this.form");
if (this.waterMeterConfig == 1) { if (this.waterMeterConfig == 1) {
this.form = [ this.form = this.form.map((item) => ({
{ ...item,
waterMeterNumber: res.data[0].meterNumber, lastMeterReading: res.data[0].thisMeterReading,
lastMeterReading: res.data[0].thisMeterReading, waterMeterNumber: res.data[0].meterNumber,
}, }));
]; console.log(this.form, "this.formgetLastMeter");
} else if (this.waterMeterConfig == 2) { } else if (this.waterMeterConfig == 2) {
this.form = this.form.map((item) => { this.form = this.form.map((item) => {
const meter = res.data.find( const meter = res.data.find(
@ -481,7 +490,14 @@ export default {
const res = await getRoomByHouseId({ houseId: id }); const res = await getRoomByHouseId({ houseId: id });
if (res.code == 200) { if (res.code == 200) {
if (this.waterMeterConfig == 1) { if (this.waterMeterConfig == 1) {
this.form = [{}]; console.log(this.form,"this.formgetRoomByHouseId11");
console.log(res.data,"res.data[0].id");
this.form = this.form.map((item) => ({
...item,
id:res.data[0].id
}));
} else if (this.waterMeterConfig == 2) { } else if (this.waterMeterConfig == 2) {
this.form = res.data; this.form = res.data;
this.getLastMeter(); this.getLastMeter();
@ -545,13 +561,13 @@ export default {
// }); // });
// return; // return;
// } // }
if (!item.lastMeterReading && item.lastMeterReading !== 0) { // if (!item.lastMeterReading && item.lastMeterReading !== 0) {
uni.showToast({ // uni.showToast({
title: `请填写上次表数`, // title: `请填写上次表数`,
icon: "none", // icon: "none",
}); // });
return; // return;
} // }
if (!item.thisMeterReading && item.thisMeterReading !== 0) { if (!item.thisMeterReading && item.thisMeterReading !== 0) {
uni.showToast({ uni.showToast({
title: `请填写本次表数`, title: `请填写本次表数`,
@ -569,15 +585,16 @@ export default {
} }
} }
this.submitAdd(); this.submitAdd();
console.log("onSubmit", this.form);
}, },
async submitAdd() { async submitAdd() {
console.log(this.form,"this.form");
let params = this.form.map((item) => ({ let params = this.form.map((item) => ({
meterNumber: item.waterMeterNumber, meterNumber: item.waterMeterNumber,
meterType: 2, meterType: 2,
houseId: this.blockForm.houseId, houseId: this.blockForm.houseId,
roomId: item.id || "", roomId: item.id || "",
lastMeterReading: parseFloat(item.lastMeterReading).toFixed(4), lastMeterReading: isNaN(parseFloat(item.lastMeterReading)) ? '' : parseFloat(item.lastMeterReading).toFixed(4),
thisMeterReading: parseFloat(item.thisMeterReading).toFixed(4), thisMeterReading: parseFloat(item.thisMeterReading).toFixed(4),
images: (item.fileList || []).map((f) => ({ images: (item.fileList || []).map((f) => ({
url: f.url, url: f.url,

Write Preview
Loading…
Cancel
Save