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') {