From 2318cd422469e88ef4c3492f19c8fb0a5055bafa Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 30 Aug 2023 14:18:52 +0800
Subject: [PATCH] =?UTF-8?q?rxswin=E5=AF=BC=E5=85=A5=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/ImportFile/index.vue               | 7 +++++++
 .../src/views/projectManagement/components/rxswinModel.vue | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index 138fe4892..58390b6dd 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -50,6 +50,10 @@
         type: String,
         default: ''
       },
+      version: {
+        type: String,
+        default: ''
+      },
       paramsTemplateId: {
         type: String,
         default: ''
@@ -73,6 +77,9 @@
     computed: {
       importUrl() {
         if (this.projectId) {
+          if(this.version){
+            return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId +'&version=' + this.version
+          }
           return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId
         } else if (this.dummyInventoryBaseId) {
           return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&dummyInventoryBaseId=' + this.dummyInventoryBaseId
diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue
index e20af5f48..3d81677fc 100644
--- a/jero-web/src/views/projectManagement/components/rxswinModel.vue
+++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue
@@ -100,8 +100,9 @@
 <!--        导入-->
         <div v-show="staFlag != '1'" class="operator-text"
              v-has="'rxswin:Import'">
-          <ImportFile :url="url" :accept="'.xls'"
-                      @getList="getPersonnelList"/>
+          <ImportFile :url="url" :projectId="$route.query.id" :version="$route.query.projectVersion" :accept="'.xls'"
+                      :isTrue="true"
+                      @getList="getList"/>
         </div>
 <!--        批量删除-->
         <div v-show="staFlag != '1'" class="operator-text"
@@ -333,7 +334,7 @@
           page: '/project/projectRxswinEO/page',
           edit: '/project/projectRelatedPersonnel/edit',
           exportData: '/project/projectRxswinEO/exportXls',
-          importZipUrl: '/project/projectRelatedPersonnel/importExcel',
+          importZipUrl: '/project/projectRxswinEO/importExcel',
           queryCertificationEngineer: '/project/projectRelatedPersonnel/queryCertificationEngineer'
         },
         selectedRowKeys: [],