根因: - 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)
187 lines
3.8 KiB
Vue
Executable File
187 lines
3.8 KiB
Vue
Executable File
<template>
|
||
<div
|
||
class="top-right-btn"
|
||
:style="style"
|
||
>
|
||
<el-row>
|
||
<el-tooltip
|
||
v-if="search"
|
||
class="item"
|
||
effect="dark"
|
||
:content="showSearch ? '隐藏搜索' : '显示搜索'"
|
||
placement="top"
|
||
>
|
||
<el-button
|
||
circle
|
||
icon="Search"
|
||
@click="toggleSearch()"
|
||
/>
|
||
</el-tooltip>
|
||
<el-tooltip
|
||
class="item"
|
||
effect="dark"
|
||
content="刷新"
|
||
placement="top"
|
||
>
|
||
<el-button
|
||
circle
|
||
icon="Refresh"
|
||
@click="refresh()"
|
||
/>
|
||
</el-tooltip>
|
||
<el-tooltip
|
||
v-if="columns"
|
||
class="item"
|
||
effect="dark"
|
||
content="显隐列"
|
||
placement="top"
|
||
>
|
||
<el-button
|
||
v-if="showColumnsType == 'transfer'"
|
||
circle
|
||
icon="Menu"
|
||
@click="showColumn()"
|
||
/>
|
||
<el-dropdown
|
||
v-if="showColumnsType == 'checkbox'"
|
||
trigger="click"
|
||
:hide-on-click="false"
|
||
style="padding-left: 12px"
|
||
>
|
||
<el-button
|
||
circle
|
||
icon="Menu"
|
||
/>
|
||
<template #dropdown>
|
||
<el-dropdown-menu>
|
||
<template
|
||
v-for="item in columns"
|
||
:key="item.key"
|
||
>
|
||
<el-dropdown-item>
|
||
<el-checkbox
|
||
:checked="item.visible"
|
||
:label="item.label"
|
||
@change="checkboxChange($event, item.label)"
|
||
/>
|
||
</el-dropdown-item>
|
||
</template>
|
||
</el-dropdown-menu>
|
||
</template>
|
||
</el-dropdown>
|
||
</el-tooltip>
|
||
</el-row>
|
||
<el-dialog
|
||
v-model="open"
|
||
:title="title"
|
||
append-to-body
|
||
>
|
||
<el-transfer
|
||
v-model="value"
|
||
:titles="['显示', '隐藏']"
|
||
:data="columns"
|
||
@change="dataChange"
|
||
/>
|
||
</el-dialog>
|
||
</div>
|
||
</template>
|
||
|
||
<script setup>
|
||
const props = defineProps({
|
||
/* 是否显示检索条件 */
|
||
showSearch: {
|
||
type: Boolean,
|
||
default: true,
|
||
},
|
||
/* 显隐列信息 */
|
||
columns: {
|
||
type: Array,
|
||
},
|
||
/* 是否显示检索图标 */
|
||
search: {
|
||
type: Boolean,
|
||
default: true,
|
||
},
|
||
/* 显隐列类型(transfer穿梭框、checkbox复选框) */
|
||
showColumnsType: {
|
||
type: String,
|
||
default: "checkbox",
|
||
},
|
||
/* 右外边距 */
|
||
gutter: {
|
||
type: Number,
|
||
default: 10,
|
||
},
|
||
})
|
||
|
||
const emits = defineEmits(['update:showSearch', 'queryTable']);
|
||
|
||
// 显隐数据
|
||
const value = ref([]);
|
||
// 弹出层标题
|
||
const title = ref("显示/隐藏");
|
||
// 是否显示弹出层
|
||
const open = ref(false);
|
||
|
||
const style = computed(() => {
|
||
const ret = {};
|
||
if (props.gutter) {
|
||
ret.marginRight = `${props.gutter / 2}px`;
|
||
}
|
||
return ret;
|
||
});
|
||
|
||
// 搜索
|
||
function toggleSearch() {
|
||
emits("update:showSearch", !props.showSearch);
|
||
}
|
||
|
||
// 刷新
|
||
function refresh() {
|
||
emits("queryTable");
|
||
}
|
||
|
||
// 右侧列表元素变化
|
||
function dataChange(data) {
|
||
for (let item in props.columns) {
|
||
const key = props.columns[item].key;
|
||
props.columns[item].visible = !data.includes(key);
|
||
}
|
||
}
|
||
|
||
// 打开显隐列dialog
|
||
function showColumn() {
|
||
open.value = true;
|
||
}
|
||
|
||
if (props.showColumnsType == 'transfer') {
|
||
// 显隐列初始默认隐藏列
|
||
for (let item in props.columns) {
|
||
if (props.columns[item].visible === false) {
|
||
value.value.push(parseInt(item));
|
||
}
|
||
}
|
||
}
|
||
|
||
// 勾选
|
||
function checkboxChange(event, label) {
|
||
props.columns.filter(item => item.label == label)[0].visible = event;
|
||
}
|
||
|
||
</script>
|
||
|
||
<style lang='scss' scoped>
|
||
:deep(.el-transfer__button) {
|
||
border-radius: 50%;
|
||
display: block;
|
||
margin-left: 0px;
|
||
}
|
||
:deep(.el-transfer__button:first-child) {
|
||
margin-bottom: 10px;
|
||
}
|
||
:deep(.el-dropdown-menu__item) {
|
||
line-height: 30px;
|
||
padding: 0 17px;
|
||
}
|
||
</style>
|