根因: - Bug #请修复 Bug #591 存在的问题 修复: - ### 变更摘要 - 全链路数据流分析**:录取(弹窗输入)→ 保存(API传入)→ 查询(Mapper返回)→ 修改(Service记录)→ 删除/停止(状态变更)→ 关联(列表展示) - ### 后端变更(4个文件) - 1. `AdviceBatchOpParam.java`** — 停嘱参数添加 `stopTime` 字段 - 新增 `@JsonFormat Date stopTime`,支持前端传入停嘱时间 - 2. `RequestBaseDto.java`** — 查询DTO添加 `stopUserName`、`stopTime` 字段 - 新增 `String stopUserName`(停嘱医生姓名) - 新增 `Date stopTime`(停嘱时间) - 3. `AdviceManageAppServiceImpl.java`** — 停嘱Service增强 - 优先使用前端传入的 `stopTime`,兜底用当前时间 - 通过 `SecurityUtils.getNickName()` 获取当前操作用户昵称,记录到 `updateBy` - 药品和诊疗两个更新入口均已同步修改 - 4. `AdviceManageAppMapper.xml`** — 三个UNION ALL子查询添加字段 - 药品子查询:`T1.effective_dose_end AS stop_time` + `T1.update_by AS stop_user_name` - 耗材子查询:`NULL AS stop_time` + `'' AS stop_user_name` - 诊疗子查询:`T1.occurrence_end_time AS stop_time` + `T1.update_by AS stop_user_name` - ### 前端变更(1个文件) - `order/index.vue`**: - 1. **停嘱时间弹窗** — 点击「停嘱」后弹出 `el-dialog`,内含 `el-date-picker`(datetime类型,默认当前时间),确定后才调用API - 2. **表格列** — 在「皮试」列后面、「诊断」列前面新增两列: - 「停嘱医生」`prop="stopUserName"`,宽度120px - 「停嘱时间」`prop="stopTime"`,宽度170px - 3. **`handleStopAdvice`** — 保留原有校验(未保存/未签发/已停止检查),校验通过后弹出时间选择弹窗而非直接调API - 4. **`confirmStopAdvice`** — 新增确认函数,将 `stopTime` 拼入请求参数后调用 `stopAdvice` API - ### 验证结果 - ✅ 前端 Lint 检查通过(仅1个预存的 `vue/no-dupe-keys` 警告) - ✅ 后端 Maven 编译通过(BUILD SUCCESS)
313 lines
8.9 KiB
Vue
Executable File
313 lines
8.9 KiB
Vue
Executable File
<template>
|
|
<el-menu
|
|
:default-active="activeMenu"
|
|
mode="horizontal"
|
|
:ellipsis="false"
|
|
@select="handleSelect"
|
|
>
|
|
<template v-for="(item, index) in topMenus">
|
|
<!-- 处理有子菜单的情况 -->
|
|
<template v-if="item.children && item.children.length > 0 && index < visibleNumber">
|
|
<el-sub-menu
|
|
:key="index"
|
|
:style="{'--theme': theme}"
|
|
:index="item.path"
|
|
>
|
|
<template #title>
|
|
<svg-icon
|
|
v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
|
|
:icon-class="item.meta.icon"
|
|
/>
|
|
{{ item.meta.title }}
|
|
</template>
|
|
<template
|
|
v-for="(child, childIndex) in item.children"
|
|
:key="childIndex"
|
|
>
|
|
<el-menu-item :index="item.path + '/' + (child.path || '')">
|
|
{{ child.meta.title }}
|
|
</el-menu-item>
|
|
</template>
|
|
</el-sub-menu>
|
|
</template>
|
|
<!-- 处理无子菜单的情况 -->
|
|
<template v-else-if="index < visibleNumber">
|
|
<el-menu-item
|
|
:key="index"
|
|
:style="{'--theme': theme}"
|
|
:index="item.path"
|
|
>
|
|
<svg-icon
|
|
v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
|
|
:icon-class="item.meta.icon"
|
|
/>
|
|
{{ item.meta.title }}
|
|
</el-menu-item>
|
|
</template>
|
|
</template>
|
|
|
|
<!-- 顶部菜单超出数量折叠 -->
|
|
<el-sub-menu
|
|
v-if="topMenus.length > visibleNumber"
|
|
:style="{'--theme': theme}"
|
|
index="more"
|
|
>
|
|
<template #title>
|
|
更多菜单
|
|
</template>
|
|
<template
|
|
v-for="(item, index) in topMenus"
|
|
:key="index"
|
|
>
|
|
<!-- 处理有子菜单的情况 -->
|
|
<template v-if="item.children && item.children.length > 0 && index >= visibleNumber">
|
|
<el-sub-menu :index="item.path">
|
|
<template #title>
|
|
<svg-icon
|
|
v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
|
|
:icon-class="item.meta.icon"
|
|
/>
|
|
{{ item.meta.title }}
|
|
</template>
|
|
<template
|
|
v-for="(child, childIndex) in item.children"
|
|
:key="childIndex"
|
|
>
|
|
<el-menu-item :index="item.path + '/' + (child.path || '')">
|
|
{{ child.meta.title }}
|
|
</el-menu-item>
|
|
</template>
|
|
</el-sub-menu>
|
|
</template>
|
|
<!-- 处理无子菜单的情况 -->
|
|
<template v-else-if="index >= visibleNumber">
|
|
<el-menu-item :index="item.path">
|
|
<svg-icon
|
|
v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
|
|
:icon-class="item.meta.icon"
|
|
/>
|
|
{{ item.meta.title }}
|
|
</el-menu-item>
|
|
</template>
|
|
</template>
|
|
</el-sub-menu>
|
|
</el-menu>
|
|
</template>
|
|
|
|
<script setup>
|
|
import {constantRoutes} from "@/router"
|
|
import {isHttp} from '@/utils/validate'
|
|
import useAppStore from '@/store/modules/app'
|
|
import useSettingsStore from '@/store/modules/settings'
|
|
import usePermissionStore from '@/store/modules/permission'
|
|
|
|
// 顶部栏初始数
|
|
const visibleNumber = ref(null);
|
|
// 当前激活菜单的 index
|
|
const currentIndex = ref(null);
|
|
// 隐藏侧边栏路由
|
|
const hideList = ['/index', '/user/profile'];
|
|
|
|
const appStore = useAppStore()
|
|
const settingsStore = useSettingsStore()
|
|
const permissionStore = usePermissionStore()
|
|
const route = useRoute();
|
|
const router = useRouter();
|
|
|
|
// 主题颜色
|
|
const theme = computed(() => settingsStore.theme);
|
|
// 所有的路由信息
|
|
const routers = computed(() => permissionStore.topbarRouters);
|
|
|
|
// 顶部显示菜单
|
|
const topMenus = computed(() => {
|
|
let topMenus = [];
|
|
routers.value.map((menu) => {
|
|
if (menu.hidden !== true) {
|
|
// 兼容顶部栏一级菜单内部跳转
|
|
if (menu.path === "/") {
|
|
topMenus.push(menu.children[0]);
|
|
} else {
|
|
topMenus.push(menu);
|
|
}
|
|
}
|
|
})
|
|
return topMenus;
|
|
})
|
|
|
|
// 设置子路由
|
|
const childrenMenus = computed(() => {
|
|
let childrenMenus = [];
|
|
routers.value.map((router) => {
|
|
for (let item in router.children) {
|
|
if (router.children[item].parentPath === undefined) {
|
|
if(router.path === "/") {
|
|
router.children[item].path = "/" + router.children[item].path;
|
|
} else {
|
|
if(!isHttp(router.children[item].path)) {
|
|
router.children[item].path = router.path + "/" + router.children[item].path;
|
|
}
|
|
}
|
|
router.children[item].parentPath = router.path;
|
|
}
|
|
childrenMenus.push(router.children[item]);
|
|
}
|
|
})
|
|
return constantRoutes.concat(childrenMenus);
|
|
})
|
|
|
|
// 默认激活的菜单
|
|
const activeMenu = computed(() => {
|
|
const path = route.path;
|
|
let activePath = path;
|
|
if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
|
|
const tmpPath = path.substring(1, path.length);
|
|
activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
|
|
if (!route.meta.link) {
|
|
appStore.toggleSideBarHide(false);
|
|
}
|
|
} else if(!route.children) {
|
|
activePath = path;
|
|
appStore.toggleSideBarHide(true);
|
|
}
|
|
|
|
// 检查当前路径是否是子菜单路径
|
|
let isChildRoute = false;
|
|
for (const item of routers.value) {
|
|
if (item.children && item.children.length > 0) {
|
|
const childRoute = item.children.find(child => (item.path + '/' + (child.path || '')) === path);
|
|
if (childRoute) {
|
|
isChildRoute = true;
|
|
activePath = item.path; // 激活父菜单
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
activeRoutes(activePath);
|
|
return activePath;
|
|
})
|
|
|
|
function setVisibleNumber() {
|
|
const width = document.body.getBoundingClientRect().width / 3;
|
|
visibleNumber.value = parseInt(width / 85);
|
|
}
|
|
|
|
function handleSelect(key, keyPath) {
|
|
currentIndex.value = key;
|
|
const route = routers.value.find(item => item.path === key);
|
|
if (isHttp(key)) {
|
|
// http(s):// 路径新窗口打开
|
|
window.open(key, "_blank");
|
|
} else {
|
|
// 检查是否是子菜单路径
|
|
let isChildRoute = false;
|
|
let parentRoute = null;
|
|
|
|
// 查找父路由
|
|
for (const item of routers.value) {
|
|
if (item.children && item.children.length > 0) {
|
|
const childRoute = item.children.find(child => (item.path + '/' + (child.path || '')) === key);
|
|
if (childRoute) {
|
|
isChildRoute = true;
|
|
parentRoute = item;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (isChildRoute) {
|
|
// 处理子菜单路径
|
|
router.push({ path: key });
|
|
appStore.toggleSideBarHide(true);
|
|
} else if (!route || !route.children) {
|
|
// 没有子路由路径内部打开
|
|
const routeMenu = childrenMenus.value.find(item => item.path === key);
|
|
if (routeMenu && routeMenu.query) {
|
|
let query = JSON.parse(routeMenu.query);
|
|
router.push({ path: key, query: query });
|
|
} else {
|
|
router.push({ path: key });
|
|
}
|
|
appStore.toggleSideBarHide(true);
|
|
} else {
|
|
// 显示左侧联动菜单
|
|
activeRoutes(key);
|
|
appStore.toggleSideBarHide(false);
|
|
}
|
|
}
|
|
}
|
|
|
|
function activeRoutes(key) {
|
|
let routes = [];
|
|
if (childrenMenus.value && childrenMenus.value.length > 0) {
|
|
childrenMenus.value.map((item) => {
|
|
if (key == item.parentPath || (key == "index" && "" == item.path)) {
|
|
routes.push(item);
|
|
}
|
|
});
|
|
}
|
|
if(routes.length > 0) {
|
|
permissionStore.setSidebarRouters(routes);
|
|
} else {
|
|
appStore.toggleSideBarHide(true);
|
|
}
|
|
return routes;
|
|
}
|
|
|
|
onMounted(() => {
|
|
window.addEventListener('resize', setVisibleNumber)
|
|
})
|
|
onBeforeUnmount(() => {
|
|
window.removeEventListener('resize', setVisibleNumber)
|
|
})
|
|
|
|
onMounted(() => {
|
|
setVisibleNumber()
|
|
})
|
|
</script>
|
|
|
|
<style lang="scss">
|
|
.topmenu-container.el-menu--horizontal > .el-menu-item {
|
|
float: left;
|
|
height: 50px !important;
|
|
line-height: 50px !important;
|
|
color: #999093 !important;
|
|
padding: 0 5px !important;
|
|
margin: 0 10px !important;
|
|
}
|
|
|
|
.topmenu-container.el-menu--horizontal > .el-menu-item.is-active, .el-menu--horizontal > .el-sub-menu.is-active .el-submenu__title {
|
|
border-bottom: 2px solid #{'var(--theme)'} !important;
|
|
color: #303133;
|
|
}
|
|
|
|
/* sub-menu item */
|
|
.topmenu-container.el-menu--horizontal > .el-sub-menu .el-sub-menu__title {
|
|
float: left;
|
|
height: 50px !important;
|
|
line-height: 50px !important;
|
|
color: #999093 !important;
|
|
padding: 0 5px !important;
|
|
margin: 0 10px !important;
|
|
}
|
|
|
|
/* 背景色隐藏 */
|
|
.topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .topmenu-container.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
|
|
background-color: #ffffff !important;
|
|
}
|
|
|
|
/* 图标右间距 */
|
|
.topmenu-container .svg-icon {
|
|
margin-right: 4px;
|
|
}
|
|
|
|
/* topmenu more arrow */
|
|
.topmenu-container .el-sub-menu .el-sub-menu__icon-arrow {
|
|
position: static;
|
|
vertical-align: middle;
|
|
margin-left: 8px;
|
|
margin-top: 0px;
|
|
}
|
|
</style>
|