From 9b00bb35619535eac25375bf20d7a6e2beade436 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Fri, 19 Sep 2025 16:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=84=E8=A1=A8=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/editModal/index.js | 3 +- .../components/editModal/index.wxml | 4 +- pages/readingHistory/index.js | 4 +- pages/workBench/components/reading/index.js | 8 ++- pages/workBench/components/reading/index.wxml | 69 ++++++++++--------- pages/workBench/index.js | 2 +- .../components/meterList/index.js | 7 +- .../components/meterList/index.wxml | 2 +- .../components/readingInfo/index.js | 23 +++++-- .../components/readingInfo/index.wxml | 6 +- pages/writeReading/index.wxml | 2 +- service/workBench.js | 2 +- 12 files changed, 79 insertions(+), 53 deletions(-) diff --git a/pages/readingHistory/components/editModal/index.js b/pages/readingHistory/components/editModal/index.js index 1d66bba..8b57046 100644 --- 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) diff --git a/pages/readingHistory/components/editModal/index.wxml b/pages/readingHistory/components/editModal/index.wxml index fa34bee..ba9fcf0 100644 --- a/pages/readingHistory/components/editModal/index.wxml +++ b/pages/readingHistory/components/editModal/index.wxml @@ -17,9 +17,9 @@ use-button-slot title-width="100rpx" > - + - - - 开始抄表 - 去抄表 - 结束抄表 - - + + + + 开始抄表 + 去抄表 + 结束抄表 + + + + diff --git a/pages/workBench/index.js b/pages/workBench/index.js index 4b09d20..b2de2eb 100644 --- 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 }) diff --git a/pages/writeReading/components/meterList/index.js b/pages/writeReading/components/meterList/index.js index 6cbadf7..4b7b425 100644 --- 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 }) - }) - - + }) } }, /** diff --git a/pages/writeReading/components/meterList/index.wxml b/pages/writeReading/components/meterList/index.wxml index d401d12..b7b6d2f 100644 --- a/pages/writeReading/components/meterList/index.wxml +++ b/pages/writeReading/components/meterList/index.wxml @@ -2,7 +2,7 @@ - 电表列表 (总计{{list.length}}块，已抄{{finishNumber}}块) + 电表列表 (总计{{list.length}}块，已抄{{list.length - finishNumber}}块) diff --git a/pages/writeReading/components/readingInfo/index.js b/pages/writeReading/components/readingInfo/index.js index 186bfd3..0ab31ed 100644 --- 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() + } } } }) diff --git a/pages/writeReading/components/readingInfo/index.wxml b/pages/writeReading/components/readingInfo/index.wxml index dbc4811..f3eaf9f 100644 --- a/pages/writeReading/components/readingInfo/index.wxml +++ b/pages/writeReading/components/readingInfo/index.wxml @@ -70,11 +70,11 @@ 表字差 - - {{(calcNumber || 0) - meterInfo.overall}} + + {{diff}} - {{(calcNumber || 0) - meterInfo.overall}} + {{diff}} diff --git a/pages/writeReading/index.wxml b/pages/writeReading/index.wxml index 6af428b..2813761 100644 --- 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}}" />