From aaa894c74a43d8d0812c4b2bf5bf743c63ba12d3 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Thu, 27 Mar 2025 16:23:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enterprises/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue index 20e6150..6037ac7 100644 --- a/src/views/enterprises/index.vue +++ b/src/views/enterprises/index.vue @@ -47,7 +47,7 @@ - + Date: Fri, 28 Mar 2025 10:03:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/taskinfo/index.ts | 5 +++ src/views/enterprises/index.vue | 8 ++--- src/views/system/menu/MenuForm.vue | 25 ++++++++++++++ src/views/task/create.vue | 51 +++++++--------------------- src/views/task/detail.vue | 48 ++++++++++++++++++++++++-- src/views/task/index.vue | 54 ++++++++++++------------------ 6 files changed, 115 insertions(+), 76 deletions(-) diff --git a/src/api/system/taskinfo/index.ts b/src/api/system/taskinfo/index.ts index b71e6c3..803b17c 100644 --- a/src/api/system/taskinfo/index.ts +++ b/src/api/system/taskinfo/index.ts @@ -53,4 +53,9 @@ export const TaskInfoApi = { taskExec: async (data) => { return await request.put({ url: `/system/task-info/taskExec`, data }) }, + // 任务审核 + audit: async (id : number) => { + return await request.put({ url: `/system/task-info/audit?id=` + id }) + }, + } diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue index c478e67..52ceed9 100644 --- a/src/views/enterprises/index.vue +++ b/src/views/enterprises/index.vue @@ -46,9 +46,9 @@ /> - + - + { return /^(https?:|mailto:|tel:)/.test(path) } + diff --git a/src/views/task/create.vue b/src/views/task/create.vue index fdd5576..a862978 100644 --- a/src/views/task/create.vue +++ b/src/views/task/create.vue @@ -223,19 +223,8 @@
- {{btnTitle}} - - 审核通过 - 删除任务? - 结束任务? - + {{btnTitle}} + 删除任务? 返回列表
@@ -321,22 +310,15 @@ const goBack = () => { router.go(-1); // 或 router.back() }; -const handleDeleteTask = async (type: string) => { +const handleDeleteTask = async () => { try { - if (type == 'delete') { - await message.delConfirm("是否确定删除任务!", "删除任务") - await TaskInfoApi.deleteTaskInfo(formData.value.id) - - } else { - await message.delConfirm("是否确定结束任务", "结束任务") - formData.value.status = 3 - await TaskInfoApi.updateTaskInfo(formData.value) - - } - + await message.delConfirm("是否确定删除任务!", "删除任务") + await TaskInfoApi.deleteTaskInfo(formData.value.id) } finally { - + message.success('操作成功') + tagView.delView(route) + router.go(-1) } @@ -539,19 +521,14 @@ function uniqueFunc(arr, uniId) { /** * 提交表单 */ -async function submitForm(isAudit) { +async function submitForm() { let title:any = '' let content:any = '' if (formData.value.id) { - if (isAudit) { - title = '审核任务' - content = '是否确定审核任务？' - } else{ - title = '修改任务' - content = '是否确定修改任务？' - } + title = '修改任务' + content = '是否确定修改任务？' } else { title = '发布任务' content = '是否确定发布新的任务？' @@ -579,9 +556,6 @@ async function submitForm(isAudit) { data.enterpriseIds = enterprise.value.list.map(i=>i.id) if (data.id) { - if (isAudit) { - data.status = 1 - } TaskInfoApi.updateTaskInfo(data).then(() => { message.success('操作成功') tagView.delView(route) @@ -736,13 +710,14 @@ onMounted(() => { .box { display: flex; - gap: 20px; + gap: 40px; div { // background-color: rgb(206, 175, 175); flex: 1; display: flex; flex-direction: column; gap: 20px; + column-gap: 7px; justify-items: center; .btn { display: flex; diff --git a/src/views/task/detail.vue b/src/views/task/detail.vue index 0533e23..1aef0e8 100644 --- a/src/views/task/detail.vue +++ b/src/views/task/detail.vue @@ -77,7 +77,7 @@ 查询 - + 重置 @@ -164,6 +164,19 @@ +
+ + 审核通过 + 结束任务? + 返回列表 +
@@ -177,6 +190,7 @@ import { TaskInfoApi } from '@/api/system/taskinfo' import CreateEnterprise from './createEnterprise.vue' import { cloneDeep } from 'lodash-es'; import { getSimpleUserZGList } from '@/api/system/user' +import { useTagsViewStore } from '@/store/modules/tagsView' defineOptions({ name: 'CreateTask'}) const formData:any = ref({ @@ -201,7 +215,12 @@ const formData:any = ref({ enterprises: [] as any }) +const tagView = useTagsViewStore() const formCreateRef = ref() +const message = useMessage() +const router = useRouter() +const route = useRoute() + const { query } = useRoute() const enterprise:any = ref({ list: [] as any, @@ -220,6 +239,30 @@ const enterprise:any = ref({ total: ref(0) as any }) +const handleDeleteTask = async (type: string) => { + try { + await message.delConfirm("是否确定结束任务", "结束任务") + formData.value.status = 3 + await TaskInfoApi.updateTaskInfo(formData.value) + } finally { + message.success('操作成功') + tagView.delView(route) + router.go(-1) + } + +} + +const auditForm = () => { + TaskInfoApi.audit(query.id).then(() => { + message.success('操作成功') + tagView.delView(route) + router.go(-1) + }) +} + +const goBack = () => { + router.go(-1); // 或 router.back() +} //分页 @@ -518,13 +561,14 @@ onMounted(() => { .box { display: flex; - gap: 20px; + gap: 40px; div { // background-color: rgb(206, 175, 175); flex: 1; display: flex; flex-direction: column; gap: 20px; + column-gap: 7px; justify-items: center; .btn { display: flex; diff --git a/src/views/task/index.vue b/src/views/task/index.vue index 7a03f2c..7aafbe7 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -66,7 +66,7 @@ 新增 - - + + - - + + - + - +