From 2d0154e3418af28e8f920504f45b12e508c8656e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 11 Aug 2026 11:07:24 +0800 Subject: [PATCH] =?UTF-8?q?2026-08-11=20=E5=88=80=E5=85=B7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E8=AE=B0=E5=BD=95=EF=BC=9A=E3=80=90=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E3=80=91=E7=9A=84=E6=96=87=E6=A1=A3=E9=87=8C=E2=80=9C=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=BC=96=E7=A0=81=E2=80=9D=E5=92=8C=E2=80=9C=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=8F=8F=E8=BF=B0=E2=80=9D=E6=98=AF=E7=A9=BA=E5=80=BC?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/tooling/searchToolApply.vue | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 687dd93..53cea5f 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -2440,13 +2440,20 @@ export default { //导出excel async createExportData() { - this.searchData.limit = -1 - this.searchData.page = 1 - await searchProjectToolApplyHeader(this.searchData).then(({data}) => { - this.exportList = data.page.list; - }) - - return this.exportList; + const originalLimit = this.searchData.limit + const originalPage = this.searchData.page + try { + this.searchData.limit = -1 + this.searchData.page = 1 + const {data} = await searchProjectToolApplyHeader(this.searchData) + const rows = (data && data.page && data.page.list) ? data.page.list : [] + await this.loadToolDetailInfo(rows) + this.exportList = rows + } finally { + this.searchData.limit = originalLimit + this.searchData.page = originalPage + } + return this.exportList }, startDownload() { this.exportLoading = true @@ -2524,9 +2531,12 @@ export default { this.isFilterSearch = false }, // 加载每条申请记录的首条工具明细信息 - loadToolDetailInfo() { - this.dataList1.forEach(item => { - searchProjectToolApplyDetail({ + loadToolDetailInfo(targetList = this.dataList1) { + if (!Array.isArray(targetList) || targetList.length === 0) { + return Promise.resolve([]) + } + return Promise.all(targetList.map(item => { + return searchProjectToolApplyDetail({ site: item.site, applyNo: item.applyNo }).then(({data}) => { @@ -2545,7 +2555,7 @@ export default { this.$set(item, 'firstToolId', '') this.$set(item, 'firstToolDesc', '') }) - }) + })) }, //单击切换订单 changeData(row) {