chuangte/electripper-v2-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
磷叶 2025-05-06 18:42:44 +08:00
parent 6e0581966e
commit d8726801c7
6 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/bst/index/components/OrderDailyStat.vue
View File

@ -17,11 +17,11 @@
</template>
<script>
import { getDailyAmount } from '@/api/dashboard/dashboard'
import { getDailyAmount } from '@/api/dashboard/dashboard';
import { getLastDateStr } from '@/utils';
import * as echarts from 'echarts';
import { DatePickerOptions } from '@/utils/constants';
import $resize from '@/views/dashboard/mixins/resize';
import {DatePickerOptions} from '@/utils/constants';
import * as echarts from 'echarts';
export default {
name: "OrderDailyStat",
@ -133,13 +133,13 @@ export default {
}
},
legend: {
data: ['订单数量', '订单金额', '订单退款', '订单实收', '分成金额', '分成退款', '分成实收'],
data: ['订单数量', '支付金额', '支付退款', '支付实收', '分成金额', '分成退款', '分成实收'],
top: 8,
selected: {
'订单数量': true,
'订单金额': false,
'订单退款': false,
'订单实收': true,
'支付金额': false,
'支付退款': false,
'支付实收': true,
'分成金额': false,
'分成退款': false,
'分成实收': true
@ -193,7 +193,7 @@ export default {
barWidth: '20%'
},
{
name: '订单金额',
name: '支付金额',
type: 'line',
yAxisIndex: 0,
data: orderAmounts,
@ -205,7 +205,7 @@ export default {
}
},
{
name: '订单退款',
name: '支付退款',
type: 'line',
yAxisIndex: 0,
data: orderRefunds,
@ -217,7 +217,7 @@ export default {
}
},
{
name: '订单实收',
name: '支付实收',
type: 'line',
yAxisIndex: 0,
data: orderNetAmounts,

8
src/views/bst/order/components/OrderRefundDialog.vue
View File

@ -22,7 +22,7 @@
</template>
<script>
import {getOrder, refundOrder} from '@/api/bst/order'
import { getOrder, refundOrder } from '@/api/bst/order';
export default {
props: {
@ -59,10 +59,7 @@ export default {
},
// 可退款金额
canRefundAmount() {
let payedAmount = this.detail.payedAmount || 0;
let payRefunded = this.detail.payRefunded || 0;
let payRefunding = this.detail.payRefunding || 0;
return payedAmount - payRefunded - payRefunding;
return this.detail.actualAmount || 0;
}
},
methods: {
@ -70,7 +67,6 @@ export default {
this.loading = true;
getOrder(this.id).then(response => {
this.detail = response.data;
this.form.amount = this.canRefundAmount;
}).finally(() => {
this.loading = false;
});

18
src/views/bst/order/index.vue
View File

@ -177,7 +177,7 @@
<div slot="reference">结算：{{d.row.totalFee | fix2 | dv}} 元 <i class="el-icon-info" /></div>
</el-popover>
</el-col>
<el-col :span="12" v-if="d.row.payedAmount" style="color: green;font-weight: bold;">实收：{{d.row.payedAmount - d.row.payRefunded - d.row.payRefunding | fix2 | dv}} 元</el-col>
<el-col :span="12" v-if="d.row.payedAmount" style="color: green;font-weight: bold;">实收：{{d.row.actualAmount | fix2 | dv}} 元</el-col>
<el-col :span="24" v-if="d.row.payRefunded || d.row.payRefunding" style="color: red;">
退款：{{d.row.payRefunded | fix2 | dv}} 元
<template v-if="d.row.payRefunding">(退款中：{{d.row.payRefunding | fix2 | dv}} 元)</template>
@ -283,18 +283,18 @@
</template>
<script>
import { listOrder, endOrder } from "@/api/bst/order";
import { $showColumns } from '@/utils/mixins';
import { endOrder, listOrder } from "@/api/bst/order";
import AreaLink from '@/components/Business/Area/AreaLink.vue';
import AreaRemoteSelect from '@/components/Business/Area/AreaRemoteSelect.vue';
import DeviceLink from '@/components/Business/Device/DeviceLink.vue';
import OrderLink from '@/components/Business/Order/OrderLink.vue';
import UserLink from '@/components/Business/User/UserLink.vue';
import FormCol from "@/components/FormCol/index.vue";
import { toDescriptionFromSecond } from '@/utils/date';
import { OrderStatus } from "@/utils/enums";
import { $showColumns } from '@/utils/mixins';
import OrderRefundDialog from "@/views/bst/order/components/OrderRefundDialog.vue";
import OrderVerifyDialog from "@/views/bst/order/components/OrderVerifyDialog.vue";
import { toDescriptionFromSecond } from '@/utils/date';
import UserLink from '@/components/Business/User/UserLink.vue';
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import OrderLink from '@/components/Business/Order/OrderLink.vue'
import AreaLink from '@/components/Business/Area/AreaLink.vue';
import AreaRemoteSelect from '@/components/Business/Area/AreaRemoteSelect.vue'
// 默认排序字段
const defaultSort = {

22
src/views/bst/order/view/view.vue
View File

@ -40,7 +40,7 @@
<el-col>
<el-statistic
title="实收"
:value="detail.payedAmount - detail.payRefunded - detail.payRefunding"
:value="detail.actualAmount"
:precision="2"
suffix="元"
value-style="color: #67C23A">
@ -252,23 +252,23 @@
</template>
<script>
import { getOrder, endOrder } from '@/api/bst/order'
import { endOrder, getOrder } from '@/api/bst/order'
import AreaLink from '@/components/Business/Area/AreaLink.vue'
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import UserLink from '@/components/Business/User/UserLink.vue'
import CollapsePanel from '@/components/CollapsePanel/index.vue'
import {SuitRidingRule, PayBstType, BonusBstType, OrderStatus, LogBizType} from '@/utils/enums'
import OrderDevice from '@/views/bst/orderDevice/index.vue'
import Pay from '@/views/bst/pay/index.vue'
import { toDescriptionFromSecond } from '@/utils/date'
import { BonusBstType, LogBizType, OrderStatus, PayBstType, SuitRidingRule } from '@/utils/enums'
import Bonus from '@/views/bst/bonus/index.vue'
import CommandLog from '@/views/bst/commandLog/index.vue'
import DeviceLocation from '@/views/bst/device/view/components/DeviceLocation.vue'
import OrderRefundDialog from '@/views/bst/order/components/OrderRefundDialog.vue'
import OrderVerifyDialog from '@/views/bst/order/components/OrderVerifyDialog.vue'
import { toDescriptionFromSecond } from '@/utils/date'
import { getOrderDuration } from '@/views/bst/order/util'
import OrderDevice from '@/views/bst/orderDevice/index.vue'
import Pay from '@/views/bst/pay/index.vue'
import Refund from '@/views/bst/refund/index.vue'
import Operlog from '@/views/monitor/operlog/index.vue'
import CommandLog from '@/views/bst/commandLog/index.vue'
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import UserLink from '@/components/Business/User/UserLink.vue'
import {getOrderDuration} from '@/views/bst/order/util'
import AreaLink from '@/components/Business/Area/AreaLink.vue'
export default {
name: 'OrderView',

7
src/views/bst/withdraw/components/WithdrawVerifyDialog.vue
View File

@ -15,7 +15,9 @@
<el-descriptions-item label="申请时间" :span="2">{{ detail.createTime | dv}}</el-descriptions-item>
<el-descriptions-item label="用户">{{ detail.userName | dv}}</el-descriptions-item>
<el-descriptions-item label="申请金额">{{ detail.amount | fix2 | dv }} 元</el-descriptions-item>
<el-descriptions-item label="到账金额">{{ detail.arrivalAmount | fix2 | dv }} 元</el-descriptions-item>
<el-descriptions-item label="到账金额">
<span style="color: red">{{ detail.arrivalAmount | fix2 | dv }} 元</span>
</el-descriptions-item>
<el-descriptions-item label="服务费">
{{ detail.serviceCharge | fix2 | dv }} 元
<dict-tag :options="dict.type.withdraw_service_type" :value="detail.serviceType" size="mini" style="margin-left: 4px"/>
@ -28,9 +30,8 @@
<el-descriptions-item label="银行名称">{{ detail.bankName | dv}}</el-descriptions-item>
<el-descriptions-item label="卡面名称">{{ detail.bankCardName | dv}}</el-descriptions-item>
<el-descriptions-item label="二维码" :span="2" v-if="AccountType.QR == detail.accountType">
<image-preview :src="detail.no" :width="100" :height="100" />
<image-preview :src="detail.accountNo" :width="100" :height="100" />
</el-descriptions-item>
</el-descriptions>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" v-if="canVerify">

4
vue.config.js
View File

@ -36,8 +36,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:4101`,
target: `https://ele.ccttiot.com/prod-api`,
target: `http://localhost:4101`,
// target: `https://ele.ccttiot.com/prod-api`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''