From a2f92a0959e7117ace063e4c1532288c70a29c97 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Wed, 24 Sep 2025 10:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/index.js | 6 ++++
pages/readingHistory/index.js | 3 +-
pages/readingHistory/index.wxml | 6 ++--
.../components/workBenchReading/index.js | 34 +++++++++++++------
.../components/workBenchReading/index.wxml | 7 +++-
pages/workBenchNew/index.js | 4 +++
.../components/meterInfo/index.js | 5 +--
.../components/readingInfo/index.js | 3 +-
.../components/readingInfo/index.wxml | 9 ++---
pages/writeReading/index.js | 3 +-
pages/writeReading/index.wxml | 7 +++-
project.private.config.json | 7 ++++
12 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/pages/login/index.js b/pages/login/index.js
index 13b8484..cb0d932 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -58,6 +58,12 @@ Page({
const { token, ...user } = data
wx.setStorageSync('user', user)
wx.setStorageSync('token', data?.token)
+ // if (user.workStatus) {
+ // wx.redirectTo({
+ // url: '/pages/workBenchNew/index',
+ // })
+ // return
+ // }
wx.switchTab({
url: '/pages/home/index',
})
diff --git a/pages/readingHistory/index.js b/pages/readingHistory/index.js
index fe45b04..b545ad7 100644
--- a/pages/readingHistory/index.js
+++ b/pages/readingHistory/index.js
@@ -20,12 +20,13 @@ Page({
*/
onLoad(options) {
console.log("options", options)
- const { meter, park, routeId } = options;
+ const { meter, park, routeId, disabled } = options;
const that = this;
this.setData({
meter,
park,
routeId,
+ disabled
}, () => {
that.refresh();
})
diff --git a/pages/readingHistory/index.wxml b/pages/readingHistory/index.wxml
index f554a89..3fb5403 100644
--- a/pages/readingHistory/index.wxml
+++ b/pages/readingHistory/index.wxml
@@ -6,7 +6,7 @@
抄表记录历史
- 新增记录
+ 新增记录
@@ -28,8 +28,8 @@
-
-
+
+
diff --git a/pages/workBenchNew/components/workBenchReading/index.js b/pages/workBenchNew/components/workBenchReading/index.js
index 8343e19..6f02a68 100644
--- a/pages/workBenchNew/components/workBenchReading/index.js
+++ b/pages/workBenchNew/components/workBenchReading/index.js
@@ -53,9 +53,9 @@ Page({
})
},
jumpToReading(e) {
- const { id } = e.currentTarget.dataset;
+ const { id, type } = e.currentTarget.dataset;
wx.navigateTo({
- url: `/pages/writeReading/index?id=${id}`,
+ url: `/pages/writeReading/index?id=${id}&type=${type}`,
})
},
async changeStartStatus(e) {
@@ -73,14 +73,28 @@ Page({
}, 500)
},
async changeEndStatus(e) {
- const { id, routeid: routeId } = e.currentTarget.dataset;
- const { code, message } = await changeMeterRouteStatus({ id, status: 0, routeId })
- if (code !== OK) {
- alertError(message)
- return
- }
- alertSuccess("操作成功")
- this.init()
+ const that = this;
+ wx.showModal({
+ title: '提示',
+ content: '确认要结束吗？',
+ complete: async (res) => {
+ if (res.cancel) {
+
+ }
+
+ if (res.confirm) {
+ const { id, routeid: routeId } = e.currentTarget.dataset;
+ const { code, message } = await changeMeterRouteStatus({ id, status: 0, routeId })
+ if (code !== OK) {
+ alertError(message)
+ return
+ }
+ alertSuccess("操作成功")
+ that.init()
+ }
+ }
+ })
+
},
/**
* 生命周期函数--监听页面加载
diff --git a/pages/workBenchNew/components/workBenchReading/index.wxml b/pages/workBenchNew/components/workBenchReading/index.wxml
index 1017fa0..e87ae64 100644
--- a/pages/workBenchNew/components/workBenchReading/index.wxml
+++ b/pages/workBenchNew/components/workBenchReading/index.wxml
@@ -31,7 +31,10 @@
wx:for="{{list}}"
wx:key="id"
title="{{item.readingRouteName}}"
- label="包含{{item.meterRoute}}个抄表点"
+ label="包含{{item.meterRoute}}个抄表点"
+ data-id="{{item.id}}"
+ data-type="look"
+ bind:click="jumpToReading"
>
开始抄表
去抄表
diff --git a/pages/workBenchNew/index.js b/pages/workBenchNew/index.js
index 82adef0..2857dc9 100644
--- a/pages/workBenchNew/index.js
+++ b/pages/workBenchNew/index.js
@@ -18,6 +18,10 @@ Page({
*/
onLoad(options) {
this.init()
+ const user = wx.getStorageSync('user')
+ this.setData({
+ workStatus: !!user.workStatus
+ })
},
async init() {
const { code, message, data } = await getWorkBenchHome()
diff --git a/pages/writeReading/components/meterInfo/index.js b/pages/writeReading/components/meterInfo/index.js
index 7548545..6bfc26f 100644
--- a/pages/writeReading/components/meterInfo/index.js
+++ b/pages/writeReading/components/meterInfo/index.js
@@ -7,6 +7,7 @@ Component({
properties: {
meterInfo: Object,
routeId: String,
+ disabled: Boolean,
},
/**
@@ -21,10 +22,10 @@ Component({
*/
methods: {
jumpToHistory() {
- const { meterInfo, routeId } = this.data;
+ const { meterInfo, routeId, disabled } = this.data;
console.log("meterInfo", meterInfo)
wx.navigateTo({
- url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}&routeId=${routeId}`,
+ url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}&routeId=${routeId}&disabled=${disabled}`,
})
},
}
diff --git a/pages/writeReading/components/readingInfo/index.js b/pages/writeReading/components/readingInfo/index.js
index bd192d4..1c7aa2d 100644
--- a/pages/writeReading/components/readingInfo/index.js
+++ b/pages/writeReading/components/readingInfo/index.js
@@ -15,7 +15,8 @@ Component({
meterInfo: Object,
showLeft: Boolean,
showRight: Boolean,
- routeId: String
+ routeId: String,
+ disabled: Boolean,
},
observers: {
"routeId": function(newValue) {
diff --git a/pages/writeReading/components/readingInfo/index.wxml b/pages/writeReading/components/readingInfo/index.wxml
index f3eaf9f..2233074 100644
--- a/pages/writeReading/components/readingInfo/index.wxml
+++ b/pages/writeReading/components/readingInfo/index.wxml
@@ -52,14 +52,15 @@
-
+