From bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 17 Feb 2022 22:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
index 4ab9223..5ca688e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
@@ -150,6 +150,11 @@
label="支付方式">
</el-table-column>
<el-table-column
+ prop="cardName"
+ sortable="custom"
+ label="储值卡名称">
+ </el-table-column>
+ <el-table-column
prop="flowNo"
label="支付流水号">
</el-table-column>
@@ -294,8 +299,10 @@
queryKey:_this.form.queryKey,
startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
+ shopId:_this.form.shopId,
order:_this.form.order,
sort:_this.form.sort,
+
}
},
search:function(){
--
Gitblit v1.9.1