修改解绑表的时候读数问题,抄表路线的抄表记录可以查看图片
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// pages/workBenchNew/components/workBenchReading/index.js
|
||||
import { getMeterReadingRouteList, changeMeterRouteStatus } from "../../../../service/workBench"
|
||||
import { getMeterReadingRouteList, changeMeterRouteStatus, checkReadingFinish } from "../../../../service/workBench"
|
||||
import { alertError, alertSuccess, loadingFunc } from "../../../../utils/index"
|
||||
import request from "../../../../utils/request"
|
||||
const { OK } = request
|
||||
@@ -72,6 +72,10 @@ Page({
|
||||
that.jumpToReading({ currentTarget: { dataset: { id } } })
|
||||
}, 500)
|
||||
},
|
||||
// async checkFinish(id) {
|
||||
|
||||
// return {data, num};
|
||||
// },
|
||||
async changeEndStatus(e) {
|
||||
const that = this;
|
||||
wx.showModal({
|
||||
@@ -83,10 +87,38 @@ Page({
|
||||
}
|
||||
|
||||
if (res.confirm) {
|
||||
const { id, routeid: routeId } = e.currentTarget.dataset;
|
||||
const { code, message } = await changeMeterRouteStatus({ id, status: 0, routeId })
|
||||
const { id, routeid: routeId } = e.currentTarget.dataset;
|
||||
const { code, message, data, num } = await checkReadingFinish(id || this.data.routeId);
|
||||
if (code !== OK) {
|
||||
alertError(message)
|
||||
return;
|
||||
}
|
||||
console.log("data", data, "num", num)
|
||||
if (!data) {
|
||||
wx.showModal({
|
||||
title: '提示',
|
||||
content: `该路线还有${num}块电表还没有抄完,是否确认结束结束抄表?`,
|
||||
complete: async (res) => {
|
||||
if (res.cancel) {
|
||||
|
||||
}
|
||||
|
||||
if (res.confirm) {
|
||||
const { code: cd, message } = await changeMeterRouteStatus({ id, status: 0, routeId })
|
||||
if (cd !== OK) {
|
||||
alertError(message)
|
||||
return
|
||||
}
|
||||
alertSuccess("操作成功")
|
||||
that.init()
|
||||
}
|
||||
}
|
||||
})
|
||||
return
|
||||
}
|
||||
const { code: c, message: m } = await changeMeterRouteStatus({ id, status: 0, routeId })
|
||||
if (c !== OK) {
|
||||
alertError(m)
|
||||
return
|
||||
}
|
||||
alertSuccess("操作成功")
|
||||
|
||||
@@ -106,11 +106,11 @@ Component({
|
||||
return;
|
||||
}
|
||||
this.setData({
|
||||
overall: Number(data?.overall || 0),
|
||||
critical: Number(data?.sharp || 0),
|
||||
peak: Number(data?.peak || 0),
|
||||
flat: Number(data?.flat || 0),
|
||||
valley: Number(data?.valley || 0),
|
||||
overall: data?.overall ? Number(data?.overall || 0) : null,
|
||||
critical: data?.overall ? Number(data?.sharp || 0) : null,
|
||||
peak: data?.overall ? Number(data?.peak || 0) : null,
|
||||
flat: data?.overall ? Number(data?.flat || 0) : null,
|
||||
valley: data?.overall ? Number(data?.valley || 0) : null,
|
||||
meter04kvType: data?.meter04kvType,
|
||||
status: data?.breakType ? '合闸' : "分闸",
|
||||
})
|
||||
|
||||
@@ -112,6 +112,7 @@
|
||||
park="{{park}}"
|
||||
bindconfirm="onConfirm"
|
||||
bindcancel="onCancel"
|
||||
filterBind="{{true}}"
|
||||
/>
|
||||
|
||||
<date-time-picker
|
||||
|
||||
@@ -55,11 +55,11 @@ Component({
|
||||
return;
|
||||
}
|
||||
this.setData({
|
||||
overall: Number(data?.overall || 0),
|
||||
critical: Number(data?.sharp || 0),
|
||||
peak: Number(data?.peak || 0),
|
||||
flat: Number(data?.flat || 0),
|
||||
valley: Number(data?.valley || 0),
|
||||
overall: data?.overall ? Number(data?.overall || 0) : null,
|
||||
critical: data?.overall ? Number(data?.sharp || 0) : null,
|
||||
peak: data?.overall ? Number(data?.peak || 0) : null,
|
||||
flat: data?.overall ? Number(data?.flat || 0) : null,
|
||||
valley: data?.overall ? Number(data?.valley || 0) : null,
|
||||
meter04kvType: data?.meter04kvType,
|
||||
status: data?.breakType ? '合闸' : "分闸"
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user