From bd6f3ca5871ac142611f57102983c317081327e7 Mon Sep 17 00:00:00 2001 From: qk123 <18211963828@163.com> Date: Thu, 11 Dec 2025 17:14:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E6=8E=92=E7=8F=AD=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=97=B4=E4=BA=A4=E4=BA=92=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/IDoctorScheduleAppService.java | 2 + .../impl/DoctorScheduleAppServiceImpl.java | 7 +++ .../controller/DoctorScheduleController.java | 9 ++++ .../openhis/administration/domain/Dept.java | 2 - .../administration/domain/SchedulePool.java | 1 + openhis-ui-vue3/src/router/index.js | 2 +- .../appoinmentmanage/doctorschedule/index.vue | 51 ++++++++++++++++--- .../src/views/appoinmentmanage/index.vue | 16 +++++- 8 files changed, 79 insertions(+), 11 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java index 7779a83f..d89e668c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java @@ -5,6 +5,8 @@ import com.openhis.administration.domain.DoctorSchedule; public interface IDoctorScheduleAppService { + R getDoctorScheduleList(); + R addDoctorSchedule(DoctorSchedule doctorSchedule); R removeDoctorSchedule(Integer doctorScheduleId); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java index 7e293a8c..9ee83834 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java @@ -8,6 +8,7 @@ import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; @Service public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService { @@ -15,6 +16,12 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService { private IDoctorScheduleService doctorScheduleService; + @Override + public R getDoctorScheduleList() { + List list = doctorScheduleService.list(); + return R.ok(list); + } + @Override public R addDoctorSchedule(DoctorSchedule doctorSchedule) { if (ObjectUtil.isEmpty(doctorSchedule)) { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java index eb6cf4e8..250dc9cf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java @@ -14,6 +14,15 @@ public class DoctorScheduleController { @Resource private IDoctorScheduleAppService doctorScheduleAppService; + /* + * 获取医生排班List + * + * */ + @PostMapping("/add") + public R getDoctorScheduleList() { + return R.ok(doctorScheduleAppService.getDoctorScheduleList()); + } + /* * 新增医生排班 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java index 739ef4f8..3de4ab15 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java @@ -40,6 +40,4 @@ public class Dept { /** 更新时间 */ private LocalDateTime updateTime; - /** 关联的排班列表（一对多关系） */ - private List schedules; } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java index 4676dbfe..607ced3a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SchedulePool.java @@ -28,6 +28,7 @@ public class SchedulePool { /** 结束时间 */ private LocalTime endTime; + /**/ private Integer totalQuota; private Integer bookedNum; private Integer lockedNum; diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js index 160098e7..ab70b68c 100644 --- a/openhis-ui-vue3/src/router/index.js +++ b/openhis-ui-vue3/src/router/index.js @@ -26,7 +26,7 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [ - { path: '/appoinmentmanage', component: Layout, redirect: '/appoinmentmanage', name: 'AppoinmentManage', hidden: true, meta: { title: '预约管理', icon: 'component' }, children: [{ path: '', component: () => import('@/views/appoinmentmanage/index.vue'), name: 'AppoinmentManageIndex', meta: { title: '预约管理' } }] }, + { path: '/appoinmentmanage', component: Layout, redirect: '/appoinmentmanage', name: 'AppoinmentManage', hidden: true, meta: { title: '预约管理', icon: 'component' }, children: [{ path: '', component: () => import('@/views/appoinmentmanage/index.vue'), name: 'AppoinmentManageIndex', meta: { title: '预约管理' } }, { path: 'doctorschedule/:deptId', component: () => import('@/views/appoinmentmanage/doctorschedule/index.vue'), name: 'DoctorSchedule', hidden: true, meta: { title: '医生排班' } }] }, { path: '/redirect', component: Layout, diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue index 35fea579..8245cfa9 100644 --- a/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue +++ b/openhis-ui-vue3/src/views/appoinmentmanage/doctorschedule/index.vue @@ -128,7 +128,9 @@ class="inline-select" :disabled="!isEditMode" > - + + + @@ -148,9 +150,9 @@ @@ -370,6 +372,8 @@ onMounted(() => { .schedule-table-container { margin-bottom: 20px; + width: 100%; + overflow-x: auto; } .daily-schedule { @@ -377,6 +381,7 @@ onMounted(() => { border: 1px solid #ebeef5; border-radius: 4px; overflow: hidden; + width: 100%; } .daily-header { @@ -400,14 +405,48 @@ onMounted(() => { } .schedule-table { + width: 100% !important; + min-width: 100% !important; + + :deep(.el-table__header-wrapper) { + width: 100% !important; + border-top: none; + } + + :deep(.el-table__body-wrapper) { + width: 100% !important; + } + :deep(.el-table__header-wrapper th.el-table__cell), :deep(.el-table__body-wrapper td.el-table__cell) { text-align: center; + padding: 8px 0; } - /* 隐藏表格头部的边框线，与日期标题融合 */ - :deep(.el-table__header-wrapper) { - border-top: none; + /* 确保表格容器填满 */ + :deep(.el-table__inner-wrapper) { + width: 100% !important; + } + + /* 确保表格本身填满 */ + :deep(.el-table__body) { + width: 100% !important; + } + + /* 确保表格列正确分配宽度 */ + :deep(.el-table__header) { + width: 100% !important; + } + + :deep(.el-table__header tr), + :deep(.el-table__body tr) { + width: 100% !important; + } + + /* 确保表格容器的最小宽度与内容匹配 */ + :deep(.el-table) { + width: 100% !important; + min-width: 100% !important; } } diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue index 84acf0c7..cf5e6c9d 100644 --- a/openhis-ui-vue3/src/views/appoinmentmanage/index.vue +++ b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue @@ -124,6 +124,7 @@