From 85dce973eb29eb2372c76d5b95b30354da9c41c8 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:08:51 +0800
Subject: [PATCH] fead:新增收银员字段
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 d016abf..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
@@ -111,7 +111,7 @@
<el-row class="table-style" >
- <el-table id="proj" :data="table.rows" :height="height" stripe>
+ <el-table id="proj" :data="table.rows" :height="height" stripe @sort-change="sortChange">
<el-table-column
prop="orderNo"
label="订单号"
@@ -125,16 +125,19 @@
</el-table-column>
<el-table-column
prop="createTime"
+ sortable="custom"
label="交易时间"
show-overflow-tooltip
width="180">
</el-table-column>
<el-table-column
prop="flowType"
+ sortable="custom"
label="交易类型">
</el-table-column>
<el-table-column
prop="amount"
+ sortable="custom"
label="交易金额">
</el-table-column>
<el-table-column
@@ -143,7 +146,13 @@
</el-table-column>
<el-table-column
prop="payMethod"
+ sortable="custom"
label="支付方式">
+ </el-table-column>
+ <el-table-column
+ prop="cardName"
+ sortable="custom"
+ label="储值卡名称">
</el-table-column>
<el-table-column
prop="flowNo"
@@ -253,6 +262,17 @@
resetForm(formName) {
this.$refs[formName].resetFields();
},
+ sortChange:function (column){
+ if(column.order){
+ if(column.order.indexOf("desc")){
+ this.form.order="desc";
+ }else{
+ this.form.order="asc";
+ }
+ this.form.sort=column.prop;
+ this.loadData();
+ }
+ },
loadData:function(){
let _this = this;
let data=_this.getRequestParam();
@@ -270,16 +290,19 @@
},
getRequestParam(){
let _this = this;
- return {
+ return {
name:_this.form.name,
payMethod:_this.form.payMethod,
flowType:_this.form.flowType,
orderNo:_this.form.orderNo,
oprationMan:_this.form.oprationMan,
queryKey:_this.form.queryKey,
- shopId:_this.form.shopId,
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