From a469470bdd56a2b4d041d2445ff75a07d6831ae0 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 1 Aug 2024 11:04:35 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
=?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/lang/en-us.js | 1 +
src/common/lang/zh-cn.js | 1 +
.../modules/EngineerInitBaseInfo.vue | 61 ++++++++++++++++++-
3 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index f250108..1bdccb5 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -246,6 +246,7 @@ module.exports = {
autoTakeout: 'Automatic takeout',
goHandle: 'To deal with',
disableInput: 'Inhibit input',
+ fileUploadError: 'File upload error',
// 标准字段
standardField: {
standardEnglishName: 'Regulation English Name',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 700aaff..a8e0e9d 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -246,6 +246,7 @@ module.exports = {
autoTakeout: '自动带出',
goHandle: '去处理',
disableInput: '禁止输入',
+ fileUploadError: '文件上传错误',
// 标准字段
standardField: {
standardEnglishName: '标准英文名称',
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
index 74c5a41..77d79d5 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
@@ -700,7 +700,13 @@ export default {
this.dataSource = JSON.parse(JSON.stringify(dataSource))
this.dataList = JSON.parse(JSON.stringify(dataSource))
} else {
- this.$message.warning(res.message)
+ if (Array.isArray(res.message) && res.message.length > 0) {
+ this.messageLineFeed(this.$t('fileUploadError'), res.message)
+ } else if (/
|<\/br>|
/.test(res.message)) {
+ this.messageLineFeedByBr(this.$t('fileUploadError'), res.messagee)
+ } else {
+ this.$message.warning(res.message)
+ }
}
}).finally(() => {
this.$emit('loading', false)
@@ -854,6 +860,59 @@ export default {
handleDownload (id, name) {
// 下载文件
downloadFile(`/sys/common/download/${id}`, name)
+ },
+ /**
+ * 对数组形式后端错误信息进行处理
+ * @param title
+ * @param content
+ */
+ messageLineFeed (title, content) {
+ const htmlDom = []
+ content.map(tt => {
+ if (tt) {
+ htmlDom.push((