From 5e796658635bdfcb7806a49fd424ce08c7f8c4a3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 13 十月 2023 15:41:56 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/other/payment/receipt/index.vue | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index ff6411b..3e8365e 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -146,6 +146,8 @@
}
this.getData()
},
+ mounted() {
+ },
methods: {
setTable() {
this.tableList = {
@@ -176,13 +178,28 @@
},
// 璇锋眰鏁版嵁
async getData() {
+ // console.log()
this.loading = true
- await getReceiptList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ let params = {}
+ let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2
+ if (this.addConfig.id) {
+ params = {
+ sourceID: this.addConfig.id,
+ sourceType: sourceTyle,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ client_id:this.addConfig.client_id,
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ client_id:this.addConfig.client_id,
+ }
+ }
+ await getReceiptList(params)
.then((res) => {
if (res.data.code === 200) {
const resList = res?.data?.data?.data ?? []
--
Gitblit v1.8.0