修改抄表路线问题

pages/writeReading/components/meterList/index.js

@@ -31,6 +31,9 @@ Component({
           maxScrollLeft: newList?.length ? 220 * newList.length - (scrollWidth || 0) - 20 : 0,
         })
       }
+    },
+    "finishNumber": function(newValue) {
+      console.log("finishNumber0000000000-----------", newValue)
     }
   },
   /**
@@ -54,9 +57,7 @@ Component({
           maxScrollLeft:length ? 220 * list.length - (res?.[0]?.width || 0) - 20 : 0,
           scrollWidth: res?.[0]?.width || 0
         })
-      })
- 
-      
+      }) 
     }
   },
   /**

pages/writeReading/components/meterList/index.wxml

@@ -2,7 +2,7 @@
 
 <view class="wrapper">
     <view class="title">
-        <text> 电表列表 (总计{{list.length}}块，已抄{{finishNumber}}块) </text>
+        <text> 电表列表 (总计{{list.length}}块，已抄{{list.length - finishNumber}}块) </text>
     </view>
     <view style="display: flex; align-items: center;margin-top: 20rpx;">
         <van-icon name="arrow-left" size="50rpx" bind:tap="scrollLeft" />

pages/writeReading/components/readingInfo/index.js

@@ -3,6 +3,7 @@
 import { createReading, checkReadingFinish, changeMeterRouteStatus } from "../../../../service/workBench"
 import { alertError, alertInfo, alertSuccess, wxModal } from "../../../../utils/index"
 import request from "../../../../utils/request"
+import dayjs from "../../../../utils/dayjs"
 const { OK } = request
 
 Component({
@@ -21,6 +22,7 @@ Component({
       if (!newValue) {
         return;
       }
+      console.log("---------------");
       this.checkFinish(newValue)
     }
   },
@@ -28,11 +30,12 @@ Component({
    * 组件的初始数据
    */
   data: {
-    currentNumber: null
+    currentNumber: null,
+    diff: "-"
   },
   lifetimes: {
     attached() {
-    
+      
     }
   },
   /**
@@ -49,7 +52,8 @@ Component({
     onChange(e) {
       this.setData({
         currentNumber: e.detail,
-        calcNumber: isNaN(e.detail) ? 0 : Number(e.detail)
+        calcNumber: isNaN(Number(e.detail)) ? 0 : Number(e.detail),
+        diff: isNaN(Number(e.detail)) ? "-" : Number(e.detail) - this.data.meterInfo?.overall
       })
     },
     handleClear() {
@@ -69,10 +73,12 @@ Component({
     },
     onPhotoFinish(e) {
       const { number, success } = e.detail;
+      const { meterInfo } = this.data;
       if (success) {
         this.setData({ 
           currentNumber: `${Number(number)}`,  
-          calcNumber: isNaN(number) ? 0 : Number(number)
+          calcNumber: isNaN(Number(number)) ? 0 : Number(number),
+          diff: isNaN(Number(number)) ? "-" : (Number(number || 0) - Number(meterInfo.overall)).toFixed(2)
         })
         alertSuccess("获取成功")
       } else {
@@ -84,7 +90,9 @@ Component({
       const { parkId, id } = meterInfo;
       const { code, message } = await createReading(parkId, id, {
         overall: `${currentNumber}`,
-        flat: `${currentNumber}`
+        flat: `${currentNumber}`,
+        readAt: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        source: 1,
       })
       if (code !== OK) {
         alertError(message)
@@ -107,6 +115,11 @@ Component({
               if (res.confirm) {
                 // await that.changeEndStatus()
                 wx.navigateBack()
+                const pages = getCurrentPages();
+                const prevPage = pages[pages.length - 2];
+                if (prevPage.init){
+                  prevPage.init()
+                }
               }
             }
           })

pages/writeReading/components/readingInfo/index.wxml

@@ -70,11 +70,11 @@
             <view class="title">
                 表字差
             </view>
-            <view class="rightNumber" wx:if="{{calcNumber - meterInfo.overall >= 0}}">
-                {{(calcNumber || 0) - meterInfo.overall}}
+            <view class="rightNumber" wx:if="{{diff >= 0}}">
+                {{diff}}
             </view>
             <view class="wrongNumber" wx:else>
-                {{(calcNumber || 0) - meterInfo.overall}}
+                {{diff}}
             </view>
         </view>
         <view class="operate">

pages/writeReading/index.wxml

@@ -6,7 +6,7 @@
     bind:changeMeterAndIndex="changeMeterAndIndex" 
     active="{{active}}" 
     meterInfo="{{meterInfo}}"
-    finishNumber="{{onSetFinishNumber}}"
+    finishNumber="{{finishNumber}}"
 />
 <meter-info meterInfo="{{meterInfo}}" />
 <reading-info