fix 79316
This commit is contained in:
@@ -433,7 +433,7 @@ export const JeroListMixin = {
|
|||||||
} else {
|
} else {
|
||||||
if (Array.isArray(info.file.response.result) && info.file.response.result.length > 0) {
|
if (Array.isArray(info.file.response.result) && info.file.response.result.length > 0) {
|
||||||
this.messageLineFeed(this.$t('fileImportError'), info.file.response.result)
|
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)
|
this.messageLineFeedByBr(this.$t('fileImportError'), info.file.response.message)
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning(`${info.file.name} ${info.file.response.message}`)
|
this.$message.warning(`${info.file.name} ${info.file.response.message}`)
|
||||||
@@ -540,8 +540,8 @@ export const JeroListMixin = {
|
|||||||
* @param content
|
* @param content
|
||||||
*/
|
*/
|
||||||
messageLineFeedByBr (title, content) {
|
messageLineFeedByBr (title, content) {
|
||||||
// 可以用分号和<br/>换行
|
// 可以用分号和<br> </br> <br/>换行
|
||||||
content = content.replaceAll(`</br>`, ';')
|
content = content.replace(/<br>|<\/br>|<br\/>/g, ';')
|
||||||
const messageArr = content.split(';')
|
const messageArr = content.split(';')
|
||||||
const htmlDom = []
|
const htmlDom = []
|
||||||
messageArr.map(tt => {
|
messageArr.map(tt => {
|
||||||
|
|||||||
+1
-1
@@ -100,7 +100,7 @@ export default {
|
|||||||
delete: '/process/processEsInspectPlan/delete',
|
delete: '/process/processEsInspectPlan/delete',
|
||||||
importExcelUrl: '/process/processEsInspectPlan/importExcel',
|
importExcelUrl: '/process/processEsInspectPlan/importExcel',
|
||||||
deleteBatch: '/process/processEsInspectPlan/deleteBatch',
|
deleteBatch: '/process/processEsInspectPlan/deleteBatch',
|
||||||
downTemplateUrl: '/process/processEsInspectPlan/importExcel'
|
downTemplateUrl: '/process/processEsInspectPlan/templateDownload'
|
||||||
},
|
},
|
||||||
model: {},
|
model: {},
|
||||||
dataSource: [],
|
dataSource: [],
|
||||||
|
|||||||
Reference in New Issue
Block a user