chuangte/share-space-vue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-01-03 15:31:56 +08:00
parent 8dffc3795b
commit 3f7a0f8553
7 changed files with 382 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/system/refund.js
View File

@ -1,6 +1,6 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询退款订单列表 // 查询退款列表
export function listRefund(query) { export function listRefund(query) {
return request({ return request({
url: '/system/refund/list', url: '/system/refund/list',
@ -9,7 +9,7 @@ export function listRefund(query) {
}) })
} }
// 查询退款订单详细 // 查询退款详细
export function getRefund(id) { export function getRefund(id) {
return request({ return request({
url: '/system/refund/' + id, url: '/system/refund/' + id,
@ -17,7 +17,7 @@ export function getRefund(id) {
}) })
} }
// 新增退款订单 // 新增退款
export function addRefund(data) { export function addRefund(data) {
return request({ return request({
url: '/system/refund', url: '/system/refund',
@ -26,7 +26,7 @@ export function addRefund(data) {
}) })
} }
// 修改退款订单 // 修改退款
export function updateRefund(data) { export function updateRefund(data) {
return request({ return request({
url: '/system/refund', url: '/system/refund',
@ -35,7 +35,7 @@ export function updateRefund(data) {
}) })
} }
// 删除退款订单 // 删除退款
export function delRefund(id) { export function delRefund(id) {
return request({ return request({
url: '/system/refund/' + id, url: '/system/refund/' + id,

44
src/api/system/refund2.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询退款订单列表
export function listRefund(query) {
return request({
url: '/system/refund/list',
method: 'get',
params: query
})
}
// 查询退款订单详细
export function getRefund(id) {
return request({
url: '/system/refund/' + id,
method: 'get'
})
}
// 新增退款订单
export function addRefund(data) {
return request({
url: '/system/refund',
method: 'post',
data: data
})
}
// 修改退款订单
export function updateRefund(data) {
return request({
url: '/system/refund',
method: 'put',
data: data
})
}
// 删除退款订单
export function delRefund(id) {
return request({
url: '/system/refund/' + id,
method: 'delete'
})
}

3
src/main.js
View File

@ -39,6 +39,9 @@ import VueMeta from 'vue-meta'
import DictData from '@/components/DictData' import DictData from '@/components/DictData'
// 行内表单组件 // 行内表单组件
import FormCol from '@/components/FormCol/index.vue' import FormCol from '@/components/FormCol/index.vue'
// 过滤器
import filter from "@/utils/filter";
filter(Vue);
// 全局方法挂载 // 全局方法挂载
Vue.prototype.getDicts = getDicts Vue.prototype.getDicts = getDicts

30
src/utils/filter.js Normal file
View File

@ -0,0 +1,30 @@
const filters = {
// 金钱显示，保留两位小数
money(num) {
return filters.fix2(num);
},
// 缺省值
defaultValue(data) {
return data == null ? '--' : data;
},
fix2(num) {
if (num == null) {
return num;
}
return num.toFixed(2);
},
fix10(num) {
if (num == null) {
return num;
}
return num.toFixed(10);
},
dv(data) {
return filters.defaultValue(data);
}
}
export default (vm) => {
Object.keys(filters).forEach(key => {
vm.filter(key, filters[key])
})
}

168
src/views/system/order/index.vue
View File

@ -73,48 +73,94 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单号" width="150" align="center" prop="orderNo" /> <template v-for="column of showColumns">
<el-table-column label="支付单号" width="150" align="center" prop="outTradeNo" /> <el-table-column
<el-table-column label="用户" align="center" prop="realName" /> :key="column.key"
<el-table-column label="手机号" align="center" prop="phone" /> :label="column.label"
<el-table-column label="支付时间" align="center" prop="payTime" width="90"> :prop="column.key"
<template slot-scope="scope"> :align="column.align"
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> :min-width="column.minWidth"
</template> :sort-orders="orderSorts"
</el-table-column> :sortable="column.sortable"
<el-table-column label="支付方式" align="center" prop="payType"> :show-overflow-tooltip="column.overflow"
<template slot-scope="scope"> :width="column.width"
<dict-tag :options="dict.type.ss_pay_type" :value="scope.row.payType"/> >
</template> <template slot-scope="d">
</el-table-column> <template v-if="column.key === 'id'">
<el-table-column label="支付状态" align="center" prop="paid"> {{d.row[column.key]}}
<template slot-scope="scope"> </template>
<dict-tag :options="dict.type.et_order_pay_status" :value="scope.row.paid"/> <template v-else-if="column.key === 'payTime'">
</template> <span>{{ parseTime(d.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</el-table-column> </template>
<el-table-column label="类型" align="center" prop="type"> <template v-else-if="column.key === 'payType'">
<template slot-scope="scope"> <dict-tag :options="dict.type.ss_pay_type" :value="d.row[column.key]"/>
<dict-tag :options="dict.type.ss_order_type" :value="scope.row.type"/> </template>
</template> <template v-else-if="column.key === 'paid'">
</el-table-column> <dict-tag :options="dict.type.et_order_pay_status" :value="d.row[column.key]"/>
<el-table-column label="订单总金额" align="center" prop="totalFee" /> </template>
<el-table-column label="实际支付金额" align="center" prop="payFee" /> <template v-else-if="column.key === 'type'">
<el-table-column label="订单时长" align="center" prop="duration" /> <dict-tag :options="dict.type.ss_order_type" :value="d.row[column.key]"/>
<el-table-column label="状态" align="center" prop="status"> </template>
<template slot-scope="scope"> <template v-else-if="column.key === 'totalFee' || column.key === 'payFee' || column.key === 'handlingCharge' || column.key === 'platformServiceFee'">
<dict-tag :options="dict.type.ss_order_status" :value="scope.row.status"/> {{d.row[column.key] | dv}} 元
</template> </template>
</el-table-column> <template v-else-if="column.key === 'duration'">
<el-table-column label="手续费" align="center" prop="handlingCharge" /> {{d.row[column.key] | dv}} 小时
<el-table-column label="服务费" align="center" prop="platformServiceFee" /> </template>
<el-table-column label="支付渠道" align="center" prop="channelName" /> <template v-else-if="column.key === 'status'">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <dict-tag :options="dict.type.ss_order_status" :value="d.row[column.key]"/>
<template slot-scope="scope"> </template>
</template> <template v-else>
</el-table-column> {{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
</el-table> </el-table>
<!-- <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">-->
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="订单号" width="150" align="center" prop="orderNo" />-->
<!-- <el-table-column label="用户" align="center" prop="userName" />-->
<!-- <el-table-column label="支付单号" width="150" align="center" prop="outTradeNo" />-->
<!--&lt;!&ndash; <el-table-column label="手机号" align="center" prop="phone" />&ndash;&gt;-->
<!-- <el-table-column label="支付时间" align="center" prop="payTime" width="90">-->
<!-- <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="payType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.ss_pay_type" :value="scope.row.payType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="支付状态" align="center" prop="paid">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.et_order_pay_status" :value="scope.row.paid"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="类型" align="center" prop="type">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.ss_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="payFee" />-->
<!-- <el-table-column label="订单时长" align="center" prop="duration" />-->
<!-- <el-table-column label="状态" align="center" prop="status">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.ss_order_status" :value="scope.row.status"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="手续费" align="center" prop="handlingCharge" />-->
<!-- <el-table-column label="服务费" align="center" prop="platformServiceFee" />-->
<!-- <el-table-column label="支付渠道" align="center" prop="channelName" />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -208,12 +254,39 @@
<script> <script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order"; import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order";
import { $showColumns } from '@/utils/mixins';
import {parseTime} from "../../../utils/ruoyi";
// 默认排序字段
const defaultSort = {
prop: "createTime",
order: "descending"
}
export default { export default {
name: "Order", name: "Order",
mixins: [$showColumns],
dicts: ['ss_order_status', 'ss_pay_type', 'rl_distribution_mode', 'rl_rental_unit','ss_order_type','et_order_pay_status'], dicts: ['ss_order_status', 'ss_pay_type', 'rl_distribution_mode', 'rl_rental_unit','ss_order_type','et_order_pay_status'],
data() { data() {
return { return {
// 字段列表
columns: [
{key: 'orderNo', visible: true, label: '订单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'outTradeNo', visible: true, label: '支付单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'payTime', visible: true, label: '支付时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'payType', visible: true, label: '支付方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'paid', visible: true, label: '支付状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'totalFee', visible: true, label: '订单总金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'payFee', visible: true, label: '实际支付金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'duration', visible: true, label: '订单时长', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'handlingCharge', visible: true, label: '手续费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'platformServiceFee', visible: true, label: '服务费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'channelName', visible: true, label: '支付渠道', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -232,10 +305,13 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
defaultSort,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
orderNo: null, orderNo: null,
outTradeNo: null, outTradeNo: null,
userId: null, userId: null,
@ -293,6 +369,18 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
parseTime,
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {
this.queryParams.orderByColumn = defaultSort.prop;
this.queryParams.isAsc = defaultSort.order;
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
}
this.getList();
},
/** 查询订单列表 */ /** 查询订单列表 */
getList() { getList() {
this.loading = true; this.loading = true;

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

@ -1,31 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="代理商" prop="deptId" v-if="userName == 'admin' && !deptId">
<el-select
v-model="queryParams.deptId"
filterable
placeholder="选择代理商"
style="width: 120px"
clearable>
<el-option
v-for="item in deptOptions"
:key="item.deptId"
:label="item.deptName"
:value="item.deptId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="运营区" prop="areaId" v-if="userName == 'admin' && !deptId">
<el-select v-model="queryParams.areaId" filterable placeholder="请选择运营区" clearable>
<el-option
v-for="item in areaOptions"
:key="item.areaId"
:label="item.areaName"
:value="item.areaId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="退款单号" prop="refundNo"> <el-form-item label="退款单号" prop="refundNo">
<el-input <el-input
v-model="queryParams.refundNo" v-model="queryParams.refundNo"
@ -34,22 +9,40 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="关联订单" prop="orderNo"> <el-form-item label="订单号" prop="orderNo">
<el-input <el-input
v-model="queryParams.orderNo" v-model="queryParams.orderNo"
placeholder="请输入关联订单" placeholder="请输入订单号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="用户" prop="userName"> <!-- <el-form-item label="用户ID" prop="userId">-->
<!-- <el-input-->
<!-- v-model="queryParams.userId"-->
<!-- placeholder="请输入用户ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="用户名" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户" placeholder="请输入用户名"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.ss_refund_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="退款金额" prop="amount"> <el-form-item label="退款金额" prop="amount">
<el-input <el-input
v-model="queryParams.amount" v-model="queryParams.amount"
@ -58,14 +51,30 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="退款说明" prop="itemDesc"> <el-form-item label="退款结果" prop="refundResult">
<el-input <el-input
v-model="queryParams.itemDesc" v-model="queryParams.refundResult"
placeholder="请输入退款项目说明" placeholder="请输入退款结果"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="商户" prop="merchantId">
<el-input
v-model="queryParams.merchantId"
placeholder="请输入商户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作时间" prop="operTime">
<el-date-picker clearable
v-model="queryParams.operTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择操作时间">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -83,23 +92,39 @@
v-hasPermi="['system:refund:export']" v-hasPermi="['system:refund:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="refundList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="refundList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="区域" align="center" prop="areaName" /> <template v-for="column of showColumns">
<el-table-column label="退款单号" align="center" prop="refundNo" /> <el-table-column
<el-table-column label="关联订单" align="center" prop="orderNo" /> :key="column.key"
<el-table-column label="用户" align="center" prop="userName" /> :label="column.label"
<el-table-column label="退款金额" align="center" prop="amount" /> :prop="column.key"
<el-table-column label="退款原因" align="center" prop="reason" /> :align="column.align"
<el-table-column label="退款时间" align="center" prop="createTime" width="180"> :min-width="column.minWidth"
<template slot-scope="scope"> :sort-orders="orderSorts"
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> :sortable="column.sortable"
</template> :show-overflow-tooltip="column.overflow"
</el-table-column> :width="column.width"
<el-table-column label="退款项目说明" align="center" prop="itemDesc" /> >
<template slot-scope="d">
<template v-if="column.key === 'id'">
{{d.row[column.key]}}
</template>
<template v-else-if="column.key === 'amount'">
{{d.row[column.key] | dv}} 元
</template>
<template v-else-if="column.key === 'status'">
<dict-tag :options="dict.type.ss_refund_status" :value="d.row[column.key]"/>
</template>
<template v-else>
{{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -110,9 +135,51 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改退款订单对话框 --> <!-- 添加或修改退款对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="退款单号" prop="refundNo">
<el-input v-model="form.refundNo" placeholder="请输入退款单号" />
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单号" />
</el-form-item>
<el-form-item label="用户ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户ID" />
</el-form-item>
<el-form-item label="用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.ss_refund_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="退款金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入退款金额" />
</el-form-item>
<el-form-item label="退款原因" prop="reason">
<el-input v-model="form.reason" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="退款结果" prop="refundResult">
<el-input v-model="form.refundResult" placeholder="请输入退款结果" />
</el-form-item>
<el-form-item label="商户" prop="merchantId">
<el-input v-model="form.merchantId" placeholder="请输入商户" />
</el-form-item>
<el-form-item label="操作时间" prop="operTime">
<el-date-picker clearable
v-model="form.operTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择操作时间">
</el-date-picker>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -124,22 +191,37 @@
<script> <script>
import { listRefund, getRefund, delRefund, addRefund, updateRefund } from "@/api/system/refund"; import { listRefund, getRefund, delRefund, addRefund, updateRefund } from "@/api/system/refund";
// import { optionselect as getAreaOptionselect } from '@/api/system/area' import { $showColumns } from '@/utils/mixins';
// import { listDept2 } from '@/api/system/dept'
// 默认排序字段
const defaultSort = {
prop: "createTime",
order: "descending"
}
export default { export default {
name: "Refund", name: "Refund",
props: { mixins: [$showColumns],
// 用户id dicts: ['ss_refund_status'],
deptId: {
type: Number,
default: null,
}
},
data() { data() {
return { return {
// 字段列表
columns: [
{key: 'id', visible: true, label: '主键', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'refundNo', visible: true, label: '退款单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'orderNo', visible: true, label: '订单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
// {key: 'userId', visible: true, label: '用户ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'userName', visible: true, label: '用户名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'amount', visible: true, label: '退款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'reason', visible: true, label: '退款原因', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'refundResult', visible: true, label: '退款结果', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
// {key: 'merchant', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'operTime', visible: true, label: '操作时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
// 遮罩层 // 遮罩层
loading: true, loading: true,
userName: undefined,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
@ -150,31 +232,36 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 退款订单表格数据 // 退款表格数据
refundList: [], refundList: [],
areaOptions: [],
deptOptions:[],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
defaultSort,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
deptId: this.deptId, orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
refundNo: null, refundNo: null,
orderNo: null, orderNo: null,
userId: null, userId: null,
userName: null,
status: null,
amount: null, amount: null,
itemDesc: null reason: null,
refundResult: null,
merchantId: null,
operTime: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
orderNo: [ orderNo: [
{ required: true, message: "关联订单不能为空", trigger: "blur" } { required: true, message: "订单号不能为空", trigger: "blur" }
], ],
userId: [ userId: [
{ required: true, message: "用户ID不能为空", trigger: "blur" } { required: true, message: "用户ID不能为空", trigger: "blur" }
@ -183,26 +270,21 @@ export default {
}; };
}, },
created() { created() {
console.log("当前用户信息：",this.$store.state.user.name)
this.userName = this.$store.state.user.name;
// this.getDeptList()
this.getList(); this.getList();
// this.getAreaList();
}, },
methods: { methods: {
// getDeptList() { /** 当排序按钮被点击时触发 **/
// listDept2({ status: "0", pageNum: 1, pageSize: 999 }).then((response) => { onSortChange(column) {
// this.deptOptions = response.rows; if (column.order == null) {
// }); this.queryParams.orderByColumn = defaultSort.prop;
// }, this.queryParams.isAsc = defaultSort.order;
// /** 查运营区列表 */ } else {
// getAreaList() { this.queryParams.orderByColumn = column.prop;
// getAreaOptionselect().then(response => { this.queryParams.isAsc = column.order;
// this.areaOptions = response.data; }
// }); this.getList();
// }, },
/** 查询退款订单列表 */ /** 查询退款列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listRefund(this.queryParams).then(response => { listRefund(this.queryParams).then(response => {
@ -223,14 +305,14 @@ export default {
refundNo: null, refundNo: null,
orderNo: null, orderNo: null,
userId: null, userId: null,
userName: null,
status: null,
amount: null, amount: null,
dispatchFee: null,
manageFee: null,
ridingFee: null,
appointmentFee: null,
reason: null, reason: null,
createTime: null, createTime: null,
itemDesc: null refundResult: null,
merchantId: null,
operTime: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -254,7 +336,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加退款订单"; this.title = "添加退款";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -263,7 +345,7 @@ export default {
getRefund(id).then(response => { getRefund(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改退款订单"; this.title = "修改退款";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -289,7 +371,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除退款订单编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除退款编号为"' + ids + '"的数据项？').then(function() {
return delRefund(ids); return delRefund(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();

22
src/views/system/store/index.vue
View File

@ -106,7 +106,7 @@
{{d.row[column.key]}} {{d.row[column.key]}}
</template> </template>
<template v-else-if="column.key === 'status'"> <template v-else-if="column.key === 'status'">
<dict-tag :options="dict.type.e_store_status" :value="d.row[column.key]"/> <dict-tag :options="dict.type.ss_store_status" :value="d.row[column.key]"/>
</template> </template>
<template v-else-if="column.key === 'picture'"> <template v-else-if="column.key === 'picture'">
<image-preview :src="d.row[column.key]" :width="50" :height="50"/> <image-preview :src="d.row[column.key]" :width="50" :height="50"/>
@ -208,21 +208,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="省" prop="province">
<el-input v-model="form.province" placeholder="请输入省" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="市" prop="city">
<el-input v-model="form.city" placeholder="请输入市" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="区县" prop="county">
<el-input v-model="form.county" placeholder="请输入区县" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客服电话" prop="serverPhone"> <el-form-item label="客服电话" prop="serverPhone">
<el-input v-model="form.serverPhone" placeholder="请输入客服电话" /> <el-input v-model="form.serverPhone" placeholder="请输入客服电话" />
@ -270,7 +255,7 @@ const defaultSort = {
export default { export default {
name: "Store", name: "Store",
mixins: [$showColumns], mixins: [$showColumns],
dicts: ['e_store_status'], dicts: ['ss_store_status'],
data() { data() {
return { return {
// 字段列表 // 字段列表
@ -286,9 +271,6 @@ export default {
{key: 'lat', visible: true, label: '定位纬度', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'lat', visible: true, label: '定位纬度', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'businessTimeStart', visible: true, label: '营业时间起始', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, {key: 'businessTimeStart', visible: true, label: '营业时间起始', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
{key: 'businessTimeEnd', visible: true, label: '营业时间结束', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, {key: 'businessTimeEnd', visible: true, label: '营业时间结束', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
{key: 'province', visible: true, label: '省', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'city', visible: true, label: '市', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'county', visible: true, label: '区县', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'serverPhone', visible: true, label: '客服电话', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'serverPhone', visible: true, label: '客服电话', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'wifi', visible: true, label: 'wifi', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'wifi', visible: true, label: 'wifi', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},