diff --git a/src/views/task/exam/components/steps/step2/index.vue b/src/views/task/exam/components/steps/step2/index.vue index c703fa0..0c19dd8 100644 --- a/src/views/task/exam/components/steps/step2/index.vue +++ b/src/views/task/exam/components/steps/step2/index.vue @@ -342,10 +342,6 @@ const openLook = (type: string, paperId?: number) => { // 删除操作 const handleDelete = async (row?: any) => { - if (row?.counts > 0) { - ElMessage.warning('当前试卷使用次数大于0,不允许删除!'); - return; - } try { await message.delConfirm(); await PaperApi.removePaper(row.paperId); diff --git a/src/views/task/exam/index.vue b/src/views/task/exam/index.vue index c025a37..7994032 100644 --- a/src/views/task/exam/index.vue +++ b/src/views/task/exam/index.vue @@ -273,8 +273,13 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await SmsChannelApi.removeTasks(id) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(id) + console.log(res); + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} @@ -282,6 +287,7 @@ const handleDelete = async (id: number) => { const selectedRows = ref([]); + const handleDeletes = async () => { try { const rows = selections.value; @@ -291,8 +297,13 @@ const handleDeletes = async () => { } selectedRows.value = rows.map((d: any) => d.taskId); // 保存选中的行数据 - await SmsChannelApi.removeTasks(selectedRows.value) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(selectedRows.value) +console.log(res); + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} diff --git a/src/views/task/selftrans/ai/index.vue b/src/views/task/selftrans/ai/index.vue index 9519c02..515de8b 100644 --- a/src/views/task/selftrans/ai/index.vue +++ b/src/views/task/selftrans/ai/index.vue @@ -274,8 +274,13 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await SmsChannelApi.removeTasks(id) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(id) + console.log(res); + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} diff --git a/src/views/task/selftrans/collegeexam/index.vue b/src/views/task/selftrans/collegeexam/index.vue index de745a2..0e5f8a0 100644 --- a/src/views/task/selftrans/collegeexam/index.vue +++ b/src/views/task/selftrans/collegeexam/index.vue @@ -275,8 +275,13 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await SmsChannelApi.removeTasks(id) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(id) + console.log(res); + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} @@ -293,8 +298,12 @@ const handleDeletes = async () => { } selectedRows.value = rows.map((d: any) => d.taskId); // 保存选中的行数据 - await SmsChannelApi.removeTasks(selectedRows.value) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(selectedRows.value) + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} diff --git a/src/views/task/selftrans/module/index.vue b/src/views/task/selftrans/module/index.vue index abb485e..001c68c 100644 --- a/src/views/task/selftrans/module/index.vue +++ b/src/views/task/selftrans/module/index.vue @@ -275,8 +275,13 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await SmsChannelApi.removeTasks(id) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(id) + console.log(res); + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} @@ -293,8 +298,12 @@ const handleDeletes = async () => { } selectedRows.value = rows.map((d: any) => d.taskId); // 保存选中的行数据 - await SmsChannelApi.removeTasks(selectedRows.value) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(selectedRows.value) + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} diff --git a/src/views/task/selftrans/random/index.vue b/src/views/task/selftrans/random/index.vue index 05549ec..32c5477 100644 --- a/src/views/task/selftrans/random/index.vue +++ b/src/views/task/selftrans/random/index.vue @@ -275,8 +275,13 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await SmsChannelApi.removeTasks(id) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(id) + console.log(res); + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} @@ -293,8 +298,13 @@ const handleDeletes = async () => { } selectedRows.value = rows.map((d: any) => d.taskId); // 保存选中的行数据 - await SmsChannelApi.removeTasks(selectedRows.value) - message.success(t('common.delSuccess')) + + const res= await SmsChannelApi.removeTasks(selectedRows.value) + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} diff --git a/src/views/task/sprint/components/steps/step2/index.vue b/src/views/task/sprint/components/steps/step2/index.vue index f3aef2b..78e4b72 100644 --- a/src/views/task/sprint/components/steps/step2/index.vue +++ b/src/views/task/sprint/components/steps/step2/index.vue @@ -342,10 +342,7 @@ const openLook = (type: string, paperId?: number) => { // 删除操作 const handleDelete = async (row?: any) => { - if (row?.counts > 0) { - ElMessage.warning('当前试卷使用次数大于0,不允许删除!'); - return; - } + try { await message.delConfirm(); await PaperApi.removePaper(row.paperId); diff --git a/src/views/task/sprint/index.vue b/src/views/task/sprint/index.vue index 9639d2c..e82821c 100644 --- a/src/views/task/sprint/index.vue +++ b/src/views/task/sprint/index.vue @@ -294,7 +294,6 @@ const handleDeletes = async () => { selectedRows.value = rows.map((d: any) => d.taskId); // 保存选中的行数据 const res= await SmsChannelApi.removeTasks(selectedRows.value) -console.log(res); if(res=='删除成功'){ message.success(res) }else{ diff --git a/src/views/task/trans/components/steps/step2/index.vue b/src/views/task/trans/components/steps/step2/index.vue index c703fa0..0c19dd8 100644 --- a/src/views/task/trans/components/steps/step2/index.vue +++ b/src/views/task/trans/components/steps/step2/index.vue @@ -342,10 +342,6 @@ const openLook = (type: string, paperId?: number) => { // 删除操作 const handleDelete = async (row?: any) => { - if (row?.counts > 0) { - ElMessage.warning('当前试卷使用次数大于0,不允许删除!'); - return; - } try { await message.delConfirm(); await PaperApi.removePaper(row.paperId); diff --git a/src/views/task/trans/index.vue b/src/views/task/trans/index.vue index ec37ba5..05d4d69 100644 --- a/src/views/task/trans/index.vue +++ b/src/views/task/trans/index.vue @@ -255,8 +255,12 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await SmsChannelApi.removeTasks(id) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(id) + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {} @@ -264,6 +268,7 @@ const handleDelete = async (id: number) => { const selectedRows = ref([]); + const handleDeletes = async () => { try { const rows = selections.value; @@ -273,8 +278,13 @@ const handleDeletes = async () => { } selectedRows.value = rows.map((d: any) => d.taskId); // 保存选中的行数据 - await SmsChannelApi.removeTasks(selectedRows.value) - message.success(t('common.delSuccess')) + const res= await SmsChannelApi.removeTasks(selectedRows.value) +console.log(res); + if(res=='删除成功'){ + message.success(res) + }else{ + message.error(res) + } // 刷新列表 await getList() } catch {}