From 142f2e839bf76eff614ca7c07c30b5da2745681a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:47:20 +0800
Subject: [PATCH] 处理冲突
---
src/views/spare/modules/sparePart/SparePart2List.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/spare/modules/sparePart/SparePart2List.vue b/src/views/spare/modules/sparePart/SparePart2List.vue
index a48323b..2ac8d81 100644
--- a/src/views/spare/modules/sparePart/SparePart2List.vue
+++ b/src/views/spare/modules/sparePart/SparePart2List.vue
@@ -342,8 +342,8 @@
selectedRowKeys: this.selectedRowKeys,
};
},
- importExcelUrl(){
- return `${window._CONFIG['domianURL']}/${this.url.importUrl}`;
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {
--
Gitblit v1.9.3