根因: - 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)
236 lines
6.0 KiB
Vue
Executable File
236 lines
6.0 KiB
Vue
Executable File
<template>
|
|
<div class="upload-file">
|
|
<el-upload
|
|
multiple
|
|
ref="fileUpload"
|
|
:action="uploadFileUrl"
|
|
:before-upload="handleBeforeUpload"
|
|
:file-list="fileList"
|
|
:limit="limit"
|
|
:on-error="handleUploadError"
|
|
:on-exceed="handleExceed"
|
|
:on-success="handleUploadSuccess"
|
|
:show-file-list="false"
|
|
:headers="headers"
|
|
class="upload-file-uploader"
|
|
>
|
|
<!-- 上传按钮 -->
|
|
<el-button type="primary">
|
|
选取文件
|
|
</el-button>
|
|
</el-upload>
|
|
<!-- 上传提示 -->
|
|
<div
|
|
v-if="showTip"
|
|
class="el-upload__tip"
|
|
>
|
|
请上传
|
|
<template v-if="fileSize">
|
|
大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
|
|
</template>
|
|
<template v-if="fileType">
|
|
格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
|
|
</template>
|
|
的文件
|
|
</div>
|
|
<!-- 文件列表 -->
|
|
<transition-group
|
|
class="upload-file-list el-upload-list el-upload-list--text"
|
|
name="el-fade-in-linear"
|
|
tag="ul"
|
|
>
|
|
<li
|
|
v-for="(file, index) in fileList"
|
|
:key="file.uid"
|
|
class="el-upload-list__item ele-upload-list__item-content"
|
|
>
|
|
<el-link
|
|
:href="`${baseUrl}${file.url}`"
|
|
:underline="false"
|
|
target="_blank"
|
|
>
|
|
<span class="el-icon-document"> {{ getFileName(file.name) }} </span>
|
|
</el-link>
|
|
<div class="ele-upload-list__item-content-action">
|
|
<el-link
|
|
:underline="false"
|
|
type="danger"
|
|
@click="handleDelete(index)"
|
|
>
|
|
删除
|
|
</el-link>
|
|
</div>
|
|
</li>
|
|
</transition-group>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup>
|
|
import {computed, ref, watch} from 'vue';
|
|
import {getToken} from "@/utils/auth";
|
|
import modal from '@/plugins/modal';
|
|
|
|
const props = defineProps({
|
|
modelValue: [String, Object, Array],
|
|
// 数量限制
|
|
limit: {
|
|
type: Number,
|
|
default: 5,
|
|
},
|
|
// 大小限制(MB)
|
|
fileSize: {
|
|
type: Number,
|
|
default: 5,
|
|
},
|
|
// 文件类型, 例如['png', 'jpg', 'jpeg']
|
|
fileType: {
|
|
type: Array,
|
|
default: () => ["doc", "xls", "ppt", "txt", "pdf"],
|
|
},
|
|
// 是否显示提示
|
|
isShowTip: {
|
|
type: Boolean,
|
|
default: true
|
|
}
|
|
});
|
|
|
|
const fileUpload = ref(null);
|
|
const emit = defineEmits();
|
|
const number = ref(0);
|
|
const uploadList = ref([]);
|
|
const baseUrl = import.meta.env.VITE_APP_BASE_API;
|
|
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传文件服务器地址
|
|
const headers = ref({ Authorization: "Bearer " + getToken() });
|
|
const fileList = ref([]);
|
|
const showTip = computed(
|
|
() => props.isShowTip && (props.fileType || props.fileSize)
|
|
);
|
|
|
|
watch(() => props.modelValue, val => {
|
|
if (val) {
|
|
let temp = 1;
|
|
// 首先将值转为数组
|
|
const list = Array.isArray(val) ? val : props.modelValue.split(',');
|
|
// 然后将数组转为对象数组
|
|
fileList.value = list.map(item => {
|
|
if (typeof item === "string") {
|
|
item = { name: item, url: item };
|
|
}
|
|
item.uid = item.uid || new Date().getTime() + temp++;
|
|
return item;
|
|
});
|
|
} else {
|
|
fileList.value = [];
|
|
return [];
|
|
}
|
|
},{ deep: true, immediate: true });
|
|
|
|
// 上传前校检格式和大小
|
|
function handleBeforeUpload(file) {
|
|
// 校检文件类型
|
|
if (props.fileType.length) {
|
|
const fileName = file.name.split('.');
|
|
const fileExt = fileName[fileName.length - 1];
|
|
const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
|
|
if (!isTypeOk) {
|
|
modal.msgError(`文件格式不正确, 请上传${props.fileType.join("/")}格式文件!`);
|
|
return false;
|
|
}
|
|
}
|
|
// 校检文件大小
|
|
if (props.fileSize) {
|
|
const isLt = file.size / 1024 / 1024 < props.fileSize;
|
|
if (!isLt) {
|
|
modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
|
|
return false;
|
|
}
|
|
}
|
|
modal.loading("正在上传文件,请稍候...");
|
|
number.value++;
|
|
return true;
|
|
}
|
|
|
|
// 文件个数超出
|
|
function handleExceed() {
|
|
modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
|
|
}
|
|
|
|
// 上传失败
|
|
function handleUploadError(err) {
|
|
modal.msgError("上传文件失败");
|
|
}
|
|
|
|
// 上传成功回调
|
|
function handleUploadSuccess(res, file) {
|
|
if (res.code === 200) {
|
|
uploadList.value.push({ name: res.fileName, url: res.fileName });
|
|
uploadedSuccessfully();
|
|
} else {
|
|
number.value--;
|
|
modal.closeLoading();
|
|
modal.msgError(res.msg);
|
|
fileUpload.value.handleRemove(file);
|
|
uploadedSuccessfully();
|
|
}
|
|
}
|
|
|
|
// 删除文件
|
|
function handleDelete(index) {
|
|
fileList.value.splice(index, 1);
|
|
emit("update:modelValue", listToString(fileList.value));
|
|
}
|
|
|
|
// 上传结束处理
|
|
function uploadedSuccessfully() {
|
|
if (number.value > 0 && uploadList.value.length === number.value) {
|
|
fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
|
|
uploadList.value = [];
|
|
number.value = 0;
|
|
emit("update:modelValue", listToString(fileList.value));
|
|
modal.closeLoading();
|
|
}
|
|
}
|
|
|
|
// 获取文件名称
|
|
function getFileName(name) {
|
|
// 如果是url那么取最后的名字 如果不是直接返回
|
|
if (name.lastIndexOf("/") > -1) {
|
|
return name.slice(name.lastIndexOf("/") + 1);
|
|
} else {
|
|
return name;
|
|
}
|
|
}
|
|
|
|
// 对象转成指定字符串分隔
|
|
function listToString(list, separator) {
|
|
let strs = "";
|
|
separator = separator || ",";
|
|
for (let i in list) {
|
|
if (list[i].url) {
|
|
strs += list[i].url + separator;
|
|
}
|
|
}
|
|
return strs != '' ? strs.substr(0, strs.length - 1) : '';
|
|
}
|
|
</script>
|
|
|
|
<style scoped lang="scss">
|
|
.upload-file-uploader {
|
|
margin-bottom: 5px;
|
|
}
|
|
.upload-file-list .el-upload-list__item {
|
|
border: 1px solid #e4e7ed;
|
|
line-height: 2;
|
|
margin-bottom: 10px;
|
|
position: relative;
|
|
}
|
|
.upload-file-list .ele-upload-list__item-content {
|
|
display: flex;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
color: inherit;
|
|
}
|
|
.ele-upload-list__item-content-action .el-link {
|
|
margin-right: 10px;
|
|
}
|
|
</style> |