From 1e92bb8bcf3e4fcc87fba3fbf63b61bdb64f467c Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Tue, 7 May 2024 13:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E7=94=B5=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E7=94=B5=E8=A1=A8=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/electricQuery/index.js | 34 ++++++++++++++------
pages/electricQuery/index.wxml | 8 +++--
pages/electricQuery/index.wxss | 1 +
pages/invoiceDetail/index.js | 48 ++++++++++++++---------------
pages/invoiceDetailContent/index.js | 1 -
5 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/pages/electricQuery/index.js b/pages/electricQuery/index.js
index fefcc51..1513005 100644
--- a/pages/electricQuery/index.js
+++ b/pages/electricQuery/index.js
@@ -4,6 +4,7 @@ import { getTenementMeterList } from "../../service/meter";
import dayjs from "../../utils/dayjs";
import request from '../../utils/request';
import * as echarts from '../../components/echarts/echarts';
+import { alertInfo } from "../../utils/index";
const { OK } = request;
Page({
@@ -37,7 +38,9 @@ Page({
list: [],
visible: false,
meterReadingList: [],
- accountingList: []
+ accountingList: [],
+ electricNumber: 0,
+ meterNumber: 0,
},
changeQueryType(e) {
const { type } = e.currentTarget.dataset
@@ -90,26 +93,38 @@ Page({
time = yearMonthDay;
break;
}
- const { code, message, data } = await getElectricityList({ type: timeType, meter: meterId, time: time })
- this.setData({ list: data })
+ const { code, message, data, electricNumber, meterNumber } = await getElectricityList({ type: timeType, meter: meterId, time: time })
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
+ this.setData({ list: data, electricNumber, meterNumber })
},
async getReadingList() {
const { meterId } = this.data;
const { code, message, data } = await getMeterReadingList(meterId)
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
this.setData({ meterReadingList: data })
},
async getAccountingBalanceList() {
const { meterId } = this.data;
const { code, message, data } = await getAccountingList(meterId)
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
this.setData({ accountingList: data })
},
async getMeters() {
const { id } = wx.getStorageSync('tenement')
const { code, message, data } = await getTenementMeterList(id);
- // if (code !== OK) {
- // alertInfo(message)
- // return;
- // }
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
this.setData({
meterList: data || [],
@@ -133,12 +148,13 @@ Page({
},
onOk(e) {
const { type, value = {} } = e.detail;
- const { id, code } = e;
+ const { id, code } = e.detail.value;
+ console.log('e', e)
const { year } = this.data;
// const currentYear = years[Number(e)]
this.setData({
// year: currentYear,
- codeId: id,
+ meterId: id,
meterCode: code,
type: "",
show: false,
diff --git a/pages/electricQuery/index.wxml b/pages/electricQuery/index.wxml
index de2f2cd..4aa9bf2 100644
--- a/pages/electricQuery/index.wxml
+++ b/pages/electricQuery/index.wxml
@@ -74,7 +74,7 @@
- 合计：表计数量：10，耗电量100
+ 合计：表计数量：{{meterNumber}}，耗电量：{{electricNumber}}
@@ -86,9 +86,11 @@
-
+
+
+
-
+
diff --git a/pages/electricQuery/index.wxss b/pages/electricQuery/index.wxss
index 036a4eb..756776c 100644
--- a/pages/electricQuery/index.wxss
+++ b/pages/electricQuery/index.wxss
@@ -23,6 +23,7 @@ page {
margin-bottom: 30rpx;
margin-left: 30rpx;
margin-right: 30rpx;
+ padding-bottom: 50rpx;
}
.query {
diff --git a/pages/invoiceDetail/index.js b/pages/invoiceDetail/index.js
index c4249d4..0436708 100644
--- a/pages/invoiceDetail/index.js
+++ b/pages/invoiceDetail/index.js
@@ -1,5 +1,5 @@
import { getInvoiceInfoDetail, downloadInvoice } from "../../service/invoice";
-import { alertInfo } from "../../utils/index";
+import { alertInfo, loadingFunc } from "../../utils/index";
import request from '../../utils/request'
const { OK } = request;
// pages/invoiceInfo/index.js
@@ -33,34 +33,34 @@ Page({
})
},
download() {
- // console.log('---------')
const that = this;
wx.showActionSheet({
itemList: ['发票XML文件下载', '发票PDF文件下载'],
async success(res) {
- console.log('res', res.tapIndex)
- const { code, message, data } = await downloadInvoice(that.data.id, res.tapIndex);
- if (code !== OK) {
- alertInfo(message)
- return;
- }
- wx.downloadFile({
- url: data,
- success(res) {
- if (res.statusCode === 200) {
- wx.openDocument({
- filePath: res.tempFilePath,
- fileType: [res.tapIndex === 0 ? 'xml' : "pdf"], // 3. 这个必须写合法类型，不然下载不了 ！！！
- success: function (res) {
- console.log('打开文档成功')
- },
- fail: function (e) {
- console.log(e.errMsg);
- }
- })
- }
-
+ loadingFunc(async () => {
+ const { code, message, data } = await downloadInvoice(that.data.id, res.tapIndex);
+ if (code !== OK) {
+ alertInfo(message)
+ return;
}
+ wx.downloadFile({
+ url: data,
+ success(res) {
+ if (res.statusCode === 200) {
+ wx.openDocument({
+ filePath: res.tempFilePath,
+ fileType: [res.tapIndex === 0 ? 'xml' : "pdf"], // 3. 这个必须写合法类型，不然下载不了 ！！！
+ success: function (res) {
+
+ },
+ fail: function (e) {
+
+ }
+ })
+ }
+
+ }
+ })
})
diff --git a/pages/invoiceDetailContent/index.js b/pages/invoiceDetailContent/index.js
index d9c450b..c5367c3 100644
--- a/pages/invoiceDetailContent/index.js
+++ b/pages/invoiceDetailContent/index.js
@@ -20,7 +20,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- console.log('options', options)
const { id } = options;
this.getDetail(id)
},