diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index c0e9fda1..239d3b24 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -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('
') !== -1) { + } else if (/
|<\/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) { - // 可以用分号和
换行 - content = content.replaceAll(`
`, ';') + // 可以用分号和


换行 + content = content.replace(/
|<\/br>|/g, ';') const messageArr = content.split(';') const htmlDom = [] messageArr.map(tt => { diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue index 7b70cc75..9f0b2b42 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue @@ -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: [],