From 804bb1f8f00712bea7c73c05d846775655c19549 Mon Sep 17 00:00:00 2001
From: wangyx <2838268875@qq.com>
Date: Fri, 15 Aug 2025 17:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E9=9B=B7=EF=BC=9A=E6=B0=B4=E7=94=B5?=
 =?UTF-8?q?=E8=A1=A8=E9=9A=90=E8=97=8F=E4=B8=8A=E6=AC=A1=E8=A1=A8=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesA/sdPage/dfReport.vue | 11 ++++++-----
 pagesA/sdPage/sfReport.vue | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pagesA/sdPage/dfReport.vue b/pagesA/sdPage/dfReport.vue
index e2e1b77..da48bdd 100644
--- a/pagesA/sdPage/dfReport.vue
+++ b/pagesA/sdPage/dfReport.vue
@@ -98,11 +98,11 @@
         </view>
         <!-- :disabled="!!item.lastMeterReading" -->
 
-        <view class="meter-row">
+        <!-- <view class="meter-row">
           <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
-            > -->
+            >
             <text>上次表数</text>
           </view>
           <u-input
@@ -116,7 +116,7 @@
                 : ''
             "
           />
-        </view>
+        </view> -->
         <view class="meter-row">
           <view class="meter-label">
             <view style="color: #f93838; margin-right: 4rpx; font-size: 24rpx"
@@ -593,7 +593,8 @@ export default {
         meterType: 1,
         houseId: this.blockForm.houseId,
         roomId: item.id || "",
-        lastMeterReading: isNaN(parseFloat(item.lastMeterReading)) ? '' : parseFloat(item.lastMeterReading).toFixed(4),
+        // lastMeterReading: isNaN(parseFloat(item.lastMeterReading)) ? '' : parseFloat(item.lastMeterReading).toFixed(4),
+        lastMeterReading: item.lastMeterReading?item.lastMeterReading:item.thisMeterReading,
         thisMeterReading: parseFloat(item.thisMeterReading).toFixed(4),
         images: (item.fileList || []).map((f) => ({
           url: f.url,
diff --git a/pagesA/sdPage/sfReport.vue b/pagesA/sdPage/sfReport.vue
index a8bef83..7de3e34 100644
--- a/pagesA/sdPage/sfReport.vue
+++ b/pagesA/sdPage/sfReport.vue
@@ -91,11 +91,11 @@
             "
           />
         </view>
-        <view class="meter-row">
+        <!-- <view class="meter-row">
           <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
-            > -->
+            >
             <text>上次表数</text>
           </view>
           <u-input
@@ -109,7 +109,7 @@
                 : ''
             "
           />
-        </view>
+        </view> -->
         <view class="meter-row">
           <view class="meter-label">
             <view style="color: #f93838; margin-right: 4rpx; font-size: 24rpx"
@@ -594,7 +594,8 @@ export default {
         meterType: 2,
         houseId: this.blockForm.houseId,
         roomId: item.id || "",
-        lastMeterReading: isNaN(parseFloat(item.lastMeterReading)) ? '' : parseFloat(item.lastMeterReading).toFixed(4),
+        // lastMeterReading: isNaN(parseFloat(item.lastMeterReading)) ? '' : parseFloat(item.lastMeterReading).toFixed(4),
+        lastMeterReading: item.lastMeterReading?item.lastMeterReading:item.thisMeterReading,
         thisMeterReading: parseFloat(item.thisMeterReading).toFixed(4),
         images: (item.fileList || []).map((f) => ({
           url: f.url,