diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue index 2c8ef71..80f17a1 100644 --- a/src/views/order/orderList.vue +++ b/src/views/order/orderList.vue @@ -65,7 +65,7 @@ @@ -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/product/productList/index.vue b/src/views/product/productList/index.vue index 659813b..fd7beed 100644 --- a/src/views/product/productList/index.vue +++ b/src/views/product/productList/index.vue @@ -71,14 +71,14 @@ empty-text="暂无数据" > - + - + - + @@ -99,7 +99,7 @@ 货号:{{ scope.row.productNum }} - +