diff --git a/src/api/type/index.js b/src/api/type/index.js index 758654a..d3f8149 100644 --- a/src/api/type/index.js +++ b/src/api/type/index.js @@ -9,6 +9,14 @@ export function index(params){ }) } +export function reporttotal(params){ + return request({ + method:'get', + url:'/api/admin/product-type/total', + params + }) +} + export function store(data){ return request({ method:'post', diff --git a/src/views/finance/flow.vue b/src/views/finance/flow.vue index 9de0e5f..bb785c2 100644 --- a/src/views/finance/flow.vue +++ b/src/views/finance/flow.vue @@ -28,11 +28,20 @@ ~ - + +
+ +
+ + +
+
@@ -82,7 +91,33 @@ }, merchants: [], - +pickerOptions: { + shortcuts: [{ + text: '最近一周', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit('pick', [start, end]); + } + }, { + text: '最近一个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit('pick', [start, end]); + } + }, { + text: '最近三个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); + picker.$emit('pick', [start, end]); + } + }] + }, total: 0, list: [], table: [{ @@ -148,7 +183,9 @@ merchant_id: this.select.merchantId, type: this.select.type, serial: this.select.serial, - is_export: 1 + is_export: 1, + start_date:this.select.start_date, + end_date:this.select.end_date }, '财务流水.xlsx') }, @@ -156,6 +193,10 @@ pageChange(e) { this.select.pageIndex = e this.getFlow() + }, + changeCreatedDate(e) { + this.select.start_date = e[0]; + this.select.end_date = e[1]; }, async getMerchant() { @@ -182,11 +223,27 @@ } - + diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue index e5a6023..20ee54f 100644 --- a/src/views/order/orderList.vue +++ b/src/views/order/orderList.vue @@ -38,7 +38,8 @@
订单状态
diff --git a/src/views/reports/productOrder.vue b/src/views/reports/productOrder.vue new file mode 100644 index 0000000..cc83545 --- /dev/null +++ b/src/views/reports/productOrder.vue @@ -0,0 +1,89 @@ + + + + +