准备联调抄表记录

This commit is contained in:
2025-09-17 14:51:36 +08:00
parent 17c992fb0b
commit 4308096394
8 changed files with 74 additions and 13 deletions

View File

@@ -1,6 +1,6 @@
// pages/workBench/components/tenement/components/bindMeter/index.js // pages/workBench/components/tenement/components/bindMeter/index.js
// 0015980101 // 0015980101
import { bindMeter, } from "../../../../service/tenement" import { createReading } from "../../../../service/workBench"
import { getWorkMeterDetail } from "../../../../service/meter" import { getWorkMeterDetail } from "../../../../service/meter"
import { alertInfo, alertSuccess } from "../../../../utils/index"; import { alertInfo, alertSuccess } from "../../../../utils/index";
import request from "../../../../utils/request" import request from "../../../../utils/request"
@@ -16,7 +16,9 @@ Component({
title: String, title: String,
timeProps: String, timeProps: String,
numberProps: String, numberProps: String,
id: String id: String,
meter: String,
park: String
}, },
observers: { observers: {
"timeProps": function(newValue) { "timeProps": function(newValue) {
@@ -63,10 +65,24 @@ Component({
}) })
}, },
async onSubmit() { async onSubmit() {
const { time, number } = this.data; const { time, number, id, park, meter } = this.data;
if (time == null || number == null) { if (time == null || number == null) {
alertInfo("请正确填写后保存") alertInfo("请正确填写后保存")
return; return;
}
if (!id) {
const { code, message } = await createReading(park, meter, {
overall: `${number}`,
flat: `${number}`,
readAt: time
})
if (code !== OK) {
alertError(message)
return
}
alertSuccess("录入成功")
} else {
} }
this.triggerEvent("ok") this.triggerEvent("ok")
}, },

View File

@@ -25,6 +25,8 @@
value="{{ number }}" value="{{ number }}"
placeholder="请输入读数" placeholder="请输入读数"
label="读数" label="读数"
bind:change="onChange"
data-name="number"
type="digit" type="digit"
border="{{ false }}" border="{{ false }}"
title-width="100rpx" title-width="100rpx"

View File

@@ -19,4 +19,8 @@
justify-content: space-between; justify-content: space-between;
font-size: 30rpx; font-size: 30rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
}
.status {
font-size: 30rpx;
} }

View File

@@ -1,7 +1,7 @@
// pages/readingHistory/index.js // pages/readingHistory/index.js
import { getMeterReadingRouteMeterDetail } from "../../service/workBench" import { getMeterReadingRouteMeterDetail, getReadingList } from "../../service/workBench"
import request from "../../utils/request" import request from "../../utils/request"
import { alertInfo, alertSuccess, alertError } from "../../utils/index" import { alertInfo, alertSuccess, alertError, loadingFunc } from "../../utils/index"
const { OK } = request; const { OK } = request;
Page({ Page({
@@ -9,7 +9,9 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
list: [{time: "2025-05-05 14:10:09", number: 90803.87}] list: [],
page: 1,
size: 20,
}, },
/** /**
@@ -17,12 +19,21 @@ Page({
*/ */
onLoad(options) { onLoad(options) {
const { meter, park } = options; const { meter, park } = options;
const that = this;
this.setData({ this.setData({
meter, meter,
park park
}, () => {
that.refresh();
}) })
this.getMeterInfo(meter); this.getMeterInfo(meter);
}, },
refresh() {
const that = this;
loadingFunc(async () => {
await that.getList();
})
},
async getMeterInfo(id) { async getMeterInfo(id) {
const { code, message, data } = await getMeterReadingRouteMeterDetail(id) const { code, message, data } = await getMeterReadingRouteMeterDetail(id)
if (code !== OK) { if (code !== OK) {
@@ -31,6 +42,17 @@ Page({
} }
this.setData({ meterInfo: data }) this.setData({ meterInfo: data })
}, },
async getList() {
const { meter, park, page } = this.data;
const { code, message, records: data } = await getReadingList(park, meter, page)
if (code !== OK) {
alertError(message)
return;
}
this.setData({
list: data
})
},
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
@@ -40,7 +62,8 @@ Page({
handleCreate() { handleCreate() {
this.setData({ this.setData({
title: "新增记录", title: "新增记录",
visible: true visible: true,
type: "create"
}) })
}, },
handleUpdate() { handleUpdate() {
@@ -49,7 +72,8 @@ Page({
visible: true, visible: true,
time: "2025-09-11", time: "2025-09-11",
number: 100, number: 100,
id: "" id: "",
type: "edit",
}) })
}, },
handleDelete(e) { handleDelete(e) {

View File

@@ -22,10 +22,10 @@
<view wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item"> <view wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
<view class="tr" style="display: flex; align-items: center; "> <view class="tr" style="display: flex; align-items: center; ">
<view class="th" style="width: 40%; text-align: center; font-size: 30rpx;"> <view class="th" style="width: 40%; text-align: center; font-size: 30rpx;">
{{ item.time }} {{ item.readAt }}
</view> </view>
<view class="th" style="width: 35%; text-align: center; font-size: 30rpx;"> <view class="th" style="width: 35%; text-align: center; font-size: 30rpx;">
{{ item.number }} {{ item.overall }}
</view> </view>
<view class="th" style="width: 25%; text-align: center; justify-content: center; display: flex; align-items: center;"> <view class="th" style="width: 25%; text-align: center; justify-content: center; display: flex; align-items: center;">
@@ -46,4 +46,13 @@
</view> </view>
</view> </view>
<editModal title="{{title}}" visible="{{visible}}" timeProps="{{time}}" numberProps="{{number}}" id="{{id}}" /> <editModal
title="{{title}}"
visible="{{visible}}"
timeProps="{{time}}"
numberProps="{{number}}"
id="{{id}}"
park="{{park}}"
meter="{{meter}}"
bind:ok="refresh"
/>

View File

@@ -5,7 +5,7 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
active: 4 active: 1
}, },
/** /**

View File

@@ -30,7 +30,7 @@ Component({
jumpToHistory() { jumpToHistory() {
const { meterInfo } = this.data; const { meterInfo } = this.data;
wx.navigateTo({ wx.navigateTo({
url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.park}`, url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}`,
}) })
}, },
handlePrev() { handlePrev() {

View File

@@ -24,4 +24,10 @@ export const getMeterReadingRouteMeterDetail = async function(id) {
// 新建一条抄表记录 // 新建一条抄表记录
export const createReading = async function(park, code, data) { export const createReading = async function(park, code, data) {
return await POST(`/reading/${park}/${code}`, data); return await POST(`/reading/${park}/${code}`, data);
}
// 查询符合指定条件的抄表记录
export const getReadingList = async function(park, keyword, page) {
return await GET(`/reading/${park}?keyword=${keyword}&page=${page}`,);
} }