From 6a43e79d01fb8f1ea8bd2288cc603ee5325dd2ec Mon Sep 17 00:00:00 2001 From: xk_chenlianjie <15255791639@163.com> Date: Fri, 2 Feb 2024 10:56:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order/orderList.vue | 2 +- src/views/order/orderRefundList.vue | 5 +++-- src/views/statistics/searchStatisticsList.vue | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue index 2c8ef71..9638303 100644 --- a/src/views/order/orderList.vue +++ b/src/views/order/orderList.vue @@ -283,7 +283,7 @@ export default { const searchParam = { ...this.page } searchParam.pageSize = endIndex searchParam.currentPage = this.output.startPage - orderInfoApi.exportExcel(searchParam).then(res => { + orderInfoApi.getByPage(searchParam).then(res => { const link = document.createElement('a') // 创建Blob对象，设置文件类型 const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型 diff --git a/src/views/order/orderRefundList.vue b/src/views/order/orderRefundList.vue index 209cc3b..3fa5412 100644 --- a/src/views/order/orderRefundList.vue +++ b/src/views/order/orderRefundList.vue @@ -247,7 +247,7 @@ export default { const searchParam = { ...this.page } searchParam.pageSize = endIndex searchParam.currentPage = this.output.startPage - orderInfoApi.exportExcel(searchParam).then(res => { + orderInfoApi.getRefundOrder(searchParam).then(res => { const link = document.createElement('a') // 创建Blob对象，设置文件类型 const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型 @@ -259,7 +259,8 @@ export default { this.$message.success('导出成功') URL.revokeObjectURL(link.href) // 释放内存 }) - + // const res = await orderInfoApi.getByPage(searchParam) + // tmpData = res.data.list import('@/vendor/Export2Excel').then(excel => { const data = this.formatJson(this.valColumn, tmpData) excel.export_json_to_excel({ diff --git a/src/views/statistics/searchStatisticsList.vue b/src/views/statistics/searchStatisticsList.vue index ff234b4..5eddadb 100644 --- a/src/views/statistics/searchStatisticsList.vue +++ b/src/views/statistics/searchStatisticsList.vue @@ -215,7 +215,7 @@ export default { const searchParam = { ...this.page } searchParam.pageSize = endIndex searchParam.currentPage = this.output.startPage - inspectionApi.exportExcel(searchParam).then(res => { + marketingApi.getByPageNew(searchParam).then(res => { const link = document.createElement('a') // 创建Blob对象，设置文件类型 const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型 From ecd7565c14a80b68f1bf25c737209e4f24f19e5b Mon Sep 17 00:00:00 2001 From: xk_chenlianjie <15255791639@163.com> Date: Fri, 2 Feb 2024 13:55:20 +0800 Subject: [PATCH 2/3] 11 --- src/views/order/orderList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue index 9638303..80f17a1 100644 --- a/src/views/order/orderList.vue +++ b/src/views/order/orderList.vue @@ -65,7 +65,7 @@ From 0a0dab83e805624f64a4dbca6e962dde693e7500 Mon Sep 17 00:00:00 2001 From: xk_chenlianjie <15255791639@163.com> Date: Fri, 2 Feb 2024 16:01:23 +0800 Subject: [PATCH 3/3] 111 --- src/views/product/productList/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue index ed2e9f3..3d4f18f 100644 --- a/src/views/product/productList/index.vue +++ b/src/views/product/productList/index.vue @@ -69,14 +69,14 @@ empty-text="暂无数据" > - + - + - + @@ -97,7 +97,7 @@ 货号：{{ scope.row.productNum }} - +