Browse Source

’合并

git commit -m ’合并
master
j1ack 2 years ago
parent
commit
657a626fcf
  1. BIN
      kakapay.zip
  2. 12
      src/utils/ruoyi.js
  3. 28
      src/views/carddealer/carddealer/index.vue
  4. 4
      src/views/login.vue
  5. 30
      src/views/order/TransferOrder/daifuSonOrder.vue
  6. 102
      src/views/order/TransferOrder/index.vue
  7. 111
      src/views/order/TransferOrder/readyOrder.vue
  8. 57
      src/views/order/carddealerOrder/carddealerSonOrder.vue
  9. 191
      src/views/order/payOrder/csOrder.vue
  10. 171
      src/views/order/payOrder/index.vue
  11. 21
      src/views/order/payOrder/wwc.vue
  12. 10
      src/views/platform/platformWaterDetail/index.vue
  13. 7
      src/views/staticsRecord/cardTimeStatistics.vue
  14. 7
      src/views/staticsRecord/dayEndStatistics.vue
  15. 7
      src/views/staticsRecord/dayStatistics.vue
  16. 7
      src/views/staticsRecord/mechantTimeStatistics.vue
  17. 7
      src/views/staticsRecord/merchantCardStat.vue

BIN
kakapay.zip

Binary file not shown.

12
src/utils/ruoyi.js

@ -63,8 +63,8 @@ export function addSESDateRange(params, dateRange, propName) {
var search = params;
search.beginTime = null
search.endTime = null;
search.upBeginTime = null
search.upEndTime = null;
search.updateBeginTime = null
search.updateEndTime = null;
if (propName) {
if (dateRange[0]) {
if (dateRange[0][0] && dateRange[0][1]) {
@ -77,11 +77,11 @@ export function addSESDateRange(params, dateRange, propName) {
}
if (dateRange[1]) {
if (dateRange[1][0] && dateRange[1][1]) {
search.upBeginTime = dateRange[1][0];
search.upEndTime = dateRange[1][1];
search.updateBeginTime = dateRange[1][0];
search.updateEndTime = dateRange[1][1];
} else if (!dateRange[1][0]) {
search.upBeginTime = undefined;
search.upEndTime = undefined;
search.updateBeginTime = undefined;
search.updateEndTime = undefined;
}
}
}

28
src/views/carddealer/carddealer/index.vue

@ -45,14 +45,14 @@
</el-row>
<el-row :gutter="10" class="mb8" style="margin-left:8px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleAdd()">添加码商</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleAdd()">添加码商</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
</div>
@ -60,7 +60,7 @@
</el-form>
<div class="searchTop flexBet">
</div>
@ -723,7 +723,7 @@ export default {
this.allList = response.data
});
},
timerHandler(queryParams){
timerHandler(queryParams) {
listCarddealer(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => {
this.infoList = response.rows;
// this.infoList = this.infoList.sort(this.sortNum)//
@ -1021,6 +1021,14 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有码商数据项?', "警告", {
confirmButtonText: "确定",

4
src/views/login.vue

@ -251,7 +251,7 @@ export default {
::v-deep .el-button--medium {
padding: 18px;
background: #369FFF;
background: #6D5EF8;
border: none;
color: #fff;
}
@ -262,7 +262,7 @@ export default {
::v-deep .el-button:hover,
.el-button:focus {
background: #369effdc !important;
background: #9389f5 !important;
}
::v-deep .el-input__inner {

30
src/views/order/TransferOrder/daifuSonOrder.vue

@ -141,10 +141,11 @@
</el-table-column>
<el-table-column label="码商" align="center" prop="carddealerName" />
<el-table-column :label="'付款卡(必须一致)'" align="center" prop="payeeRealAmount" min-width="180">
<template slot-scope="scope">
<span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}{{ scope.row.payCarddealerCard.bankName }}{{ scope.row.payCarddealerCard.cardNumber }}</span>
<span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}{{
scope.row.payCarddealerCard.bankName }}{{ scope.row.payCarddealerCard.cardNumber }}</span>
</template>
</el-table-column>
@ -177,7 +178,7 @@
</el-button>
<el-button v-if="scope.row.orderStatus != 1" size="small" type="text"
@click="handleCertificate(scope.row)" style="color: #006eff">查看凭证</el-button>
<el-button size="small" type="text" v-clipboard:copy="getReadableText(scope.row)"
v-clipboard:success="handleClipboardSuccess" style="color: #006eff">复制</el-button>
</template>
@ -424,7 +425,7 @@ export default {
},
methods: {
getReadableText(data) {
return `${data.cardNumber}/${data.accountName}/${data.bankName}/${this.NumberDiv(data.amount, 100)}`
return `${this.NumberDiv(data.amount, 100)}\n${data.cardNumber}\n${data.accountName}\n${data.bankName}`
},
/** 复制代码成功 */
handleClipboardSuccess() {
@ -680,6 +681,27 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
if (this.dateRange[0]) {
this.queryParams.beginTime = this.dateRange[0][0]
this.queryParams.endTime = this.dateRange[0][1]
}else{
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
if (this.dateRange[1]) {
this.queryParams.updateBeginTime = this.dateRange[1][0]
this.queryParams.updateEndTime = this.dateRange[1][1]
}else{
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代付订单数据项?', "警告", {
confirmButtonText: "确定",

102
src/views/order/TransferOrder/index.vue

@ -39,38 +39,38 @@
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="类型" prop="orderSource">
<el-select v-model="queryParams.orderSource" placeholder="请选择类型" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in dictCon" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-collapse-item name="1">
<el-form-item label="类型" prop="orderSource">
<el-select v-model="queryParams.orderSource" placeholder="请选择类型" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in dictCon" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8">
@ -78,11 +78,11 @@
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-row>
<el-row :gutter="10" class="mb8" style="margin-left:8px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
@ -91,7 +91,7 @@
</el-form>
<div class="searchTop flexBet">
</div>
<div class="bg">
@ -515,7 +515,7 @@ export default {
},
methods: {
tableRowClassName({ row, rowIndex }) {
if(row.payeeRealAmount!=row.reqAmount&&row.orderStatus == 2){
if (row.payeeRealAmount != row.reqAmount && row.orderStatus == 2) {
return "blueOrder";
}
if (row.orderStatus == 3) {
@ -725,6 +725,27 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
if (this.dateRange[0]) {
this.queryParams.beginTime = this.dateRange[0][0]
this.queryParams.endTime = this.dateRange[0][1]
}else{
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
if (this.dateRange[1]) {
this.queryParams.updateBeginTime = this.dateRange[1][0]
this.queryParams.updateEndTime = this.dateRange[1][1]
}else{
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代付订单数据项?', "警告", {
confirmButtonText: "确定",
@ -741,8 +762,9 @@ export default {
</script>
<style>
.blueOrder {
background: #c8e5f8 !important;
background: #c8e5f8 !important;
}
.yellowOrder {
background: #FEFEE5 !important;
}

111
src/views/order/TransferOrder/readyOrder.vue

@ -33,40 +33,43 @@
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="类型" prop="orderSource">
<el-select v-model="queryParams.orderSource" placeholder="请选择类型" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="类型" prop="orderSource">
<el-select v-model="queryParams.orderSource" placeholder="请选择类型" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8">
@ -75,11 +78,11 @@
</el-row>
<el-row :gutter="10" class="mb8" style="margin-left:8px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
</div>
@ -87,7 +90,7 @@
</el-form>
<div class="searchTop flexBet" style="align-items: center">
</div>
@ -165,7 +168,7 @@
<el-button size="small" type="text" @click="handleSuccess(scope.row)"
style="color: #006eff">成功</el-button>
<el-button size="small" type="text" @click="handleView(scope.row)"
style="color: #006eff">详情</el-button>
<el-button size="small" type="text" @click="handleSonOrder(scope.row)"
@ -521,7 +524,7 @@ export default {
},
methods: {
tableRowClassName({ row, rowIndex }) {
if(row.autoConfirm == 2 && row.payeeRealAmount==row.reqAmount){
if (row.autoConfirm == 2 && row.payeeRealAmount == row.reqAmount) {
return "greyOrder";
}
if (row.canRace == 1) {
@ -801,6 +804,27 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
if (this.dateRange[0]) {
this.queryParams.beginTime = this.dateRange[0][0]
this.queryParams.endTime = this.dateRange[0][1]
}else{
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
if (this.dateRange[1]) {
this.queryParams.updateBeginTime = this.dateRange[1][0]
this.queryParams.updateEndTime = this.dateRange[1][1]
}else{
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代付订单数据项?', "警告", {
confirmButtonText: "确定",
@ -819,9 +843,11 @@ export default {
.greyOrder {
background: #F4F4F5 !important;
}
.blueOrder {
background: #c8e5f8 !important;
}
.yellowOrder {
background: #FEFEE5 !important;
}
@ -849,5 +875,4 @@ export default {
::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
background: none !important;
}
</style>
}</style>

57
src/views/order/carddealerOrder/carddealerSonOrder.vue

@ -38,31 +38,33 @@
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="持卡人姓名" prop="accountName">
<el-input size="medium" v-model="queryParams.accountName" placeholder="请输入持卡人姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="订单金额" prop="amount">
<el-input size="medium" v-model="queryParams.amount" placeholder="请输入订单金额" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="持卡人姓名" prop="accountName">
<el-input size="medium" v-model="queryParams.accountName" placeholder="请输入持卡人姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="订单金额" prop="amount">
<el-input size="medium" v-model="queryParams.amount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8">
@ -615,6 +617,13 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定",

191
src/views/order/payOrder/csOrder.vue

@ -5,89 +5,85 @@
<div class="bar"></div>
<div class="text">超时订单</div>
</div> -->
</div>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="position: relative">
<el-form-item label="平台订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户订单号" prop="merchantOrderNo">
<el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="卡号" prop="carddealerCardNumber">
<el-input size="medium" v-model="queryParams.carddealerCardNumber" placeholder="请输入卡号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户名称" prop="merchantName">
<el-input size="medium" v-model="queryParams.merchantName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="码商名称" prop="carddealerName">
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="姓名" prop="carddealerCardHolder">
<el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in statusAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</div>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" class="flex form"
style="position: relative">
<el-form-item label="平台订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户订单号" prop="merchantOrderNo">
<el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="卡号" prop="carddealerCardNumber">
<el-input size="medium" v-model="queryParams.carddealerCardNumber" placeholder="请输入卡号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户名称" prop="merchantName">
<el-input size="medium" v-model="queryParams.merchantName" placeholder="请输入商户名称" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="码商名称" prop="carddealerName">
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="姓名" prop="carddealerCardHolder">
<el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in statusAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-row>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-row>
</div>
</el-form-item>
</el-form>
</div>
</el-form-item>
</el-form>
<!-- <div class="searchTop flexBet">
<!-- <div class="searchTop flexBet">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
@ -100,7 +96,7 @@
<div class="bg">
<el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
<el-table-column label="平台订单号" align="center" prop="orderNo" />
@ -214,15 +210,16 @@
<el-form-item label="通道">
{{ detailInfoList.channelName }}
</el-form-item>
<el-form-item label="异步通知状态" v-if="detailInfoList.orderStatus!=3">
<el-form-item label="异步通知状态" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.notifyStatus == 0 ? '未通知' : detailInfoList.notifyStatus == 1 ? '成功' :
detailInfoList.notifyStatus == 2 ? '通知进行中' : '超时' }}
</el-form-item>
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus!=3">
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }}
</el-form-item>
<el-form-item label="通道费率">
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, 100)).toFixed(2) }}
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
100)).toFixed(2) }}
</el-form-item>
<el-form-item label="操作人">
{{ detailInfoList.notifyRemark }}
@ -277,7 +274,7 @@ export default {
channelAll: [],
//
statusAll: [
{
{
label: '全部',
value: null,
},
@ -448,7 +445,7 @@ export default {
{ required: true, message: "发起的金额不能为空", trigger: "blur" }
]
},
reqAmount:null,
reqAmount: null,
};
},
created() {
@ -466,7 +463,7 @@ export default {
if (row.orderStatus == 2) {
return "greenOrder";
}
},
change() {
this.$forceUpdate()
@ -560,7 +557,7 @@ export default {
this.queryParams.reqAmount ? reqAmount = this.NumberMul(this.queryParams.reqAmount, 100) : this.queryParams.reqAmount
reqAmount = parseFloat(reqAmount)
this.queryParams.pageNum = 1;
reqAmount ? this.reqAmount=reqAmount : this.reqAmount=null
reqAmount ? this.reqAmount = reqAmount : this.reqAmount = null
reqAmount ? this.getList(reqAmount) : this.getList(null)
},
@ -642,6 +639,27 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
if (this.dateRange[0]) {
this.queryParams.beginTime = this.dateRange[0][0]
this.queryParams.endTime = this.dateRange[0][1]
}else{
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
if (this.dateRange[1]) {
this.queryParams.updateBeginTime = this.dateRange[1][0]
this.queryParams.updateEndTime = this.dateRange[1][1]
}else{
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代收订单数据项?', "警告", {
confirmButtonText: "确定",
@ -673,6 +691,7 @@ export default {
::v-deep .el-table tbody tr:hover>td {
background-color: rgba(0, 0, 0, 0) !important
}
::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
background: none !important;
}

171
src/views/order/payOrder/index.vue

@ -5,87 +5,83 @@
<div class="bar"></div>
<div class="text">全部订单</div>
</div> -->
</div>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="position: relative">
<el-form-item label="平台订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户订单号" prop="merchantOrderNo">
<el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="卡号" prop="carddealerCardNumber">
<el-input size="medium" v-model="queryParams.carddealerCardNumber" placeholder="请输入卡号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" class="flex form"
style="position: relative">
<el-form-item label="平台订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户订单号" prop="merchantOrderNo">
<el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户名称" prop="merchantName">
<el-input size="medium" v-model="queryParams.merchantName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="卡号" prop="carddealerCardNumber">
<el-input size="medium" v-model="queryParams.carddealerCardNumber" placeholder="请输入卡号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商名称" prop="carddealerName">
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入商名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商名称" prop="merchantName">
<el-input size="medium" v-model="queryParams.merchantName" placeholder="请输入商名称" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="姓名" prop="carddealerCardHolder">
<el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="码商名称" prop="carddealerName">
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="姓名" prop="carddealerCardHolder">
<el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in statusAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in statusAll" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-row>
</div>
</el-form-item>
</el-form>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-row>
</div>
</el-form-item>
</el-form>
<div class="bg">
@ -99,7 +95,7 @@
{{ parseFloat(NumberDiv(scope.row.reqAmount, 100)).toFixed(2) }}
</template>
</el-table-column>
<!-- <el-table-column :label="'实际支付金额'" align="center" prop="balance">
<template slot-scope="scope">
{{ NumberDiv(scope.row.paymentAmount, 100) }}
@ -202,15 +198,16 @@
<el-form-item label="通道">
{{ detailInfoList.platformChannelName }}
</el-form-item>
<el-form-item label="异步通知状态" v-if="detailInfoList.orderStatus!=3">
<el-form-item label="异步通知状态" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.notifyStatus == 0 ? '未通知' : detailInfoList.notifyStatus == 1 ? '成功' :
detailInfoList.notifyStatus == 2 ? '通知进行中' : '超时' }}
</el-form-item>
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus!=3">
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.smsId == 0 ? '手动回调' : '自动回调' }}
</el-form-item>
<el-form-item label="通道费率">
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, 100)).toFixed(2) }}
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
100)).toFixed(2) }}
</el-form-item>
<el-form-item label="操作人">
{{ detailInfoList.notifyRemark }}
@ -529,7 +526,7 @@ export default {
this.queryParams.reqAmount ? reqAmount = this.NumberMul(this.queryParams.reqAmount, 100) : this.queryParams.reqAmount
reqAmount = parseFloat(reqAmount)
this.queryParams.pageNum = 1;
reqAmount ? this.reqAmount=reqAmount : this.reqAmount=null
reqAmount ? this.reqAmount = reqAmount : this.reqAmount = null
reqAmount ? this.getList(reqAmount) : this.getList(null)
},
/** 重置按钮操作 */
@ -626,6 +623,27 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
if (this.dateRange[0]) {
this.queryParams.beginTime = this.dateRange[0][0]
this.queryParams.endTime = this.dateRange[0][1]
}else{
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
if (this.dateRange[1]) {
this.queryParams.updateBeginTime = this.dateRange[1][0]
this.queryParams.updateEndTime = this.dateRange[1][1]
}else{
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代收订单数据项?', "警告", {
confirmButtonText: "确定",
@ -657,6 +675,7 @@ export default {
::v-deep .el-table tbody tr:hover>td {
background-color: rgba(0, 0, 0, 0) !important
}
::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
background: none !important;
}

21
src/views/order/payOrder/wwc.vue

@ -637,6 +637,27 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
if (this.dateRange[0]) {
this.queryParams.beginTime = this.dateRange[0][0]
this.queryParams.endTime = this.dateRange[0][1]
}else{
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
if (this.dateRange[1]) {
this.queryParams.updateBeginTime = this.dateRange[1][0]
this.queryParams.updateEndTime = this.dateRange[1][1]
}else{
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代收订单数据项?', "警告", {
confirmButtonText: "确定",

10
src/views/platform/platformWaterDetail/index.vue

@ -86,7 +86,8 @@
</el-table-column>
<el-table-column :label="'金额类型'" align="center" prop="amountType">
<template slot-scope="scope">
{{ scope.row.amountType == 1 ? (scope.row.accountType == 2 ? '分佣' : '余额') : scope.row.amountType == 2 ? '冻结' : '押金' }}
{{ scope.row.amountType == 1 ? (scope.row.accountType == 2 ? '分佣' : '余额') : scope.row.amountType == 2 ? '冻结' :
'押金' }}
</template>
</el-table-column>
<el-table-column :label="'变动金额'" align="center" prop="change_amount">
@ -394,6 +395,13 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定",

7
src/views/staticsRecord/cardTimeStatistics.vue

@ -270,6 +270,13 @@ export default {
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定",

7
src/views/staticsRecord/dayEndStatistics.vue

@ -324,6 +324,13 @@ export default {
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定",

7
src/views/staticsRecord/dayStatistics.vue

@ -289,6 +289,13 @@ export default {
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定",

7
src/views/staticsRecord/mechantTimeStatistics.vue

@ -314,6 +314,13 @@ export default {
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定",

7
src/views/staticsRecord/merchantCardStat.vue

@ -261,6 +261,13 @@ export default {
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定",

Loading…
Cancel
Save