From 237690c38e796a07efc32140924ff5989971a21a Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 11:53:54 +0800
Subject: [PATCH] =?UTF-8?q?[bug]=20=E5=88=A0=E9=99=A4=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=9C=89=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?<br/>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/JeroListMixin.js                   | 46 +++++++++++++------
 .../businessManagement/BusinessManagement.vue | 12 ++++-
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 64a76bb..a458fec 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -197,7 +197,11 @@ export const JeroListMixin = {
                 that.loadData()
                 that.onClearSelected()
               } else {
-                that.$message.warning(res.message)
+                if (res.message.indexOf('<br/>') > -1) {
+                  that.messageLineFeed('删除失败', res.message)
+                } else {
+                  that.$message.warning(res.message)
+                }
               }
             }).finally(() => {
               that.loading = false
@@ -225,7 +229,11 @@ export const JeroListMixin = {
               }
               that.loadData()
             } else {
-              that.$message.warning(res.message)
+              if (res.message.indexOf('<br/>') > -1) {
+                that.messageLineFeed('删除失败', res.message)
+              } else {
+                that.$message.warning(res.message)
+              }
             }
           })
         }
@@ -322,19 +330,7 @@ export const JeroListMixin = {
           }
           this.loadData()
         } else {
-          const messageArr = info.file.response.message.split('<br/>')
-          let htmlDom = []
-          messageArr.map(tt => {
-            if (tt) {
-              htmlDom.push((<div>{tt}</div>))
-            }
-          })
-          this.$warning({
-            title: '文件导入错误',
-            content: (h) => <div>
-              {htmlDom}
-            </div>
-          })
+          this.messageLineFeed('文件导入错误', info.file.response.message)
           // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
         }
       } else if (info.file.status === 'error') {
@@ -386,6 +382,26 @@ export const JeroListMixin = {
       let url = getFileAccessHttpUrl(text)
       window.open(url)
     },
+    /**
+     * 对包含<br/>的后端错误信息进行处理
+     * @param title
+     * @param content
+     */
+    messageLineFeed(title, content) {
+      const messageArr = content.split('<br/>')
+      let htmlDom = []
+      messageArr.map(tt => {
+        if (tt) {
+          htmlDom.push((<div>{tt}</div>))
+        }
+      })
+      this.$warning({
+        title: title,
+        content: (h) => <div>
+          {htmlDom}
+        </div>
+      })
+    }
   }
 
 }
diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue
index 62cd0c7..2710066 100644
--- a/src/views/businessManagement/BusinessManagement.vue
+++ b/src/views/businessManagement/BusinessManagement.vue
@@ -220,7 +220,11 @@ export default {
                   }
                   that.loadData()
                 } else {
-                  that.$message.warning(res.message)
+                  if (res.message.indexOf('<br/>') > -1) {
+                    that.messageLineFeed('删除失败', res.message)
+                  } else {
+                    that.$message.warning(res.message)
+                  }
                 }
               })
             }
@@ -267,7 +271,11 @@ export default {
                     that.loadData()
                     that.onClearSelected()
                   } else {
-                    that.$message.warning(res.message)
+                    if (res.message.indexOf('<br/>') > -1) {
+                      that.messageLineFeed('删除失败', res.message)
+                    } else {
+                      that.$message.warning(res.message)
+                    }
                   }
                 }).finally(() => {
                   that.loading = false