fix 79316

This commit is contained in:
danshihao
2023-12-19 18:34:10 +08:00
parent 3001bfdf35
commit 74dab3fa6a
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -433,7 +433,7 @@ export const JeroListMixin = {
} else {
if (Array.isArray(info.file.response.result) && info.file.response.result.length > 0) {
this.messageLineFeed(this.$t('fileImportError'), info.file.response.result)
} else if (info.file.response.message.indexOf('</br>') !== -1) {
} else if (/<br>|<\/br>|<br\/>/.test(info.file.response.message)) {
this.messageLineFeedByBr(this.$t('fileImportError'), info.file.response.message)
} else {
this.$message.warning(`${info.file.name} ${info.file.response.message}`)
@@ -540,8 +540,8 @@ export const JeroListMixin = {
* @param content
*/
messageLineFeedByBr (title, content) {
// 可以用分号和<br/>换行
content = content.replaceAll(`</br>`, ';')
// 可以用分号和<br> </br> <br/>换行
content = content.replace(/<br>|<\/br>|<br\/>/g, ';')
const messageArr = content.split(';')
const htmlDom = []
messageArr.map(tt => {
@@ -100,7 +100,7 @@ export default {
delete: '/process/processEsInspectPlan/delete',
importExcelUrl: '/process/processEsInspectPlan/importExcel',
deleteBatch: '/process/processEsInspectPlan/deleteBatch',
downTemplateUrl: '/process/processEsInspectPlan/importExcel'
downTemplateUrl: '/process/processEsInspectPlan/templateDownload'
},
model: {},
dataSource: [],