根因: - 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)
286 lines
7.0 KiB
Vue
Executable File
286 lines
7.0 KiB
Vue
Executable File
<template>
|
|
<el-drawer
|
|
v-model="showSettings"
|
|
:with-header="false"
|
|
direction="rtl"
|
|
size="300px"
|
|
>
|
|
<div class="setting-drawer-title">
|
|
<h3 class="drawer-title">
|
|
主题风格设置
|
|
</h3>
|
|
</div>
|
|
<div class="setting-drawer-block-checbox">
|
|
<div
|
|
class="setting-drawer-block-checbox-item"
|
|
@click="handleTheme('theme-dark')"
|
|
>
|
|
<img
|
|
src="@/assets/images/dark.svg"
|
|
alt="dark"
|
|
>
|
|
<div
|
|
v-if="sideTheme === 'theme-dark'"
|
|
class="setting-drawer-block-checbox-selectIcon"
|
|
style="display: block;"
|
|
>
|
|
<i
|
|
aria-label="图标: check"
|
|
class="anticon anticon-check"
|
|
>
|
|
<svg
|
|
viewBox="64 64 896 896"
|
|
data-icon="check"
|
|
width="1em"
|
|
height="1em"
|
|
:fill="theme"
|
|
aria-hidden="true"
|
|
focusable="false"
|
|
class
|
|
>
|
|
<path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
|
|
</svg>
|
|
</i>
|
|
</div>
|
|
</div>
|
|
<div
|
|
class="setting-drawer-block-checbox-item"
|
|
@click="handleTheme('theme-light')"
|
|
>
|
|
<img
|
|
src="@/assets/images/light.svg"
|
|
alt="light"
|
|
>
|
|
<div
|
|
v-if="sideTheme === 'theme-light'"
|
|
class="setting-drawer-block-checbox-selectIcon"
|
|
style="display: block;"
|
|
>
|
|
<i
|
|
aria-label="图标: check"
|
|
class="anticon anticon-check"
|
|
>
|
|
<svg
|
|
viewBox="64 64 896 896"
|
|
data-icon="check"
|
|
width="1em"
|
|
height="1em"
|
|
:fill="theme"
|
|
aria-hidden="true"
|
|
focusable="false"
|
|
class
|
|
>
|
|
<path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
|
|
</svg>
|
|
</i>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="drawer-item">
|
|
<span>主题颜色</span>
|
|
<span class="comp-style">
|
|
<el-color-picker
|
|
v-model="theme"
|
|
:predefine="predefineColors"
|
|
@change="themeChange"
|
|
/>
|
|
</span>
|
|
</div>
|
|
<el-divider />
|
|
|
|
<h3 class="drawer-title">
|
|
系统布局配置
|
|
</h3>
|
|
|
|
<div class="drawer-item">
|
|
<span>开启 TopNav</span>
|
|
<span class="comp-style">
|
|
<el-switch
|
|
v-model="settingsStore.topNav"
|
|
class="drawer-switch"
|
|
@change="topNavChange"
|
|
/>
|
|
</span>
|
|
</div>
|
|
|
|
<div class="drawer-item">
|
|
<span>开启 Tags-Views</span>
|
|
<span class="comp-style">
|
|
<el-switch
|
|
v-model="settingsStore.tagsView"
|
|
class="drawer-switch"
|
|
/>
|
|
</span>
|
|
</div>
|
|
|
|
<div class="drawer-item">
|
|
<span>固定 Header</span>
|
|
<span class="comp-style">
|
|
<el-switch
|
|
v-model="settingsStore.fixedHeader"
|
|
class="drawer-switch"
|
|
/>
|
|
</span>
|
|
</div>
|
|
|
|
<div class="drawer-item">
|
|
<span>显示 Logo</span>
|
|
<span class="comp-style">
|
|
<el-switch
|
|
v-model="settingsStore.sidebarLogo"
|
|
class="drawer-switch"
|
|
/>
|
|
</span>
|
|
</div>
|
|
|
|
<div class="drawer-item">
|
|
<span>动态标题</span>
|
|
<span class="comp-style">
|
|
<el-switch
|
|
v-model="settingsStore.dynamicTitle"
|
|
class="drawer-switch"
|
|
/>
|
|
</span>
|
|
</div>
|
|
|
|
<el-divider />
|
|
|
|
<el-button
|
|
type="primary"
|
|
plain
|
|
icon="DocumentAdd"
|
|
@click="saveSetting"
|
|
>
|
|
保存配置
|
|
</el-button>
|
|
<el-button
|
|
plain
|
|
icon="Refresh"
|
|
@click="resetSetting"
|
|
>
|
|
重置配置
|
|
</el-button>
|
|
</el-drawer>
|
|
</template>
|
|
|
|
<script setup>
|
|
import useAppStore from '@/store/modules/app'
|
|
import useSettingsStore from '@/store/modules/settings'
|
|
import usePermissionStore from '@/store/modules/permission'
|
|
import {handleThemeStyle} from '@/utils/theme'
|
|
|
|
const { proxy } = getCurrentInstance();
|
|
const appStore = useAppStore()
|
|
const settingsStore = useSettingsStore()
|
|
const permissionStore = usePermissionStore()
|
|
const showSettings = ref(false);
|
|
const theme = ref(settingsStore.theme);
|
|
const sideTheme = ref(settingsStore.sideTheme);
|
|
const storeSettings = computed(() => settingsStore);
|
|
const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
|
|
|
|
/** 是否需要topnav */
|
|
function topNavChange(val) {
|
|
if (!val) {
|
|
appStore.toggleSideBarHide(false);
|
|
permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
|
|
}
|
|
}
|
|
|
|
function themeChange(val) {
|
|
settingsStore.theme = val;
|
|
handleThemeStyle(val);
|
|
}
|
|
function handleTheme(val) {
|
|
settingsStore.sideTheme = val;
|
|
sideTheme.value = val;
|
|
}
|
|
function saveSetting() {
|
|
proxy.$modal.loading("正在保存到本地,请稍候...");
|
|
let layoutSetting = {
|
|
"topNav": storeSettings.value.topNav,
|
|
"tagsView": storeSettings.value.tagsView,
|
|
"fixedHeader": storeSettings.value.fixedHeader,
|
|
"sidebarLogo": storeSettings.value.sidebarLogo,
|
|
"dynamicTitle": storeSettings.value.dynamicTitle,
|
|
"sideTheme": storeSettings.value.sideTheme,
|
|
"theme": storeSettings.value.theme
|
|
};
|
|
localStorage.setItem("layout-setting", JSON.stringify(layoutSetting));
|
|
setTimeout(proxy.$modal.closeLoading(), 1000)
|
|
}
|
|
function resetSetting() {
|
|
proxy.$modal.loading("正在清除设置缓存并刷新,请稍候...");
|
|
localStorage.removeItem("layout-setting")
|
|
setTimeout("window.location.reload()", 1000)
|
|
}
|
|
function openSetting() {
|
|
showSettings.value = true;
|
|
}
|
|
|
|
defineExpose({
|
|
openSetting,
|
|
})
|
|
</script>
|
|
|
|
<style lang='scss' scoped>
|
|
.setting-drawer-title {
|
|
margin-bottom: 12px;
|
|
color: rgba(0, 0, 0, 0.85);
|
|
line-height: 22px;
|
|
font-weight: bold;
|
|
.drawer-title {
|
|
font-size: 14px;
|
|
}
|
|
}
|
|
.setting-drawer-block-checbox {
|
|
display: flex;
|
|
justify-content: flex-start;
|
|
align-items: center;
|
|
margin-top: 10px;
|
|
margin-bottom: 20px;
|
|
|
|
.setting-drawer-block-checbox-item {
|
|
position: relative;
|
|
margin-right: 16px;
|
|
border-radius: 2px;
|
|
cursor: pointer;
|
|
|
|
img {
|
|
width: 48px;
|
|
height: 48px;
|
|
}
|
|
|
|
.custom-img {
|
|
width: 48px;
|
|
height: 38px;
|
|
border-radius: 5px;
|
|
box-shadow: 1px 1px 2px #898484;
|
|
}
|
|
|
|
.setting-drawer-block-checbox-selectIcon {
|
|
position: absolute;
|
|
top: 0;
|
|
right: 0;
|
|
width: 100%;
|
|
height: 100%;
|
|
padding-top: 15px;
|
|
padding-left: 24px;
|
|
color: #1890ff;
|
|
font-weight: 700;
|
|
font-size: 14px;
|
|
}
|
|
}
|
|
}
|
|
|
|
.drawer-item {
|
|
color: rgba(0, 0, 0, 0.65);
|
|
padding: 12px 0;
|
|
font-size: 14px;
|
|
|
|
.comp-style {
|
|
float: right;
|
|
margin: -3px 8px 0px 0px;
|
|
}
|
|
}
|
|
</style> |