tx/bick_back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 财务管理--押金管理

Browse Source
This commit is contained in:
邱贞招 2024-05-24 13:52:09 +08:00
parent e140cb5118
commit fd868dcd6c
3 changed files with 32 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/system/order.js
View File

@ -9,6 +9,15 @@ export function listOrder(query) {
})
}
// 查询充值/退款订单列表
export function rechargeList(query) {
return request({
url: '/system/order/rechargeList',
method: 'get',
params: query
})
}
// 查询订单详细
export function getOrder(orderId) {
return request({

121
src/views/system/recharge/index.vue
View File

@ -1,37 +1,19 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="区域" prop="area">
<el-input
v-model="queryParams.area"
placeholder="请输入区域"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户" prop="userName">
<el-form-item label="手机号" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户"
placeholder="请输入手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备编码" prop="deviceMac">
<el-input
v-model="queryParams.deviceMac"
placeholder="请输入设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="充值状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择充值状态" clearable>
<el-option v-for="dict in dict.type.et_recharge_status" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -40,38 +22,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['system:order:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:order:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['system:order:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@ -87,51 +37,22 @@
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="订单id" align="center" prop="orderId" />-->
<el-table-column label="区域" align="center" prop="area" />
<el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="创建时间" align="center" prop="payTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="用户" align="center" prop="userName" />
<el-table-column label="设备编码" align="center" prop="deviceMac" />
<el-table-column label="支付时间" align="center" prop="payTime" width="180">
<el-table-column label="类型" align="center" prop="rechargeType">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
<dict-tag :options="dict.type.et_order_type" :value="scope.row.rechargeType"/>
</template>
</el-table-column>
<el-table-column label="支付方式" align="center" prop="payType">
<el-table-column label="押金金额" align="center" prop="totalFee" />
<el-table-column label="流水号" align="center" prop="orderNo" width="280" :show-overflow-tooltip="true"/>
<el-table-column label="充值状态" align="center" prop="rechargeStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_pay_type" :value="scope.row.payType"/>
</template>
</el-table-column>
<el-table-column label="类型" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_order_type" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="金额" align="center" prop="totalFee" />
<el-table-column label="备注" align="center" prop="mark" />
<el-table-column label="订单时" align="center" prop="duration" />
<el-table-column label="距离" align="center" prop="distance" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:order:edit']"
>详情</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:order:remove']"-->
<!-- >删除</el-button>-->
<dict-tag :options="dict.type.et_recharge_status" :value="scope.row.rechargeStatus"/>
</template>
</el-table-column>
</el-table>
@ -157,11 +78,11 @@
</template>
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order";
import { rechargeList, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order";
export default {
name: "Order",
dicts: ['et_order_type', 'et_pay_type', 'et_order_status'],
dicts: ['et_order_type', 'et_pay_type', 'et_recharge_status','et_recharge_status'],
data() {
return {
// 遮罩层
@ -215,7 +136,7 @@ export default {
/** 查询订单列表 */
getList() {
this.loading = true;
listOrder(this.queryParams).then(response => {
rechargeList(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;

4
src/views/system/refund/index.vue
View File

@ -95,7 +95,7 @@
<el-table v-loading="loading" :data="refundList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<!-- <el-table-column label="主键" align="center" prop="id" />-->
<el-table-column label="退款单号" align="center" prop="refundNo" />
<el-table-column label="关联订单" align="center" prop="orderNo" />
<el-table-column label="用户ID" align="center" prop="userId" />
@ -126,7 +126,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"