diff --git a/src/views/order/payOrder/csOrder.vue b/src/views/order/payOrder/csOrder.vue index d0318c5..f7b660c 100644 --- a/src/views/order/payOrder/csOrder.vue +++ b/src/views/order/payOrder/csOrder.vue @@ -591,30 +591,8 @@ export default { } }); }, - timerHandler() { - let queryParams = { - pageNum: this.queryParams.pageNum, - pageSize: this.queryParams.pageSize, - orderNo: this.queryParams.orderNo, - merchantOrderNo: this.queryParams.merchantOrderNo, - carddealerCardNumber: this.queryParams.carddealerCardNumber, - merchantName: this.queryParams.merchantName, - carddealerName: this.queryParams.carddealerName, - payerName: this.queryParams.payerName, - orderAmount: this.queryParams.orderAmount, - channelName: this.queryParams.channelName, - orderStatus: this.queryParams.orderStatus, - carddealerCardHolder: this.queryParams.carddealerCardHolder, - reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount), - platformChannelId: this.queryParams.platformChannelId, - } - listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => { - this.infoList = response.rows; - this.total = Number(response.total); - }); - }, /** 查询代收订单列表 */ - getList(beginAmount,endAmount) { + getList() { this.loading = true; let queryParams = { pageNum: this.queryParams.pageNum, @@ -638,7 +616,6 @@ export default { this.infoList = response.rows; this.total = Number(response.total); this.loading = false; - this.startTimer(queryParams) }); }, // 取消按钮 @@ -663,11 +640,7 @@ export default { this.queryParams.pageNum = 1; this.endAmount=endAmount this.beginAmount=beginAmount - if(endAmount||beginAmount){ - this.getList(beginAmount,endAmount) - }else{ - this.getList() - } + this.getList() }, /** 重置按钮操作 */ resetQuery() { diff --git a/src/views/order/payOrder/index.vue b/src/views/order/payOrder/index.vue index 68f2373..6f23f4a 100644 --- a/src/views/order/payOrder/index.vue +++ b/src/views/order/payOrder/index.vue @@ -567,30 +567,8 @@ export default { } }); }, - timerHandler() { - let queryParams = { - pageNum: this.queryParams.pageNum, - pageSize: this.queryParams.pageSize, - orderNo: this.queryParams.orderNo, - merchantOrderNo: this.queryParams.merchantOrderNo, - carddealerCardNumber: this.queryParams.carddealerCardNumber, - merchantName: this.queryParams.merchantName, - carddealerName: this.queryParams.carddealerName, - payerName: this.queryParams.payerName, - orderAmount: this.queryParams.orderAmount, - channelName: this.queryParams.channelName, - orderStatus: this.queryParams.orderStatus, - carddealerCardHolder: this.queryParams.carddealerCardHolder, - reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount), - platformChannelId: this.queryParams.platformChannelId, - } - listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => { - this.infoList = response.rows; - this.total = Number(response.total); - }); - }, /** 查询代收订单列表 */ - getList(beginAmount,endAmount) { + getList() { this.loading = true; let queryParams = { pageNum: this.queryParams.pageNum, @@ -614,7 +592,6 @@ export default { this.infoList = response.rows; this.total = Number(response.total); this.loading = false; - this.startTimer(queryParams) }); }, // 取消按钮 @@ -639,11 +616,7 @@ export default { this.queryParams.pageNum = 1; this.endAmount=endAmount this.beginAmount=beginAmount - if(endAmount||beginAmount){ - this.getList(beginAmount,endAmount) - }else{ - this.getList() - } + this.getList() }, /** 重置按钮操作 */ resetQuery() { diff --git a/src/views/order/payOrder/wwc.vue b/src/views/order/payOrder/wwc.vue index 3017f14..0a6d140 100644 --- a/src/views/order/payOrder/wwc.vue +++ b/src/views/order/payOrder/wwc.vue @@ -52,12 +52,12 @@ - - -- - - + + -- + + @@ -88,7 +88,8 @@ 搜索 重置 - 导出 + 导出 @@ -138,7 +139,7 @@ @@ -159,12 +160,13 @@ @@ -226,8 +228,9 @@
- {{ detailInfoList.isAcceptorOrder?'是':'否' }} - + {{ detailInfoList.isAcceptorOrder ? '是' : '否' + }} + {{ detailInfoList.carddealerCardNumber }} @@ -290,7 +293,7 @@
- + @@ -388,8 +391,8 @@ export default { reqAmount: null, platformChannelId: null, downstreamMerchantOrderNo: null, - endAmount:null, - beginAmount:null, + endAmount: null, + beginAmount: null, }, // 显示详情 isShowDetail: false, @@ -535,8 +538,8 @@ export default { debug: true, }, methods: { - // 预览图片 - previewImage(abUrl) { + // 预览图片 + previewImage(abUrl) { this.srcList[0] = abUrl; }, // 凭证图片 @@ -587,32 +590,8 @@ export default { } }); }, - timerHandler() { - let queryParams = { - pageNum: this.queryParams.pageNum, - pageSize: this.queryParams.pageSize, - orderNo: this.queryParams.orderNo, - merchantOrderNo: this.queryParams.merchantOrderNo, - carddealerCardNumber: this.queryParams.carddealerCardNumber, - merchantName: this.queryParams.merchantName, - carddealerName: this.queryParams.carddealerName, - payerName: this.queryParams.payerName, - orderAmount: this.queryParams.orderAmount, - channelName: this.queryParams.channelName, - orderStatus: this.queryParams.orderStatus, - carddealerCardHolder: this.queryParams.carddealerCardHolder, - reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount), - platformChannelId: this.queryParams.platformChannelId, - downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo, - - } - listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => { - this.infoList = response.rows; - this.total = Number(response.total); - }); - }, /** 查询代收订单列表 */ - getList(beginAmount,endAmount) { + getList() { this.loading = true; let queryParams = { pageNum: this.queryParams.pageNum, @@ -629,14 +608,13 @@ export default { carddealerCardHolder: this.queryParams.carddealerCardHolder, platformChannelId: this.queryParams.platformChannelId, downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo, - beginAmount:this.beginAmount, - endAmount:this.endAmount, + beginAmount: this.beginAmount, + endAmount: this.endAmount, } listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => { this.infoList = response.rows; this.total = Number(response.total); this.loading = false; - this.startTimer(queryParams) }); }, // 取消按钮 @@ -653,27 +631,23 @@ export default { this.resetForm("form"); }, /** 搜索按钮操作 */ - handleQuery() { - var beginAmount=null; - var endAmount=null; + handleQuery() { + var beginAmount = null; + var endAmount = null; this.queryParams.beginAmount ? beginAmount = this.NumberMul(this.queryParams.beginAmount, 100) : this.queryParams.beginAmount this.queryParams.endAmount ? endAmount = this.NumberMul(this.queryParams.endAmount, 100) : this.queryParams.endAmount this.queryParams.pageNum = 1; - this.endAmount=endAmount - this.beginAmount=beginAmount - if(endAmount||beginAmount){ - this.getList(beginAmount,endAmount) - }else{ - this.getList() - } + this.endAmount = endAmount + this.beginAmount = beginAmount + this.getList() }, - /** 重置按钮操作 */ - resetQuery() { + /** 重置按钮操作 */ + resetQuery() { this.dateRange = [] - this.queryParams.beginAmount=null; - this.queryParams.endAmount=null; - this.beginAmount=null; - this.endAmount=null; + this.queryParams.beginAmount = null; + this.queryParams.endAmount = null; + this.beginAmount = null; + this.endAmount = null; this.resetForm("queryForm"); this.handleQuery(); },