diff --git a/yudao-admin-vue3/src/api/subscribe/reservation/index.ts b/yudao-admin-vue3/src/api/subscribe/reservation/index.ts index 692116b..2682571 100644 --- a/yudao-admin-vue3/src/api/subscribe/reservation/index.ts +++ b/yudao-admin-vue3/src/api/subscribe/reservation/index.ts @@ -55,5 +55,10 @@ export const LitemallReservationApi = { // 导出预约订单 Excel exportLitemallReservation: async (params) => { return await request.download({ url: `/subscribe/litemall-reservation/export-excel`, params }) - } + }, + + // 删除预约订单 + checkLitemallReservation: async (id: number,check: number) => { + return await request.get({ url: `/subscribe/litemall-reservation/check?id=` + id + `&check=` + check }) + }, } diff --git a/yudao-admin-vue3/src/utils/dict.ts b/yudao-admin-vue3/src/utils/dict.ts index e29a241..b9a46ee 100644 --- a/yudao-admin-vue3/src/utils/dict.ts +++ b/yudao-admin-vue3/src/utils/dict.ts @@ -127,6 +127,8 @@ export enum DICT_TYPE { //预约:项目 SUBSCRIBE_PROJECT_STATUS = 'subscribe_project_status', + SUBSCRIBE_RESERVATION_STATUS = 'subscribe_reservation_status', + //预约:配置 SUBSCRIBE_CONFIGURATION_STATUS = 'subscribe_configuration_status', diff --git a/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue b/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue index 21138f7..1371975 100644 --- a/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue +++ b/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue @@ -33,10 +33,11 @@ /> - + @@ -106,8 +107,8 @@ defineExpose({ open }) // 提供 open 方法,用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { - console.log('11111111111',formData.value.timeInterval) - formData.value.timeInterval = JSON.stringify(formData.value.timeInterval); + console.log('11111111111',JSON.stringify(formData.value.timeInterval)) + formData.value.timeInterval = JSON.stringify(formData.value.timeInterval); // 校验表单 await formRef.value.validate() // 提交请求 diff --git a/yudao-admin-vue3/src/views/subscribe/reservation/index.vue b/yudao-admin-vue3/src/views/subscribe/reservation/index.vue index 2ce528b..4176949 100644 --- a/yudao-admin-vue3/src/views/subscribe/reservation/index.vue +++ b/yudao-admin-vue3/src/views/subscribe/reservation/index.vue @@ -148,25 +148,26 @@ width="180px" /> --> + - - - - + + --> + + @@ -233,6 +263,7 @@ const queryParams = reactive({ technicianName: undefined, technicianId: undefined, reStatus: undefined, + status: undefined, remark: undefined, createTime: [] }) @@ -269,14 +300,28 @@ const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } -/** 删除按钮操作 */ -const handleDelete = async (id: number) => { +/** 审核通过按钮操作 */ +const handleTonguo = async (id: number) => { + + const check = 1; try { - // 删除的二次确认 - await message.delConfirm() + // 发起删除 - await LitemallReservationApi.deleteLitemallReservation(id) - message.success(t('common.delSuccess')) + await LitemallReservationApi.checkLitemallReservation(id,check) + message.success(t('审核成功')) + // 刷新列表 + await getList() + } catch {} +} + +/** 审核拒绝按钮操作 */ +const handleJujue = async (id: number) => { + + const check = 0; + try { + + await LitemallReservationApi.checkLitemallReservation(id,check) + message.success(t('审核成功')) // 刷新列表 await getList() } catch {} diff --git a/yudao-admin-vue3/src/views/subscribe/technician/index.vue b/yudao-admin-vue3/src/views/subscribe/technician/index.vue index 3c19e22..a4e43bf 100644 --- a/yudao-admin-vue3/src/views/subscribe/technician/index.vue +++ b/yudao-admin-vue3/src/views/subscribe/technician/index.vue @@ -69,10 +69,10 @@ - +