From 76746682fa4b9bda102978e2de4fdd301c1908c8 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 22 Sep 2025 10:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/readingHistory/components/editModal/index.js | 10 ++++------
pages/readingHistory/index.js | 9 ++++-----
pages/readingHistory/index.wxml | 1 +
.../workBenchNew/components/workBenchReading/index.js | 8 ++++----
.../components/workBenchReading/index.wxml | 2 ++
pages/writeReading/components/meterInfo/index.js | 6 ++++--
.../components/meterList/components/meterItem/index.js | 3 ++-
.../meterList/components/meterItem/index.wxml | 2 +-
.../meterList/components/meterItem/index.wxss | 6 +++++-
pages/writeReading/components/meterList/index.js | 3 ---
pages/writeReading/components/meterList/index.wxml | 1 +
pages/writeReading/components/photo/index.js | 2 +-
pages/writeReading/components/readingInfo/index.js | 6 +++---
pages/writeReading/index.js | 3 +++
pages/writeReading/index.wxml | 3 ++-
service/workBench.js | 4 ++--
16 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/pages/readingHistory/components/editModal/index.js b/pages/readingHistory/components/editModal/index.js
index 8b57046..c8fd43c 100644
--- a/pages/readingHistory/components/editModal/index.js
+++ b/pages/readingHistory/components/editModal/index.js
@@ -18,7 +18,8 @@ Component({
numberProps: String,
idProps: String,
meter: String,
- park: String
+ park: String,
+ routeId: String,
},
observers: {
"timeProps": function(newValue) {
@@ -33,9 +34,6 @@ Component({
number: newValue
})
},
- "idProps": function(newValue) {
- console.log("new id", newValue)
- }
},
/**
* 组件的初始数据
@@ -70,13 +68,13 @@ Component({
})
},
async onSubmit() {
- const { time, number, idProps, park, meter, timeProps } = this.data;
+ const { time, number, idProps, park, meter, timeProps, routeId } = this.data;
if (time == null || number == null) {
alertInfo("请正确填写后保存")
return;
}
if (!idProps) {
- const { code, message } = await createReading(park, meter, {
+ const { code, message } = await createReading(park, meter, routeId, {
overall: `${number}`,
flat: `${number}`,
readAt: time,
diff --git a/pages/readingHistory/index.js b/pages/readingHistory/index.js
index 85ea9b9..fe45b04 100644
--- a/pages/readingHistory/index.js
+++ b/pages/readingHistory/index.js
@@ -19,11 +19,13 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- const { meter, park } = options;
+ console.log("options", options)
+ const { meter, park, routeId } = options;
const that = this;
this.setData({
meter,
- park
+ park,
+ routeId,
}, () => {
that.refresh();
})
@@ -92,7 +94,6 @@ Page({
},
handleUpdate(e) {
const { data } = e.currentTarget.dataset;
- console.log("data", data);
this.setData({
title: "编辑记录",
visible: true,
@@ -101,8 +102,6 @@ Page({
id: data.id,
readAtTimestamp: data.readAtTimestamp,
type: "edit",
- }, () => {
- console.log("this.data---------", this.data)
})
},
handleDelete(e) {
diff --git a/pages/readingHistory/index.wxml b/pages/readingHistory/index.wxml
index 0a478cc..87650e1 100644
--- a/pages/readingHistory/index.wxml
+++ b/pages/readingHistory/index.wxml
@@ -57,4 +57,5 @@
meter="{{meter}}"
bind:ok="onEditFinish"
startTime="{{startTime}}"
+ routeId="{{routeId}}"
/>
\ No newline at end of file
diff --git a/pages/workBenchNew/components/workBenchReading/index.js b/pages/workBenchNew/components/workBenchReading/index.js
index f71ac53..583bec3 100644
--- a/pages/workBenchNew/components/workBenchReading/index.js
+++ b/pages/workBenchNew/components/workBenchReading/index.js
@@ -60,8 +60,8 @@ Page({
},
async changeStartStatus(e) {
const that = this;
- const { id } = e.currentTarget.dataset;
- const { code, message } = await changeMeterRouteStatus({ id, status: 1 })
+ const { id, routeId } = e.currentTarget.dataset;
+ const { code, message } = await changeMeterRouteStatus({ id, status: 1, routeId })
if (code !== OK) {
alertError(message)
return
@@ -73,8 +73,8 @@ Page({
}, 500)
},
async changeEndStatus(e) {
- const { id } = e.currentTarget.dataset;
- const { code, message } = await changeMeterRouteStatus({ id, status: 0 })
+ const { id, routeId } = e.currentTarget.dataset;
+ const { code, message } = await changeMeterRouteStatus({ id, status: 0, routeId })
if (code !== OK) {
alertError(message)
return
diff --git a/pages/workBenchNew/components/workBenchReading/index.wxml b/pages/workBenchNew/components/workBenchReading/index.wxml
index 6aeca07..61831ea 100644
--- a/pages/workBenchNew/components/workBenchReading/index.wxml
+++ b/pages/workBenchNew/components/workBenchReading/index.wxml
@@ -39,6 +39,7 @@
size="small"
type="primary"
bind:tap="changeStartStatus"
+ data-routeId="{{item.readingRouteId}}"
custom-style="margin-right: 20rpx;"
data-id="{{item.id}}"
wx:if="{{item.status === 0}}"
@@ -57,6 +58,7 @@
bind:tap="changeEndStatus"
data-id="{{item.id}}"
wx:if="{{item.status === 1}}"
+ data-routeId="{{item.readingRouteId}}"
> 结束抄表
diff --git a/pages/writeReading/components/meterInfo/index.js b/pages/writeReading/components/meterInfo/index.js
index 0e1b6a2..7548545 100644
--- a/pages/writeReading/components/meterInfo/index.js
+++ b/pages/writeReading/components/meterInfo/index.js
@@ -6,6 +6,7 @@ Component({
*/
properties: {
meterInfo: Object,
+ routeId: String,
},
/**
@@ -20,9 +21,10 @@ Component({
*/
methods: {
jumpToHistory() {
- const { meterInfo } = this.data;
+ const { meterInfo, routeId } = this.data;
+ console.log("meterInfo", meterInfo)
wx.navigateTo({
- url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}`,
+ url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}&routeId=${routeId}`,
})
},
}
diff --git a/pages/writeReading/components/meterList/components/meterItem/index.js b/pages/writeReading/components/meterList/components/meterItem/index.js
index 8295f38..a34d5fa 100644
--- a/pages/writeReading/components/meterList/components/meterItem/index.js
+++ b/pages/writeReading/components/meterList/components/meterItem/index.js
@@ -6,7 +6,8 @@ Component({
*/
properties: {
active: Boolean,
- meter: Object
+ meter: Object,
+ status: Number,
},
observers: {
"active": function (newValue) {
diff --git a/pages/writeReading/components/meterList/components/meterItem/index.wxml b/pages/writeReading/components/meterList/components/meterItem/index.wxml
index e097bcc..bc1bf49 100644
--- a/pages/writeReading/components/meterList/components/meterItem/index.wxml
+++ b/pages/writeReading/components/meterList/components/meterItem/index.wxml
@@ -1,4 +1,4 @@
-
+
{{meter.meterAddress}}
\ No newline at end of file
diff --git a/pages/writeReading/components/meterList/components/meterItem/index.wxss b/pages/writeReading/components/meterList/components/meterItem/index.wxss
index c0decfc..f39e216 100644
--- a/pages/writeReading/components/meterList/components/meterItem/index.wxss
+++ b/pages/writeReading/components/meterList/components/meterItem/index.wxss
@@ -19,6 +19,10 @@
}
.deepBg {
- background-color: var(--deep-green);
+ background-color: var(--deep-green) !important;
color: white;
+}
+
+.done {
+ background-color: #ccc;
}
\ No newline at end of file
diff --git a/pages/writeReading/components/meterList/index.js b/pages/writeReading/components/meterList/index.js
index 4b7b425..f65e7e7 100644
--- a/pages/writeReading/components/meterList/index.js
+++ b/pages/writeReading/components/meterList/index.js
@@ -32,9 +32,6 @@ Component({
})
}
},
- "finishNumber": function(newValue) {
- console.log("finishNumber0000000000-----------", newValue)
- }
},
/**
* 组件的初始数据
diff --git a/pages/writeReading/components/meterList/index.wxml b/pages/writeReading/components/meterList/index.wxml
index b7b6d2f..50a2799 100644
--- a/pages/writeReading/components/meterList/index.wxml
+++ b/pages/writeReading/components/meterList/index.wxml
@@ -22,6 +22,7 @@
bind:click="handleSelect"
data-index="{{index}}"
data-id="{{item.meterId}}"
+ status="{{item.status}}"
/>
diff --git a/pages/writeReading/components/photo/index.js b/pages/writeReading/components/photo/index.js
index 2c8a2c2..ae4ca6e 100644
--- a/pages/writeReading/components/photo/index.js
+++ b/pages/writeReading/components/photo/index.js
@@ -51,7 +51,7 @@ Component({
return
}
setTimeout(() => {
- that.triggerEvent("finish", { number: data?.integer, success: data?.integer != null && data?.integer !== "" })
+ that.triggerEvent("finish", { number: data?.integer + "." + data?.decimal || 0, success: data?.integer != null && data?.integer !== "" })
}, 100)
})
diff --git a/pages/writeReading/components/readingInfo/index.js b/pages/writeReading/components/readingInfo/index.js
index e4d3a12..64840dd 100644
--- a/pages/writeReading/components/readingInfo/index.js
+++ b/pages/writeReading/components/readingInfo/index.js
@@ -22,7 +22,6 @@ Component({
if (!newValue) {
return;
}
- console.log("---------------");
this.checkFinish(newValue)
}
},
@@ -86,9 +85,9 @@ Component({
}
},
async onSubmit() {
- const { meterInfo, currentNumber } = this.data;
+ const { meterInfo, currentNumber, routeId } = this.data;
const { parkId, id } = meterInfo;
- const { code, message } = await createReading(parkId, id, {
+ const { code, message } = await createReading(parkId, id, routeId, {
overall: `${currentNumber}`,
flat: `${currentNumber}`,
readAt: dayjs().format("YYYY-MM-DD HH:mm:ss"),
@@ -105,6 +104,7 @@ Component({
})
alertSuccess("录入成功")
const that = this;
+ that.triggerEvent("onSubmit")
setTimeout(async () => {
const isFinished = await that.checkFinish()
if (isFinished) {
diff --git a/pages/writeReading/index.js b/pages/writeReading/index.js
index 82f99ba..1aaa473 100644
--- a/pages/writeReading/index.js
+++ b/pages/writeReading/index.js
@@ -44,6 +44,9 @@ Page({
active: e.detail.index,
})
},
+ onSubmit() {
+ this.getMeterList(this.data.routeId)
+ },
handleNext() {
const { active = 0, meterList } = this.data;
let newIndex = active + 1
diff --git a/pages/writeReading/index.wxml b/pages/writeReading/index.wxml
index 2813761..9cc7c60 100644
--- a/pages/writeReading/index.wxml
+++ b/pages/writeReading/index.wxml
@@ -8,7 +8,7 @@
meterInfo="{{meterInfo}}"
finishNumber="{{finishNumber}}"
/>
-
+
\ No newline at end of file
diff --git a/service/workBench.js b/service/workBench.js
index e31833e..a079d17 100644
--- a/service/workBench.js
+++ b/service/workBench.js
@@ -22,8 +22,8 @@ export const getMeterReadingRouteMeterDetail = async function(id) {
}
// 新建一条抄表记录
-export const createReading = async function(park, code, data) {
- return await POST(`/reading/hand/${park}/${code}`, data);
+export const createReading = async function(park, code, routeId, data) {
+ return await POST(`/reading/hand/${park}/${code}?parkRouteId=${routeId}`, data);
}