From 717122a8929e0ea00acea4c7b1516e03a766c944 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 27 Jan 2021 22:42:03 +0800
Subject: [PATCH] 新增交易流水
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html
index e959806..9db97ac 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html
@@ -41,7 +41,7 @@
<div class="panel-body" id="app">
<el-row class="buttonPanel">
- <el-button type="primary" >导出</el-button>
+ <el-button @click="exportExcel" type="primary" >导出</el-button>
</el-row>
<el-row class="rowPanel" >
@@ -146,7 +146,7 @@
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
- <el-button type="text" size="small">有效</el-button>
+ <el-button type="text" @click="openOrder(scope.$index, scope.row)" size="small">订单详情</el-button>
</template>
</el-table-column>
</el-table>
@@ -228,22 +228,13 @@
},
loadData:function(){
let _this = this;
- //获取用户列表
+ let data=_this.getRequestParam();
+ data.limit=_this.table.pageSize;
+ data.offset=_this.table.pageSize*(_this.table.currentPage-1);
AjaxProxy.requst({
app: _this,
- data:{
- limit:_this.table.pageSize,
- offset:_this.table.pageSize*(_this.table.currentPage-1),
- name:_this.form.name,
- payMethod:_this.form.payMethod,
- flowType:_this.form.flowType,
- orderNo:_this.form.orderNo,
- oprationMan:_this.form.oprationMan,
- 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"):'',
- },
- url: basePath + '/admin/orderFlow/findSumDailyInfoNew',
+ data:data,
+ url: basePath + '/admin/orderFlow/findOrderFlow',
callback: function (data) {
_this.table.rows = data.rows;
_this.table.total=data.total;
@@ -258,8 +249,33 @@
if(evt.keyCode==13) {
this.search();
}
- }
+ },
+ openOrder(index,row){
+ layer.full(layer.open({
+ type : 2,
+ title : "订单详情",
+ maxmin : true,
+ content : [ basePath + '/admin/order/orderItem?id=' + row.orderId ]
+ }));
+ },
+ getRequestParam(){
+ let _this = this;
+ 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,
+ 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"):'',
+ }
+ },
+ //导出
+ exportExcel(){
+ window.location.href=basePath+"/admin/orderFlow/exportOrderFlowExcel?"+MTools.jsonToUrlParam(this.getRequestParam());
+ }
}
});
--
Gitblit v1.9.1