From e29dcddb4e472be7c19a4bda41f47dc3f5dc2d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 27 Sep 2023 17:45:08 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lang/standardRegulationLibrary/en-us.js   | 12 +++---
 .../lang/standardRegulationLibrary/zh-cn.js   | 12 +++---
 src/mixins/ConfigurableTableMixin.js          | 38 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js
index b1675d47..008fc882 100644
--- a/src/common/lang/standardRegulationLibrary/en-us.js
+++ b/src/common/lang/standardRegulationLibrary/en-us.js
@@ -27,14 +27,14 @@ module.exports = {
     treeSearchPlaceholder: 'Please enter the tree system', // 请输入树状图体系
     collection: 'Invoice Collection', // 收藏
     cancelCollection: 'Delete Collection', // 取消收藏
-    exportFileName: 'Domestic standard regulations', // 国内标准法规
-    exportZipName: 'Domestic standards and regulations (with documents)', // 国内标准法规（带文件）
-    templateName: 'Import templates for domestic standards and regulations' // 国内标准法规导入模板
+    exportFileName: 'Domestic standard', // 国内标准法规
+    exportZipName: 'Domestic standards (with documents)', // 国内标准法规（带文件）
+    templateName: 'Import templates for domestic standards' // 国内标准法规导入模板
   },
   overseasStandard: {
-    exportFileName: 'Overseas standard regulations',
-    exportZipName: 'Overseas standard regulations (with documentation)',
-    templateName: 'Import template of overseas standard regulations'
+    exportFileName: 'Overseas standard',
+    exportZipName: 'Overseas standard (with documentation)',
+    templateName: 'Import template of overseas standard'
   },
   standardDetail: {
     standardNumber: 'Standard Number',
diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js
index f7fb0dba..6944e8e1 100644
--- a/src/common/lang/standardRegulationLibrary/zh-cn.js
+++ b/src/common/lang/standardRegulationLibrary/zh-cn.js
@@ -27,14 +27,14 @@ module.exports = {
     treeSearchPlaceholder: '请输入树状图体系',
     collection: '收藏',
     cancelCollection: '取消收藏',
-    exportFileName: '国内标准法规',
-    exportZipName: '国内标准法规（带文件）',
-    templateName: '国内标准法规导入模板'
+    exportFileName: '国内标准',
+    exportZipName: '国内标准（带文件）',
+    templateName: '国内标准导入模板'
   },
   overseasStandard: {
-    exportFileName: '海外标准法规',
-    exportZipName: '海外标准法规（带文件）',
-    templateName: '海外标准法规导入模板'
+    exportFileName: '海外标准',
+    exportZipName: '海外标准（带文件）',
+    templateName: '海外标准导入模板'
   },
   standardDetail: {
     standardNumber: '标准编号',
diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js
index bd38bfc6..2155b077 100644
--- a/src/mixins/ConfigurableTableMixin.js
+++ b/src/mixins/ConfigurableTableMixin.js
@@ -239,29 +239,29 @@ export const ConfigurableTableMixin = {
         importModalLoading && importModalLoading.destroy()
         this.loading = false
         if (info.file.response.success) {
+          // this.$message.success(`${info.file.name} 文件上传成功`);
+          if (info.file.response.code === 201) {
+            const { message, result: { msg, fileUrl, fileName } } = info.file.response
+            const href = window._CONFIG.domianURL + fileUrl
+            this.$warning({
+              title: message,
+              content: (
+                <div>
+                  <span>{msg}</span><br />
+                  <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
+                </div>
+              )
+            })
+          } else {
+            this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
+          }
+          this.loadData()
+        } else {
           if (Array.isArray(info.file.response.result) && info.file.response.result.length > 0) {
             this.messageLineFeed(this.$t('fileImportError'), info.file.response.result)
           } else {
-            // this.$message.success(`${info.file.name} 文件上传成功`);
-            if (info.file.response.code === 201) {
-              const { message, result: { msg, fileUrl, fileName } } = info.file.response
-              const href = window._CONFIG.domianURL + fileUrl
-              this.$warning({
-                title: message,
-                content: (
-                  <div>
-                    <span>{msg}</span><br />
-                    <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
-                  </div>
-                )
-              })
-            } else {
-              this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
-            }
-            this.loadData()
+            this.$message.error(`${info.file.name} ${info.file.response.message}.`)
           }
-        } else {
-          this.$message.error(`${info.file.name} ${info.file.response.message}.`)
         }
       } else if (info.file.status === 'error') {
         // 销毁这个提示