From fa475be6411beaff03cffba55afccde87d52138f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 15 Apr 2026 14:26:57 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-15=201=E3=80=81BOM=E3=80=90=E5=8F=8D?= =?UTF-8?q?=E5=90=91=E5=90=8C=E6=AD=A5=E3=80=91=E4=BC=98=E5=8C=96=202?= =?UTF-8?q?=E3=80=81=E9=94=80=E5=94=AE=E6=8A=A5=E4=BB=B7-=E3=80=8B?= =?UTF-8?q?=E6=9D=A1=E7=9B=AE=E6=98=8E=E7=BB=86=E3=80=90=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/part/bomManagement.vue | 3 +- src/views/modules/part/recipeManagement.vue | 3 +- .../modules/quote/detail/quoteDetail.vue | 42 +++++++------------ 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 7bc42c1..eac65a5 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -5337,7 +5337,8 @@ export default { confirmButtonText: '确定' }) } - }).finally(()=>{ + this.toBecomeOfficialLoading = false + }).catch(() => { this.toBecomeOfficialLoading = false }) }) diff --git a/src/views/modules/part/recipeManagement.vue b/src/views/modules/part/recipeManagement.vue index 3469be6..85a2e13 100644 --- a/src/views/modules/part/recipeManagement.vue +++ b/src/views/modules/part/recipeManagement.vue @@ -4749,7 +4749,8 @@ export default { confirmButtonText: '确定' }) } - }).finally(() => { + this.toBecomeOfficialLoading = false + }).catch(() => { this.toBecomeOfficialLoading = false }) }) diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue index 5505fba..80c3024 100644 --- a/src/views/modules/quote/detail/quoteDetail.vue +++ b/src/views/modules/quote/detail/quoteDetail.vue @@ -551,24 +551,6 @@ export default { fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 5011, - serialNumber: '5011Table2Qty', - tableId: '5011Table2', - tableName: '报价详情信息表', - columnProp: 'unitPrice', - headerAlign: 'center', - align: 'right', - columnLabel: '未税单价', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, { userId: this.$store.state.user.name, functionId: 5011, @@ -1163,19 +1145,23 @@ export default { }, fields() { - let json = "{" - this.columns.forEach((item, index) => { - if (index === this.columns.length - 1) { - json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" - } else { - json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + "," + let fieldsObj = {}; + this.columns.forEach((item) => { + let label = item.columnLabel; + while (fieldsObj.hasOwnProperty(label)) { + label += '\u200B'; // append zero-width space to make it unique } - }) - json += "}" - return eval("(" + json + ")") + fieldsObj[label] = item.columnProp; + }); + return fieldsObj; }, createExportData() { - return this.dataList; + return this.dataList.map(item => { + return { + ...item, + unitPriceRate: this.formatDecimal(item.unitPriceRate) + } + }); }, toPartMenu (partNo) { if (this.$router.resolve(`/part-partInformation`).resolved.name === '404') {