diff --git a/yudao-admin-vue3/src/api/subscribe/configuration/index.ts b/yudao-admin-vue3/src/api/subscribe/configuration/index.ts new file mode 100644 index 0000000..fc3d3e1 --- /dev/null +++ b/yudao-admin-vue3/src/api/subscribe/configuration/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +// 预约配置 VO +export interface ConfigurationVO { + id: number // id + projectdayId: number + serviceTime: string + technicianId: number // 套餐id + technicianName: string + timeQuantum: string // 时间段 + availableNumber: number // 可预约数 + residueNumber: number // 剩余预约数 + status: number // 状态 +} + +// 预约配置 API +export const ConfigurationApi = { + // 查询预约配置分页 + getConfigurationPage: async (params: any) => { + return await request.get({ url: `/subscribe/configuration/page`, params }) + }, + + // 查询预约配置详情 + getConfiguration: async (id: number) => { + return await request.get({ url: `/subscribe/configuration/get?id=` + id }) + }, + + // 新增预约配置 + createConfiguration: async (data: ConfigurationVO) => { + return await request.post({ url: `/subscribe/configuration/create`, data }) + }, + + // 修改预约配置 + updateConfiguration: async (data: ConfigurationVO) => { + return await request.put({ url: `/subscribe/configuration/update`, data }) + }, + + // 删除预约配置 + deleteConfiguration: async (id: number) => { + return await request.delete({ url: `/subscribe/configuration/delete?id=` + id }) + }, + + // 导出预约配置 Excel + exportConfiguration: async (params) => { + return await request.download({ url: `/subscribe/configuration/export-excel`, params }) + }, + + // addUpdConfiguration: async (projectdayId: number,technicianId: number,serviceTimes: string) => { + // return await request.post({ url: `/subscribe/configuration/addUpdConfiguration?projectdayId=`+projectdayId+`&technicianId=`+technicianId+`&serviceTimes=`+serviceTimes }) + // }, + + + addUpdConfiguration: async (data: ConfigurationVO) => { + return await request.post({ url: `/subscribe/configuration/addUpdConfiguration`, data }) + }, +} \ No newline at end of file diff --git a/yudao-admin-vue3/src/api/subscribe/project/index.ts b/yudao-admin-vue3/src/api/subscribe/project/index.ts index 99e91f7..f4dcfb8 100644 --- a/yudao-admin-vue3/src/api/subscribe/project/index.ts +++ b/yudao-admin-vue3/src/api/subscribe/project/index.ts @@ -4,6 +4,7 @@ import request from '@/config/axios' export interface ProjectVO { id: number // ID brandId: number // 所属门店 + yuyueNum: number //可预约数量 name: string // 项目名称 pictrue: string // 项目图片 content: string // 项目简介 @@ -48,4 +49,15 @@ export const ProjectApi = { return await request.get({ url: `/subscribe/project/getProjectName` }) }, + getProjectDay: async (id: number) => { + return await request.get({ url: `/subscribe/project/getProjectDay?id=` + id }) + }, + + getConfiguration: async (id: number) => { + return await request.get({ url: `/subscribe/configuration/getConfiguration?id=` + id }) + }, + + + + } \ No newline at end of file diff --git a/yudao-admin-vue3/src/api/subscribe/reservation/index.ts b/yudao-admin-vue3/src/api/subscribe/reservation/index.ts index 3a6e6e0..692116b 100644 --- a/yudao-admin-vue3/src/api/subscribe/reservation/index.ts +++ b/yudao-admin-vue3/src/api/subscribe/reservation/index.ts @@ -5,13 +5,21 @@ export interface LitemallReservationVO { id: number // id userId: number // 用户id nickname: string - type: number // 预约类型 + // type: number // 预约类型 brandId: string // 门店id - brandName: string technicianId: string // 人员id + + name: string + phone: string + brandName: string + porjectName: string technicianName: string - reAddTime: Date // 预约时间 - hsstr: string // 预约时间段 + days: string + timeQuantum: string + + + // reAddTime: Date // 预约时间 + // hsstr: string // 预约时间段 reStatus: number // 预约状态 status: number // 审核状态 remark: string // 备注 diff --git a/yudao-admin-vue3/src/api/subscribe/technician/index.ts b/yudao-admin-vue3/src/api/subscribe/technician/index.ts index 2c042ca..dcc3add 100644 --- a/yudao-admin-vue3/src/api/subscribe/technician/index.ts +++ b/yudao-admin-vue3/src/api/subscribe/technician/index.ts @@ -2,7 +2,8 @@ import request from '@/config/axios' // 人员管理 VO export interface LitemallTechnicianVO { - id: number // id + id: number // idd + name: string projectId: number // 项目id brandName: string //项目名称 photo: string // 照片 diff --git a/yudao-admin-vue3/src/utils/dict.ts b/yudao-admin-vue3/src/utils/dict.ts index bd50525..e29a241 100644 --- a/yudao-admin-vue3/src/utils/dict.ts +++ b/yudao-admin-vue3/src/utils/dict.ts @@ -126,6 +126,9 @@ export enum DICT_TYPE { //预约：项目 SUBSCRIBE_PROJECT_STATUS = 'subscribe_project_status', + + //预约：配置 + SUBSCRIBE_CONFIGURATION_STATUS = 'subscribe_configuration_status', //预约：人员管理 STALL_SEX = 'stall_sex', diff --git a/yudao-admin-vue3/src/views/subscribe/brand/index.vue b/yudao-admin-vue3/src/views/subscribe/brand/index.vue index f000a3f..84aaf00 100644 --- a/yudao-admin-vue3/src/views/subscribe/brand/index.vue +++ b/yudao-admin-vue3/src/views/subscribe/brand/index.vue @@ -1,292 +1,209 @@ + /** 初始化 **/ + onMounted(() => { + getList() + }) + \ No newline at end of file diff --git a/yudao-admin-vue3/src/views/subscribe/configuration/ConfigurationForm.vue b/yudao-admin-vue3/src/views/subscribe/configuration/ConfigurationForm.vue new file mode 100644 index 0000000..9480f09 --- /dev/null +++ b/yudao-admin-vue3/src/views/subscribe/configuration/ConfigurationForm.vue @@ -0,0 +1,121 @@ + + \ No newline at end of file diff --git a/yudao-admin-vue3/src/views/subscribe/configuration/index.vue b/yudao-admin-vue3/src/views/subscribe/configuration/index.vue new file mode 100644 index 0000000..e2e5de4 --- /dev/null +++ b/yudao-admin-vue3/src/views/subscribe/configuration/index.vue @@ -0,0 +1,242 @@ + + + \ No newline at end of file diff --git a/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue b/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue index 3204d9e..21138f7 100644 --- a/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue +++ b/yudao-admin-vue3/src/views/subscribe/project/ProjectForm.vue @@ -34,7 +34,6 @@ - { try { formData.value = await ProjectApi.getProject(id) formData.value.timeInterval = JSON.parse(formData.value.timeInterval) - console.log('11111111111',formData.value) + } finally { formLoading.value = false } @@ -107,6 +106,7 @@ 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); // 校验表单 await formRef.value.validate() diff --git a/yudao-admin-vue3/src/views/subscribe/project/index.vue b/yudao-admin-vue3/src/views/subscribe/project/index.vue index 156bb26..815ad44 100644 --- a/yudao-admin-vue3/src/views/subscribe/project/index.vue +++ b/yudao-admin-vue3/src/views/subscribe/project/index.vue @@ -49,10 +49,10 @@ - + - +