diff --git a/kakapay.zip b/kakapay.zip index 2240162..ef33a5a 100644 Binary files a/kakapay.zip and b/kakapay.zip differ diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index 1e9df67..8e6ba89 100644 --- a/src/utils/ruoyi.js +++ b/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; } } } diff --git a/src/views/carddealer/carddealer/index.vue b/src/views/carddealer/carddealer/index.vue index c11a4ed..83d29a3 100644 --- a/src/views/carddealer/carddealer/index.vue +++ b/src/views/carddealer/carddealer/index.vue @@ -45,14 +45,14 @@ - - 添加码商 - - - 导出 - - - @@ -60,7 +60,7 @@
- +
@@ -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: "确定", diff --git a/src/views/login.vue b/src/views/login.vue index 52c13ff..3cdc43e 100644 --- a/src/views/login.vue +++ b/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 { diff --git a/src/views/order/TransferOrder/daifuSonOrder.vue b/src/views/order/TransferOrder/daifuSonOrder.vue index fee98eb..c3e9e9a 100644 --- a/src/views/order/TransferOrder/daifuSonOrder.vue +++ b/src/views/order/TransferOrder/daifuSonOrder.vue @@ -141,10 +141,11 @@ - + @@ -177,7 +178,7 @@ 查看凭证 - + 复制 @@ -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: "确定", diff --git a/src/views/order/TransferOrder/index.vue b/src/views/order/TransferOrder/index.vue index 4e74973..345ebd8 100644 --- a/src/views/order/TransferOrder/index.vue +++ b/src/views/order/TransferOrder/index.vue @@ -39,38 +39,38 @@ style="width: 180px; border-color: #e6f1ff" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -78,11 +78,11 @@ 重置 - - 导出 - - - @@ -91,7 +91,7 @@
- +
@@ -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 { \ No newline at end of file +} \ No newline at end of file diff --git a/src/views/order/carddealerOrder/carddealerSonOrder.vue b/src/views/order/carddealerOrder/carddealerSonOrder.vue index 13914e2..09d776c 100644 --- a/src/views/order/carddealerOrder/carddealerSonOrder.vue +++ b/src/views/order/carddealerOrder/carddealerSonOrder.vue @@ -38,31 +38,33 @@ @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
@@ -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: "确定", diff --git a/src/views/order/payOrder/csOrder.vue b/src/views/order/payOrder/csOrder.vue index 2d31af4..5ff15c1 100644 --- a/src/views/order/payOrder/csOrder.vue +++ b/src/views/order/payOrder/csOrder.vue @@ -5,89 +5,85 @@
超时订单
--> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 搜索 + 重置 + 导出 + - - - - - - -
- - 搜索 - 重置 - 导出 - - -
- - +
+ + - - + - - - - - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + + + - - - - - - -
- - 搜索 - 重置 - 导出 - -
- - - + + + + + + + + + + +
+ + 搜索 + 重置 + 导出 + +
+ + +
@@ -99,7 +95,7 @@ {{ parseFloat(NumberDiv(scope.row.reqAmount, 100)).toFixed(2) }} - +