diff --git a/src/api/inspect/exammodule/index.ts b/src/api/inspect/exammodule/index.ts index c0a6f87..35b68d1 100644 --- a/src/api/inspect/exammodule/index.ts +++ b/src/api/inspect/exammodule/index.ts @@ -20,11 +20,21 @@ export const ExammoduleApi = { return await request.get({ url: `/inspect/exammodule/get?id=` + id }) }, + //所有体检套餐 + getListExammodule: async () => { + return await request.get({ url: `/inspect/exammodule/getList` }) + }, + // 新增体检套餐 createExammodule: async (data: ExammoduleVO) => { return await request.post({ url: `/inspect/exammodule/create`, data }) }, + //新增体检套餐和项目 + ListcreateExammodule: async (data: any) => { + return await request.post({ url: `/inspect/exammodule/Listcreate`, data }) + }, + // 修改体检套餐 updateExammodule: async (data: ExammoduleVO) => { return await request.put({ url: `/inspect/exammodule/update`, data }) @@ -35,6 +45,13 @@ export const ExammoduleApi = { return await request.delete({ url: `/inspect/exammodule/delete?id=` + id }) }, + // 按照套餐项目ID和套餐ID删除体检套餐项目 + deleteExammoduleitemcode: async (params: { itemCode: string, examModuleID: number }) => { + return await request.delete({ + url: `/inspect/exammodule/deleteitemcode?itemCode=${params.itemCode}&examModuleID=${params.examModuleID}` + }) + }, + // 导出体检套餐 Excel exportExammodule: async (params) => { return await request.download({ url: `/inspect/exammodule/export-excel`, params }) diff --git a/src/views/project-management/base/baseUI.vue b/src/views/project-management/base/baseUI.vue index 72bddff..726316d 100644 --- a/src/views/project-management/base/baseUI.vue +++ b/src/views/project-management/base/baseUI.vue @@ -20,10 +20,10 @@ - + - + 搜索 @@ -57,9 +57,13 @@ - - - + + + + + @@ -75,7 +79,7 @@ @@ -104,7 +108,7 @@ diff --git a/src/views/project-management/exam-package/new.vue b/src/views/project-management/exam-package/new.vue index 716fc8d..b5d6589 100644 --- a/src/views/project-management/exam-package/new.vue +++ b/src/views/project-management/exam-package/new.vue @@ -55,7 +55,6 @@ const formData = reactive({ packageName: '', examModuleName: '', examModuleID: 0, - itemCode: '' }) const handlePackageCodeInput = (value) => { @@ -75,22 +74,6 @@ const rules = { } }, trigger: 'blur' - }, - { - validator: async (rule, value, callback) => { - if (!value) return callback() - const result = await ExammoduleApi.createExammodule({ - examModuleName: formData.packageName, - examModuleID: Number(value), - itemCode: value, - }) - if (result === 999) { - callback(new Error('套餐编号已存在')) - } else { - callback() - } - }, - trigger: 'blur' } ], packageName: [{ required: true, message: '请输入套餐名称', trigger: 'blur' }] @@ -116,6 +99,18 @@ const handleSubmit = async () => { if (!newPackageRef.value) return try { await newPackageRef.value.validate() + + // 在表单验证通过后检查套餐编号是否存在 + const result = await ExammoduleApi.createExammodule({ + examModuleName: formData.packageName, + examModuleID: Number(formData.packageCode), + }) + + if (result === 999) { + ElMessage.error('套餐编号已存在') + return + } + ElMessage.success('新增套餐成功') visible.value = false emit('refresh-list')