Merge pull request 'master' (#940) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/940
This commit is contained in:
2024-12-20 15:32:31 +00:00
5 changed files with 49 additions and 50 deletions

View File

@@ -410,31 +410,30 @@ const clickToPreview = (row) => {
const handleDelete = (row, type) => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
// deleteFile(row.fileId).then(res => {
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000) {
if (type === 'single') {
_singleFileValue.value.splice(_singleFileValue.value.findIndex((item) => item.fileId === row.fileId), 1);
isSingleFile.value = false
} else {
allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
if (allFileList.value && allFileList.value?.length == 0) {
isHaveOneFile.value = false
} else {
isHaveOneFile.value = true
}
isHaveOneFile.value = !(allFileList.value && allFileList.value?.length == 0);
console.log('allFileList.value',allFileList.value)
if (localStorage.getItem('collectData')) {
let collectData = JSON.parse(localStorage.getItem('collectData'))
collectData.fileList = allFileList.value
localStorage.setItem('collectData', JSON.stringify(collectData))
}else if (localStorage.getItem('otherFileList')) {
localStorage.setItem('otherFileList', JSON.stringify(allFileList.value))
}
}
}
});
// }
// });
}
const handleSingleDelete = (row) => {
handleDelete(row, 'single')

View File

@@ -569,18 +569,18 @@ const handleBack = () => {
history.back()
}
const handleDelete = (row) => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
// deleteFile(row.fileId).then(res => {
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000) {
formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.fileId === row.fileId), 1);
// showTable.value = formData.value.fileList.length !== 0;
changeRequirementData()
}
});
// }
// });
}
onMounted(async () => {

View File

@@ -340,16 +340,16 @@ const handleDownload = (row) => {
})
}
const handleDelete = (row) => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
// deleteFile(row.fileId).then(res => {
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000) {
fileList.value.splice(fileList.value.findIndex((item) => item.fileId === row.fileId), 1);
}
});
// }
// });
}
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {

View File

@@ -391,17 +391,17 @@ const filterDict = (data, value) => {
return label
}
const handleDelete = (row) => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
// deleteFile(row.fileId).then(res => {
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000) {
fileList.value.splice(fileList.value.findIndex((item) => item.fileId === row.fileId), 1);
changeImplementFile()
}
});
// }
// });
}
const handleDownload = (row) => {

View File

@@ -197,17 +197,17 @@ const handleDownload = (row) => {
})
}
const handleDelete = (row) => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
// deleteFile(row.fileId).then(res => {
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000) {
formData.value.files.splice(formData.value.files.findIndex((item) => item.fileId === row.fileId), 1);
// showTable.value = formData.value.files.length !== 0;
}
});
// }
// });
}
const compositeParam = (item) => {
let tag = ''