水电

pagesA/sdPage/dfReport.vue

@@ -108,7 +108,7 @@
           <u-input
             v-model="form[index].lastMeterReading"
             type="digit"
-            :placeholder="`上次表数${item.lastMeterReading}`"
+            :placeholder="`上次表数${item.lastMeterReading || ''}`"
             border="none"
             :custom-style="
               form[index].electricMeterNumber
@@ -322,11 +322,11 @@ export default {
         // }
         this.multiArray = [buildingNames, unitNames, houseNames];
         if (this.energyMeterConfig == 1) {
-          this.getRoomByHouseId(this.blockForm.houseId);
+          this.getHouseInfoBy(this.blockForm.houseId);
         } else if (this.energyMeterConfig == 2) {
           this.getRoomByHouseId(this.blockForm.houseId);
+
         }
-        this.getLastMeter();
       }
     },
     handleShowToast() {
@@ -392,8 +392,10 @@ export default {
         this.getHouseInfoBy(this.blockForm.houseId);
       } else if (this.energyMeterConfig == 2) {
         this.getRoomByHouseId(this.blockForm.houseId);
+        this.getLastMeter();
+
       }
-      this.getLastMeter();
+
       console.log(
         this.waterMeterConfig,
         this.energyMeterConfig,
@@ -459,49 +461,78 @@ export default {
       const res = await getHouseInfo(id);
       if (res.code == 200) {
         if (this.energyMeterConfig == 1) {
-          this.form = [{}];
+          this.form = [
+            { 
+              electricMeterNumber: res.data.electricMeterNumber,
+            },
+          ];
         } else if (this.energyMeterConfig == 2) {
           this.form = this.form.map((item) => ({
             ...item,
             electricMeterNumber: res.data.electricMeterNumber,
           }));
         }
+        this.getLastMeter(res.data.electricMeterNumber);
       }
     },
     // 获取上次抄表
     async getLastMeter(item) {
+      let roomId = '';
+      if(this.energyMeterConfig == 1){
+         roomId = this.blockForm.houseId;
+      } else if (this.energyMeterConfig == 2) {
+        // roomId = this.form.map((item) => item.id).join(',');
+      }
       const params = {
         houseId: this.blockForm.houseId,
-        roomId: this.blockForm.roomId,
+        roomId: roomId,
         meterType: 1,
-        meterNumber: "",
+        meterNumber: item,
       };
       const res = await queryLastMeterReading(params);
-      console.log(
+      if (this.energyMeterConfig == 1) {
-        "form:",
+        this.form = [
-        this.form.map((i) => i.id)
+          {
-      );
+            electricMeterNumber: res.data[0].meterNumber,
-      console.log(
+            lastMeterReading: res.data[0].thisMeterReading,
-        "res.data:",
+          },
-        res.data.map((i) => i.roomId)
+        ];
-      );
+      } else if (this.energyMeterConfig == 2) {
+        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) {
+            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) {
+            return {
+              ...item,
+              lastMeterReading: meter.thisMeterReading,
+              electricMeterNumber: meter.meterNumber,
+            };
+          }
+          return item;
+        });
+      }
       // if (Array.isArray(res.data) && res.data.length > 0) {
-      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) {
-          return {
-            ...item,
-            lastMeterReading: meter.thisMeterReading,
-            electricMeterNumber: meter.meterNumber,
-          };
-        }
-        return item;
-      });
       // } else {
       //   // res.data 为空时，显示一个空表单
       //   this.form = [
@@ -522,8 +553,8 @@ export default {
           this.form = [{}];
         } else if (this.energyMeterConfig == 2) {
           this.form = res.data;
+          this.getLastMeter();
         }
-        // this.getLastMeter();
 
         console.log(this.form, "this.form");
         // if (this.waterMeterConfig == 1 && this.energyMeterConfig == 1) {

pagesA/sdPage/sfReport.vue

@@ -101,7 +101,7 @@
           <u-input
             v-model="form[index].lastMeterReading"
             type="digit"
-            placeholder="请输入上次表数"
+             :placeholder="`上次表数${item.lastMeterReading || ''}`"
             border="none"
             :custom-style="
               form[index].electricMeterNumber
@@ -313,7 +313,6 @@ export default {
         } else if (this.energyMeterConfig == 2) {
           this.getRoomByHouseId(this.blockForm.houseId);
         }
-        this.getLastMeter();
       }
     },
     handleShowToast() {
@@ -372,8 +371,10 @@ export default {
         this.getHouseInfoBy(this.blockForm.houseId);
       } else if (this.waterMeterConfig == 2) {
         this.getRoomByHouseId(this.blockForm.houseId);
+        this.getLastMeter();
+
       }
-      this.getLastMeter();
+
       this.$forceUpdate();
     },
     //图片超过大小时取消上传
@@ -430,33 +431,53 @@ export default {
     async getHouseInfoBy(id) {
       const res = await getHouseInfo(id);
       if (res.code == 200) {
-        this.form = this.form.map((item) => ({
+        if (this.waterMeterConfig == 1) {
-          ...item,
+          this.form = [
-          waterMeterNumber: res.data.waterMeterNumber,
+            {
-        }));
+              waterMeterNumber: res.data.waterMeterNumber,
+            },
+          ];
+        } else if (this.waterMeterConfig == 2) {
+          this.form = this.form.map((item) => ({
+            ...item,
+            waterMeterNumber: res.data.waterMeterNumber,
+          }));
+        }
+        this.getLastMeter(res.data.waterMeterNumber);
       }
     },
-    async getLastMeter() {
+    async getLastMeter(waterMeterNumber) {
       const params = {
         houseId: this.blockForm.houseId,
         roomId: this.blockForm.roomId,
         meterType: 2, // 2水表
-        meterNumber: "",
+        meterNumber: waterMeterNumber,
       };
       const res = await queryLastMeterReading(params);
-      this.form = this.form.map((item) => {
+      console.log(res.data, "res.data");
-        const meter = res.data.find(
+      console.log(this.form, "this.form");
-          (m) => String(m.roomId) === String(item.id)
+      if (this.waterMeterConfig == 1) {
-        );
+        this.form = [
-        if (meter) {
+          {
-          return {
+            waterMeterNumber: res.data[0].meterNumber,
-            ...item,
+            lastMeterReading: res.data[0].thisMeterReading,
-            lastMeterReading: meter.thisMeterReading,
+          },
-            waterMeterNumber: meter.meterNumber,
+        ];
-          };
+      } else if (this.waterMeterConfig == 2) {
-        }
+        this.form = this.form.map((item) => {
-        return item;
+          const meter = res.data.find(
-      });
+            (m) => String(m.roomId) === String(item.id)
+          );
+          if (meter) {
+            return {
+              ...item,
+              lastMeterReading: meter.thisMeterReading,
+              waterMeterNumber: meter.meterNumber,
+            };
+          }
+          return item;
+        });
+      }
     },
     async getRoomByHouseId(id) {
       const res = await getRoomByHouseId({ houseId: id });
@@ -466,7 +487,6 @@ export default {
         } else if (this.waterMeterConfig == 2) {
           this.form = res.data;
         }
-        // this.getLastMeter();
       }
     },
     onDelete(event, index) {