Merge branch '815' into dev

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,

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,