|
|
@@ -3,7 +3,7 @@
|
|
|
* @Author: Rockery
|
|
|
* @Date: 2021-07-28 15:14:06
|
|
|
* @LastEditors: gcz
|
|
|
- * @LastEditTime: 2024-06-28 14:57:28
|
|
|
+ * @LastEditTime: 2024-08-01 15:28:51
|
|
|
* @FilePath: \great_webui\src\views\finance\Statements\StatementsIndex.vue
|
|
|
* @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
|
|
|
-->
|
|
|
@@ -13,79 +13,80 @@
|
|
|
<div class="app-container-queryform" v-show="showSearch">
|
|
|
<!-- 页面查询表单 Start -->
|
|
|
<el-form :model="queryParams" ref="queryForm" :rules="rules" :inline="true" label-width="68px">
|
|
|
- <el-form-item label="订单号" prop="orderId">
|
|
|
+ <el-form-item label="订单号" prop="orderNo" v-if="queryShow.orderNo">
|
|
|
<el-input
|
|
|
- v-model="queryParams.orderId"
|
|
|
+ v-model="queryParams.orderNo"
|
|
|
placeholder="请输入订单号"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="支付单号" prop="transactionId">
|
|
|
+ <el-form-item label="支付单号" prop="trackId" v-if="queryShow.trackId">
|
|
|
<el-input
|
|
|
- v-model="queryParams.transactionId"
|
|
|
+ v-model="queryParams.trackId"
|
|
|
placeholder="请输入支付单号"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="购票渠道" prop="ordeFormType">
|
|
|
- <el-select v-model="queryParams.ordeFormType" clearable placeholder="请选择购票渠道">
|
|
|
+ <el-form-item label="购票渠道" prop="source" v-if="queryShow.source">
|
|
|
+ <el-select v-model="queryParams.source" placeholder="请选择购票渠道" clearable>
|
|
|
<el-option
|
|
|
- v-for="ordeFormTypeOption in ordeFormTypeOptions"
|
|
|
- :key="ordeFormTypeOption.dictValue"
|
|
|
- :label="ordeFormTypeOption.dictLabel"
|
|
|
- :value="ordeFormTypeOption.dictValue"
|
|
|
- ></el-option>
|
|
|
+ v-for="dict in dict.type.order_form_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="支付渠道" prop="payChannel">
|
|
|
- <el-select v-model="queryParams.payChannel" clearable placeholder="请选择支付渠道">
|
|
|
+ <el-form-item label="支付方式" prop="payWay" v-if="queryShow.payWay">
|
|
|
+ <el-select v-model="queryParams.payWay" placeholder="请选择支付方式" clearable>
|
|
|
<el-option
|
|
|
- v-for="payChannelOption in payChannelOptions"
|
|
|
- :key="payChannelOption.dictValue"
|
|
|
- :label="payChannelOption.dictLabel"
|
|
|
- :value="payChannelOption.dictValue"
|
|
|
- ></el-option>
|
|
|
+ v-for="dict in dict.type.pay_way_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="交易类型" prop="tranType">
|
|
|
- <el-select v-model="queryParams.tranType" clearable placeholder="请选择交易类型">
|
|
|
+ <el-form-item label="交易类型" prop="payType" v-if="queryShow.payType">
|
|
|
+ <el-select v-model="queryParams.payType" placeholder="请选择交易类型" clearable>
|
|
|
<el-option
|
|
|
- v-for="tranTypeOption in tranTypeOptions"
|
|
|
- :key="tranTypeOption.dictValue"
|
|
|
- :label="tranTypeOption.dictLabel"
|
|
|
- :value="tranTypeOption.dictValue"
|
|
|
- ></el-option>
|
|
|
+ v-for="dict in dict.type.transaction_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
- <!-- <el-form-item label="交易状态" prop="tranStatus">
|
|
|
- <el-select v-model="queryParams.tranStatus" clearable placeholder="请选择交易状态">
|
|
|
- <el-option
|
|
|
- v-for="tranStatusOption in tranStatusOptions"
|
|
|
- :key="tranStatusOption.dictValue"
|
|
|
- :label="tranStatusOption.dictLabel"
|
|
|
- :value="tranStatusOption.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>-->
|
|
|
- <el-form-item label="交付时间">
|
|
|
+ <el-form-item label="交易时间" v-if="queryShow.dateRange">
|
|
|
<el-date-picker
|
|
|
v-model="dateRange"
|
|
|
size="small"
|
|
|
style="width: 240px"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- type="daterange"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ type="datetimerange"
|
|
|
range-separator="-"
|
|
|
start-placeholder="开始时间"
|
|
|
end-placeholder="结束时间"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
+ <el-dropdown @command="openQuery">
|
|
|
+ <el-button size="mini" type="primary" icon="el-icon-plus"></el-button>
|
|
|
+ <el-dropdown-menu slot="dropdown">
|
|
|
+ <el-dropdown-item command="orderNo"><i class="el-icon-check" v-if="queryShow.orderNo"></i>订单号</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="trackId"><i class="el-icon-check" v-if="queryShow.trackId"></i>支付单号</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="source"><i class="el-icon-check" v-if="queryShow.source"></i>购票渠道</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="payWay"><i class="el-icon-check" v-if="queryShow.payWay"></i>支付方式</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="payType"><i class="el-icon-check" v-if="queryShow.payType"></i>交易类型</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="dateRange"><i class="el-icon-check" v-if="queryShow.dateRange"></i>交易时间</el-dropdown-item>
|
|
|
+ </el-dropdown-menu>
|
|
|
+ </el-dropdown>
|
|
|
<el-button
|
|
|
+ style="margin-left: 10px;"
|
|
|
v-hasPermi="['financeMr:statements:query']"
|
|
|
type="primary"
|
|
|
icon="el-icon-search"
|
|
|
@@ -101,6 +102,23 @@
|
|
|
>重置</el-button
|
|
|
>
|
|
|
</el-form-item>
|
|
|
+ <!-- <el-form-item>
|
|
|
+ <el-button
|
|
|
+ v-hasPermi="['financeMr:statements:query']"
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="mini"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-hasPermi="['financeMr:statements:reset']"
|
|
|
+ icon="el-icon-refresh"
|
|
|
+ size="mini"
|
|
|
+ @click="resetQuery"
|
|
|
+ >重置</el-button
|
|
|
+ >
|
|
|
+ </el-form-item> -->
|
|
|
</el-form>
|
|
|
<!-- 页面查询表单 End -->
|
|
|
</div>
|
|
|
@@ -112,13 +130,13 @@
|
|
|
<div style="border: 1px solid #dfe4ed">
|
|
|
<span style="color: #ff4949">请选择导出账单记录类型：</span>
|
|
|
<el-switch
|
|
|
- v-model="reportType"
|
|
|
+ v-model="exportType"
|
|
|
inactive-color="#ffba00"
|
|
|
active-color="#13ce66"
|
|
|
inactive-text="运营方"
|
|
|
active-text="银联"
|
|
|
- inactive-value="0"
|
|
|
- active-value="1"
|
|
|
+ inactive-value="1"
|
|
|
+ active-value="2"
|
|
|
></el-switch>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
@@ -154,51 +172,45 @@
|
|
|
:load="load"
|
|
|
row-key="id"
|
|
|
@sort-change="handleSortChang"
|
|
|
- :tree-props="{ children: 'orderList', hasChildren: 'hasChildren' }"
|
|
|
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
|
|
class="cust-table"
|
|
|
>
|
|
|
- <el-table-column label="订单号" align="center" :show-overflow-tooltip="true">
|
|
|
+ <el-table-column label="订单号" align="center" :show-overflow-tooltip="true" width="200">
|
|
|
<template slot-scope="scope">
|
|
|
- <template v-if="scope.row.showDetail">
|
|
|
+ <template v-if="!scope.row.hasOwnProperty('children')">
|
|
|
<div
|
|
|
- class="statements-column-orderid"
|
|
|
+ class="statements-column-orderNo"
|
|
|
@click="handleViewOrder(scope.row)"
|
|
|
style="display: inline-block"
|
|
|
>
|
|
|
- {{ scope.row.orderId }}
|
|
|
+ {{ scope.row.orderNo }}
|
|
|
</div>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <div style="display: inline-block">{{ scope.row.orderId }}</div>
|
|
|
+ <div style="display: inline-block">{{ scope.row.orderNo }}</div>
|
|
|
</template>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="支付单号" align="center" prop="transactionId" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="支付金额(元)" align="center" prop="payAmount" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="手续费(元)" align="center" prop="feeAmt" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="到账金额(元)" align="center" prop="paiAmt" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column
|
|
|
- label="支付渠道"
|
|
|
- align="center"
|
|
|
- prop="payChannel"
|
|
|
- :formatter="payChannelFormatter"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="交易类型"
|
|
|
- align="center"
|
|
|
- prop="tranType"
|
|
|
- :formatter="tranTypeFormatter"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- />
|
|
|
- <!-- <el-table-column
|
|
|
- label="交易状态"
|
|
|
- align="center"
|
|
|
- prop="tranStatus"
|
|
|
- :formatter="tranStatusFormatter"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- />-->
|
|
|
- <el-table-column label="交易时间" align="center" prop="tranTime" :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="支付单号" align="center" prop="trackId" :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="支付金额(元)" align="center" prop="payMoney" :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="手续费(元)" align="center" prop="proceMoney" :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="到账金额(元)" align="center" prop="clearMoney" :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="购票渠道" align="center" prop="source">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.order_form_type" :value="scope.row.source"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="支付方式" align="center" prop="payWay">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="交易类型" align="center" prop="payType">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.transaction_type" :value="scope.row.payType"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="交易时间" align="center" prop="payTime" :show-overflow-tooltip="true" />
|
|
|
</el-table>
|
|
|
<!-- 页面表格数据区域 End -->
|
|
|
</el-col>
|
|
|
@@ -206,48 +218,10 @@
|
|
|
<el-col :span="24" class="mt20 mb20">
|
|
|
<!-- 表格右下角数据 -->
|
|
|
<div class="fl statements-total">
|
|
|
- 银行账单数据汇总：
|
|
|
- <br />总笔数累计
|
|
|
- <span class="statements-all">{{oweTotalObj.totalCount || 0}}</span> 笔，交易金额
|
|
|
- <span class="statements-all">{{oweTotalObj.totalAmount || 0}}</span> 元，手续费
|
|
|
- <span class="statements-all">{{oweTotalObj.totalFeeAmount || 0}}</span> 元；退款成功
|
|
|
- <span class="statements-all">{{oweTotalObj.totalRefundCount || 0}}</span> 笔，交易金额
|
|
|
- <span class="statements-all">{{oweTotalObj.totalRefundAmount || 0}}</span> 元，手续费
|
|
|
- <span class="statements-all">{{oweTotalObj.totalRefundFeeAmount || 0}}</span> 元；实际到账金额
|
|
|
- <span class="statements-all">{{oweTotalObj.totalRealAmount || 0}}</span> 元
|
|
|
- <br />明细如下：
|
|
|
- <br />微信支付成功
|
|
|
- <span>{{oweTotalObj.wechatCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.wechatAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.wechatFeeAmount || 0}}</span> 元；退款成功
|
|
|
- <span>{{oweTotalObj.wechatRefundCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.wechatRefundAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.wechatRefundFeeAmount || 0}}</span> 元；实际到账金额
|
|
|
- <span>{{oweTotalObj.wechatRealAmount || 0}}</span> 元
|
|
|
- <br />快捷支付成功
|
|
|
- <span>{{oweTotalObj.quickCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.quickAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.quickFeeAmount || 0}}</span> 元；退款成功
|
|
|
- <span>{{oweTotalObj.quickRefundCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.quickRefundAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.quickRefundFeeAmount || 0}}</span> 元；实际到账金额
|
|
|
- <span>{{oweTotalObj.quickRealAmount || 0}}</span> 元
|
|
|
- <br />无感支付成功
|
|
|
- <span>{{oweTotalObj.unconsCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.unconsAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.unconsFeeAmount || 0}}</span> 元；退款成功
|
|
|
- <span>{{oweTotalObj.unconsRefundCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.unconsRefundAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.unconsRefundFeeAmount || 0}}</span> 元；实际到账金额
|
|
|
- <span>{{oweTotalObj.unconsRealAmount || 0}}</span> 元
|
|
|
- <br />聚合支付成功
|
|
|
- <span>{{oweTotalObj.unionCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.unionAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.unionFeeAmount || 0}}</span> 元；退款成功
|
|
|
- <span>{{oweTotalObj.unionRefundCount || 0}}</span> 笔，交易金额
|
|
|
- <span>{{oweTotalObj.unionRefundAmount || 0}}</span> 元，手续费
|
|
|
- <span>{{oweTotalObj.unionRefundFeeAmount || 0}}</span> 元；实际到账金额
|
|
|
- <span>{{oweTotalObj.unionRealAmount || 0}}</span> 元
|
|
|
+ <div class="til"> 账单数据汇总：</div>
|
|
|
+ <div class="summary">{{ summary }}</div>
|
|
|
+ <div class="til">明细如下：</div>
|
|
|
+ <div class="other-summary" v-for="(item,index) in otherSummary" :key="index" v-html="item"></div>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -262,6 +236,8 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
+ <!-- 详情 -->
|
|
|
+ <details-dia ref="detailsDia" @getList="getList"></details-dia>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -269,12 +245,15 @@
|
|
|
import { listStatements, exportStatements, queryStatementsBillTotal } from '@/api/financeMr/Statements';
|
|
|
// import { indoorParkList } from '@/api/ParkingPointMgr/IndoorMgr';
|
|
|
import { exportExcel } from '@/utils/exportexcel';
|
|
|
+import detailsDia from "../../order/orderMr/dialog/details";
|
|
|
|
|
|
export default {
|
|
|
name: 'Statements',
|
|
|
components: {
|
|
|
+ detailsDia,
|
|
|
'parkingrecord-pagination-select': () => import('@/components/CustPaginationSelect') // 支持分页搜索功能的[el-select]下拉框
|
|
|
},
|
|
|
+ dicts: ['order_form_type', 'pay_way_type','transaction_type'],
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|
|
|
@@ -282,24 +261,22 @@ export default {
|
|
|
// 显示搜索条件
|
|
|
showSearch: true,
|
|
|
// 购票渠道格式化
|
|
|
- ordeFormTypeOptions: [],
|
|
|
+ sourceOptions: [],
|
|
|
// 支付渠道格式化
|
|
|
- payChannelOptions: [],
|
|
|
+ payWayOptions: [],
|
|
|
// 交易类型格式化
|
|
|
tranTypeOptions: [],
|
|
|
- // 交易状态格式化
|
|
|
- tranStatusOptions: [],
|
|
|
// 交易日期范围
|
|
|
dateRange: [],
|
|
|
rules: {
|
|
|
- orderId: [
|
|
|
+ orderNo: [
|
|
|
{
|
|
|
pattern: /^[+]{0,1}(\d+)$/,
|
|
|
message: '订单号必须为纯数字',
|
|
|
trigger: 'blur'
|
|
|
}
|
|
|
],
|
|
|
- // transactionId: [
|
|
|
+ // trackId: [
|
|
|
// {
|
|
|
// pattern: /^[+]{0,1}(\d+)$/,
|
|
|
// message: '支付单号必须为纯数字',
|
|
|
@@ -307,10 +284,10 @@ export default {
|
|
|
// }
|
|
|
// ]
|
|
|
},
|
|
|
- reportType: 0,
|
|
|
- reportTypeObj: {
|
|
|
- 0: '运营方账单记录',
|
|
|
- 1: '微信或贵州银行账单记录'
|
|
|
+ exportType: 1,
|
|
|
+ exportTypeObj: {
|
|
|
+ 1: '运营方账单记录',
|
|
|
+ 2: '银联账单记录'
|
|
|
},
|
|
|
// 总条数
|
|
|
total: 0,
|
|
|
@@ -320,17 +297,25 @@ export default {
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- orderId: undefined,
|
|
|
- transactionId: undefined,
|
|
|
- payChannel: undefined,
|
|
|
- tranType: undefined,
|
|
|
- tranStatus: undefined,
|
|
|
- parkNo: undefined,
|
|
|
- ordeFormType: undefined,
|
|
|
+ orderNo: undefined,
|
|
|
+ trackId: undefined,
|
|
|
+ payWay: undefined,
|
|
|
+ payType: undefined,
|
|
|
+ source: undefined,
|
|
|
+ },
|
|
|
+ queryShow: {
|
|
|
+ orderNo: true,
|
|
|
+ trackId: true,
|
|
|
+ source: true,
|
|
|
+ payWay: true,
|
|
|
+ payType: true,
|
|
|
+ dateRange: false,
|
|
|
},
|
|
|
oweTotalObj: {},
|
|
|
// 导出数据状态
|
|
|
handleExportLoading: false,
|
|
|
+ summary:'',
|
|
|
+ otherSummary:[],
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -340,8 +325,7 @@ export default {
|
|
|
/** 初始化数据 */
|
|
|
async initData() {
|
|
|
this.loading = true;
|
|
|
- await this.getMainOptions();
|
|
|
- this.getRevenueReportOwetotal();
|
|
|
+ // this.getRevenueReportOwetotal();
|
|
|
this.getList();
|
|
|
},
|
|
|
/** 查询列表信息 */
|
|
|
@@ -349,8 +333,10 @@ export default {
|
|
|
this.loading = true;
|
|
|
listStatements(this.formatDateRange(this.queryParams, this.dateRange))
|
|
|
.then((response) => {
|
|
|
- this.tableDataList = response?.rows || [];
|
|
|
- this.total = response?.total ?? 0;
|
|
|
+ this.tableDataList = response?.data?.result?.rows|| [];
|
|
|
+ this.total = response?.data?.result?.total ?? 0;
|
|
|
+ this.summary = response?.data?.summary || '';
|
|
|
+ this.otherSummary = response?.data?.otherSummary || [];
|
|
|
this.loading = false;
|
|
|
})
|
|
|
.catch(() => {
|
|
|
@@ -368,44 +354,6 @@ export default {
|
|
|
this.oweTotalObj = response?.data || {};
|
|
|
});
|
|
|
},
|
|
|
- /** 获取主要选项列表 */
|
|
|
- async getMainOptions() {
|
|
|
- // 购票渠道选项列表
|
|
|
- await this.getDicts('order_form_type').then((response) => {
|
|
|
- this.ordeFormTypeOptions = response?.data || [];
|
|
|
- });
|
|
|
-
|
|
|
- // 支付渠道选项列表
|
|
|
- await this.getDicts('pay_way_type').then((response) => {
|
|
|
- this.payChannelOptions = response?.data || [];
|
|
|
- });
|
|
|
-
|
|
|
- // 交易类型选项列表
|
|
|
- await this.getDicts('tran_type').then((response) => {
|
|
|
- this.tranTypeOptions = response?.data || [];
|
|
|
- });
|
|
|
-
|
|
|
- // 交易状态选项列表
|
|
|
- // await this.getDicts('tran_status').then(response => {
|
|
|
- // this.tranStatusOptions = response?.data || [];
|
|
|
- // });
|
|
|
- },
|
|
|
- /** 购票渠道格式化 */
|
|
|
- ordeFormTypeFormatter(row) {
|
|
|
- return this.selectDictLabel(this.ordeFormTypeOptions, row?.ordeFormType);
|
|
|
- },
|
|
|
- /** 支付渠道格式化 */
|
|
|
- payChannelFormatter(row) {
|
|
|
- return this.selectDictLabel(this.payChannelOptions, row?.payChannel);
|
|
|
- },
|
|
|
- /** 交易类型格式化 */
|
|
|
- tranTypeFormatter(row) {
|
|
|
- return this.selectDictLabel(this.tranTypeOptions, row?.tranType);
|
|
|
- },
|
|
|
- /** 交易状态格式化 */
|
|
|
- tranStatusFormatter(row) {
|
|
|
- return this.selectDictLabel(this.tranStatusOptions, row?.tranStatus);
|
|
|
- },
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
this.$refs?.['queryForm']?.validate?.((valid) => {
|
|
|
@@ -417,8 +365,8 @@ export default {
|
|
|
pageNum: 1,
|
|
|
sortField: undefined,
|
|
|
sortOrder: undefined,
|
|
|
- beginTime: undefined,
|
|
|
- endTime: undefined
|
|
|
+ payBeginTime: undefined,
|
|
|
+ payEndTime: undefined
|
|
|
};
|
|
|
|
|
|
// 初始化表格数据
|
|
|
@@ -440,7 +388,7 @@ export default {
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- this.$confirm(`确定要导出“${this.reportTypeObj[this.reportType] || ''}”的数据吗？`, '提示', {
|
|
|
+ this.$confirm(`确定要导出“${this.exportTypeObj[this.exportType] || ''}”的数据吗？`, '提示', {
|
|
|
confirmButtonText: '确定 ',
|
|
|
cancelButtonText: '取消 ',
|
|
|
type: 'warning'
|
|
|
@@ -451,24 +399,23 @@ export default {
|
|
|
|
|
|
// 排除不需要的属性
|
|
|
let { pageNum, pageSize, ...otherObj } = this.formatDateRange(this.queryParams, this.dateRange);
|
|
|
- let handleExportReq = { ...otherObj, reportType: this.reportType };
|
|
|
- handleExportReq.isParkScope = this.proPointListEnv.indexOf(this.proEnv) > -1 ? '1' : '0';
|
|
|
+ let handleExportReq = { ...otherObj, exportType: this.exportType };
|
|
|
// 发送导出请求
|
|
|
exportStatements(handleExportReq)
|
|
|
.then((response) => {
|
|
|
- exportExcel(response, this.reportTypeObj[this.reportType] || '', '.xlsx');
|
|
|
+ exportExcel(response, this.exportTypeObj[this.exportType] || '', '.xlsx');
|
|
|
|
|
|
// 关闭导出遮护罩
|
|
|
this.handleExportLoading = false;
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.msgError('导出异常！');
|
|
|
+ this.$message.error('导出异常！');
|
|
|
// 关闭导出遮护罩
|
|
|
this.handleExportLoading = false;
|
|
|
});
|
|
|
})
|
|
|
.catch(() => {
|
|
|
- this.msgInfo('您已取消导出！');
|
|
|
+ this.$message.info('您已取消导出！');
|
|
|
// 关闭导出遮护罩
|
|
|
this.handleExportLoading = false;
|
|
|
});
|
|
|
@@ -479,11 +426,11 @@ export default {
|
|
|
formatDateRange(params, dateRange) {
|
|
|
var search = params;
|
|
|
if (null != dateRange && '' != dateRange) {
|
|
|
- search['beginTime'] = dateRange[0];
|
|
|
- search['endTime'] = dateRange[1];
|
|
|
+ search['payBeginTime'] = dateRange[0];
|
|
|
+ search['payEndTime'] = dateRange[1];
|
|
|
} else {
|
|
|
- search['beginTime'] = undefined;
|
|
|
- search['endTime'] = undefined;
|
|
|
+ search['payBeginTime'] = undefined;
|
|
|
+ search['payEndTime'] = undefined;
|
|
|
}
|
|
|
|
|
|
return search;
|
|
|
@@ -502,39 +449,46 @@ export default {
|
|
|
this.initData();
|
|
|
},
|
|
|
load(tree, treeNode, resolve) {
|
|
|
+ console.log('tree',tree);
|
|
|
resolve(tree.orderList);
|
|
|
},
|
|
|
/**
|
|
|
* 查看原订单
|
|
|
*/
|
|
|
handleViewOrder(row) {
|
|
|
- // orderId不存在
|
|
|
- if (!row?.orderId) return;
|
|
|
+ console.log('handleViewOrder row',row);
|
|
|
+ this.$refs["detailsDia"].openDialog("详情", row);
|
|
|
+ return
|
|
|
+ // orderNo不存在
|
|
|
+ if (!row?.orderNo) return;
|
|
|
|
|
|
if (row.businessType != '2') {
|
|
|
// 保存当前路由信息
|
|
|
this.$store.dispatch('PushCurrRouteInfo', {
|
|
|
name: 'OwnerinfoBillingDetails',
|
|
|
- metaTitle: `查看原订单【${row?.orderId}】`,
|
|
|
- key: `OwnerinfoBillingDetails_${row?.orderId}`
|
|
|
+ metaTitle: `查看原订单【${row?.orderNo}】`,
|
|
|
+ key: `OwnerinfoBillingDetails_${row?.orderNo}`
|
|
|
});
|
|
|
// 跳转详情页面
|
|
|
if (Number(row.orderType) === 1) {
|
|
|
- this.$router.push(`/ownerinfobilling/details/${row?.orderId}&type=parking`);
|
|
|
+ this.$router.push(`/ownerinfobilling/details/${row?.orderNo}&type=parking`);
|
|
|
} else {
|
|
|
- this.$router.push(`/ownerinfobilling/details/${row?.orderId}`);
|
|
|
+ this.$router.push(`/ownerinfobilling/details/${row?.orderNo}`);
|
|
|
}
|
|
|
} else {
|
|
|
// 保存当前路由信息
|
|
|
this.$store.dispatch('PushCurrRouteInfo', {
|
|
|
name: 'MonthlyVehicleDetails',
|
|
|
- metaTitle: `查看原订单【${row?.orderId}】`,
|
|
|
- key: `MonthlyVehicleDetails_${row?.orderId}`
|
|
|
+ metaTitle: `查看原订单【${row?.orderNo}】`,
|
|
|
+ key: `MonthlyVehicleDetails_${row?.orderNo}`
|
|
|
});
|
|
|
|
|
|
// 跳转详情页面
|
|
|
- this.$router.push(`/monthlyvehicle/details/${row?.orderId}`);
|
|
|
+ this.$router.push(`/monthlyvehicle/details/${row?.orderNo}`);
|
|
|
}
|
|
|
+ },
|
|
|
+ openQuery(key) {
|
|
|
+ this.$set(this.queryShow,key,!this.queryShow[key])
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -552,7 +506,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.cust-table {
|
|
|
- .statements-column-orderid {
|
|
|
+ .statements-column-orderNo {
|
|
|
color: #337ab7;
|
|
|
text-decoration: none;
|
|
|
cursor: pointer;
|
|
|
@@ -563,4 +517,21 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+.statements-total{
|
|
|
+ .til{
|
|
|
+ font-weight: bold;
|
|
|
+ margin-bottom: 2px;
|
|
|
+ margin-top: 10px;
|
|
|
+ }
|
|
|
+ .summary{
|
|
|
+ ::v-deep span{
|
|
|
+ color: blue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .other-summary{
|
|
|
+ ::v-deep span{
|
|
|
+ color: yellow;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|
