修改抄表路线问题

2025-09-19 16:27:29 +08:00
parent d77af4b78f
commit 9b00bb3561
12 changed files with 79 additions and 53 deletions
--- a/pages/readingHistory/components/editModal/index.js
+++ b/pages/readingHistory/components/editModal/index.js
@@ -79,7 +79,8 @@ Component({
        const { code, message } = await createReading(park, meter, {
          overall: `${number}`,
          flat: `${number}`,
-          readAt: time
+          readAt: time,
+          source: 1,       
        })
        if (code !== OK) {
          alertError(message)
--- a/pages/readingHistory/components/editModal/index.wxml
+++ b/pages/readingHistory/components/editModal/index.wxml
@@ -17,9 +17,9 @@
        use-button-slot
        title-width="100rpx"
    >
-        <van-button slot="button" size="small" type="info" bind:click="onTimeFocus" wx:if="{{!idProps}}">
+        <!-- <van-button slot="button" size="small" type="info" bind:click="onTimeFocus" wx:if="{{!idProps}}">
        选择
-        </van-button>
+        </van-button> -->
    </van-field>
    <van-field
        value="{{ number }}"
--- a/pages/readingHistory/index.js
+++ b/pages/readingHistory/index.js
@@ -3,6 +3,7 @@ import { getMeterReadingRouteMeterDetail, getReadingList, deleteReading } from "
 import request from "../../utils/request"
 import { alertInfo, alertSuccess, alertError, loadingFunc } from "../../utils/index"
 const { OK } = request;
+import dayjs from "../../utils/dayjs"
 Page({

  /**
@@ -85,7 +86,8 @@ Page({
    this.setData({
      title: "新增记录",
      visible: true,
-      type: "create"
+      type: "create",
+      time: dayjs().format("YYYY-MM-DD HH:mm:ss")
    })
  },
  handleUpdate(e) {
--- a/pages/workBench/components/reading/index.js
+++ b/pages/workBench/components/reading/index.js
@@ -20,7 +20,13 @@ Component({
    park: "",
    parkName: ""
  },
-
+  lifetimes: {
+    attached() {
+      if (this.data.parkName) {
+        this.init();
+      }
+    }
+  },
  /**
   * 组件的方法列表
   */
--- a/pages/workBench/components/reading/index.wxml
+++ b/pages/workBench/components/reading/index.wxml
@@ -25,37 +25,40 @@
 <van-empty description="请先选择园区" wx:if="{{!park}}" />

 <view wx:else>
-    <van-cell 
-        wx:for="{{list}}"
-        wx:key="id"
-        title="{{item.readingRouteName}}" 
-        label="包含{{item.meterRoute}}个抄表点"    
-    >
-        <view slot="right-icon">
-            <van-button 
-                type="primary" 
-                size="small" 
-                type="primary" 
-                bind:tap="changeStartStatus"
-                custom-style="margin-right: 20rpx;"
-                data-id="{{item.id}}"
-                wx:if="{{item.status === 0}}"
-            > 开始抄表 </van-button>
-            <van-button 
-                type="primary" 
-                size="small" 
-                bind:tap="jumpToReading"
-                data-id="{{item.id}}"
-                custom-style="margin-right: 20rpx;"
-                wx:if="{{item.status === 1}}"
-            > 去抄表 </van-button>
-            <van-button 
-                size="small" 
-                type="danger" 
-                bind:tap="changeEndStatus"
-                data-id="{{item.id}}"
-                wx:if="{{item.status === 1}}"
-            > 结束抄表 </van-button>
-        </view>
-    </van-cell>
+    <view wx:if="{{list.length}}">
+        <van-cell 
+            wx:for="{{list}}"
+            wx:key="id"
+            title="{{item.readingRouteName}}" 
+            label="包含{{item.meterRoute}}个抄表点"    
+        >
+            <view slot="right-icon">
+                <van-button 
+                    type="primary" 
+                    size="small" 
+                    type="primary" 
+                    bind:tap="changeStartStatus"
+                    custom-style="margin-right: 20rpx;"
+                    data-id="{{item.id}}"
+                    wx:if="{{item.status === 0}}"
+                > 开始抄表 </van-button>
+                <van-button 
+                    type="primary" 
+                    size="small" 
+                    bind:tap="jumpToReading"
+                    data-id="{{item.id}}"
+                    custom-style="margin-right: 20rpx;"
+                    wx:if="{{item.status === 1}}"
+                > 去抄表 </van-button>
+                <van-button 
+                    size="small" 
+                    type="danger" 
+                    bind:tap="changeEndStatus"
+                    data-id="{{item.id}}"
+                    wx:if="{{item.status === 1}}"
+                > 结束抄表 </van-button>
+            </view>
+        </van-cell>
+    </view>
+    <empty wx:else bind:refresh="init" />
 </view>
--- a/pages/workBench/index.js
+++ b/pages/workBench/index.js
@@ -12,7 +12,7 @@ Page({
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
-
+    
  },
  onTabChange(e) {
    this.setData({ active: e.detail.index })
--- a/pages/writeReading/components/meterList/index.js
+++ b/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
        })
-      })
- 
-      
+      }) 
    }
  },
  /**
--- a/pages/writeReading/components/meterList/index.wxml
+++ b/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" />
--- a/pages/writeReading/components/readingInfo/index.js
+++ b/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()
+                }
              }
            }
          })
--- a/pages/writeReading/components/readingInfo/index.wxml
+++ b/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">
--- a/pages/writeReading/index.wxml
+++ b/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 
--- a/service/workBench.js
+++ b/service/workBench.js
@@ -23,7 +23,7 @@ export const getMeterReadingRouteMeterDetail = async function(id) {

 // 新建一条抄表记录
 export const createReading = async function(park, code, data) {
-  return await POST(`/reading/${park}/${code}`, data);
+  return await POST(`/reading/hand/${park}/${code}`, data);
 }