From 3b1e984042d90819e3a18c625ff48255306d2e2e Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 17 Aug 2023 16:37:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=8D=E8=AF=95=E9=80=80=E6=AC=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/order/order/orderDetail.vue | 155 ++++++++++-------- 1 file changed, 91 insertions(+), 64 deletions(-) diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index ba339a4fd..4bfbff486 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -10,7 +10,7 @@ title="提示" :visible.sync="dialogVisible" width="35%" - > + > 平台收到充电桩传来的最后一次实时监测数据
 @@ -24,10 +24,12 @@
- + - +
@@ -71,6 +73,7 @@ +

订单信息

@@ -90,43 +93,43 @@ - + + + + +
+ -->

收费明细

- - - - - - - - + + + + + + + +
@@ -163,8 +166,8 @@ @@ -176,7 +179,17 @@ -

退款信息

+
+ 退款信息 + + 重试退款 + +
@@ -204,19 +217,19 @@

用户信息

- - - + + + - +
@@ -239,16 +252,19 @@ import OrderEcharts from "@/views/order/order/orderEcharts"; export default { name: "", - components: { OrderEcharts }, + components: {OrderEcharts}, data() { return { orderList: this.$route.params.orderCode, orderInfo: [], payDetail: [], + // 订单退款列表 orderRefundInfoList: [], + // 重试退款按钮 + retryRefundFlag: false, userInfo: [], obj: {}, - orderDetail:[], + orderDetail: [], pileIn: [], orderRealTimeInfo: null, // 手动结算对话框Visible @@ -270,7 +286,7 @@ export default { }, methods: { getSummaries(param) { - const { columns, data } = param; + const {columns, data} = param; const sums = []; columns.forEach((column, index) => { if (index === 0) { @@ -278,7 +294,7 @@ export default { return; } const values = data.map(item => Number(item[column.property])); - if (column.property === 'usedElectricity' ||column.property ==='electricityAmount' || column.property==='serviceAmount' ) { + if (column.property === 'usedElectricity' || column.property === 'electricityAmount' || column.property === 'serviceAmount') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr); if (!isNaN(value)) { @@ -294,6 +310,11 @@ export default { clickManualSettlement() { this.dialogVisible = true; }, + + // 重试退款方法 + retryRefundOrder() { + console.log("点击重试退款按钮"); + }, confirmManualSettlement() { if (this.manualSettlementParam.chargingAmount == null) { return false; @@ -309,38 +330,44 @@ export default { }) }, async getOrderDetail() { - console.log("主页面传递过来的参数", this.orderList); + // console.log("主页面传递过来的参数", this.orderList); // console.log(this.orderList.orderCode) - const { data } = await getOrder(this.orderList); - console.log("getOrder", data); + const {data} = await getOrder(this.orderList); + // console.log("getOrder", data); this.obj = data; this.orderInfo = [data.orderInfo]; - console.log("this.orderInfo", this.orderDetail); + // console.log("this.orderInfo", this.orderDetail); this.payDetail = data.payRecordList; - console.log("this.payDetail", this.payDetail); + // console.log("this.payDetail", this.payDetail); this.orderRefundInfoList = data.orderRefundInfoList; this.userInfo = [data.memberInfo]; - console.log("this.userInfo", this.userInfo); + // console.log("this.userInfo", this.userInfo); this.pileIn = [data.pileInfo]; - console.log("this.pileIn", this.pileIn); + // console.log("this.pileIn", this.pileIn); this.orderRealTimeInfo = [data.orderRealTimeInfo]; this.orderDetail = [data.billingDetails]; this.tableData = data.chargeDetails; this.lastMonitorData = data.lastMonitorData; + + // 是否显示重试退款按钮 + if (data.orderInfo.orderStatus === '6' && data.payRecordList[0].payMode === '4' && data.orderRefundInfoList.length === 0) { + this.retryRefundFlag = true; + } }, }, - computed: { - // 一个计算属性的 getter - monitorDataList() { - return [this.lastMonitorData]; - } - } + computed: { + // 一个计算属性的 getter + monitorDataList() { + return [this.lastMonitorData]; + }, + } };