根因: - 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)
165 lines
4.1 KiB
Vue
Executable File
165 lines
4.1 KiB
Vue
Executable File
<template>
|
||
<el-form>
|
||
<el-form-item>
|
||
<el-radio
|
||
v-model="radioValue"
|
||
:label="1"
|
||
>
|
||
分钟,允许的通配符[, - * /]
|
||
</el-radio>
|
||
</el-form-item>
|
||
|
||
<el-form-item>
|
||
<el-radio
|
||
v-model="radioValue"
|
||
:label="2"
|
||
>
|
||
周期从
|
||
<el-input-number
|
||
v-model="cycle01"
|
||
:min="0"
|
||
:max="58"
|
||
/> -
|
||
<el-input-number
|
||
v-model="cycle02"
|
||
:min="cycle01 + 1"
|
||
:max="59"
|
||
/> 分钟
|
||
</el-radio>
|
||
</el-form-item>
|
||
|
||
<el-form-item>
|
||
<el-radio
|
||
v-model="radioValue"
|
||
:label="3"
|
||
>
|
||
从
|
||
<el-input-number
|
||
v-model="average01"
|
||
:min="0"
|
||
:max="58"
|
||
/> 分钟开始, 每
|
||
<el-input-number
|
||
v-model="average02"
|
||
:min="1"
|
||
:max="59 - average01"
|
||
/> 分钟执行一次
|
||
</el-radio>
|
||
</el-form-item>
|
||
|
||
<el-form-item>
|
||
<el-radio
|
||
v-model="radioValue"
|
||
:label="4"
|
||
>
|
||
指定
|
||
<el-select
|
||
v-model="checkboxList"
|
||
clearable
|
||
placeholder="可多选"
|
||
multiple
|
||
:multiple-limit="10"
|
||
>
|
||
<el-option
|
||
v-for="item in 60"
|
||
:key="item"
|
||
:label="item - 1"
|
||
:value="item - 1"
|
||
/>
|
||
</el-select>
|
||
</el-radio>
|
||
</el-form-item>
|
||
</el-form>
|
||
</template>
|
||
<script setup>
|
||
const emit = defineEmits(['update'])
|
||
const props = defineProps({
|
||
cron: {
|
||
type: Object,
|
||
default: {
|
||
second: "*",
|
||
min: "*",
|
||
hour: "*",
|
||
day: "*",
|
||
month: "*",
|
||
week: "?",
|
||
year: "",
|
||
}
|
||
},
|
||
check: {
|
||
type: Function,
|
||
default: () => {
|
||
}
|
||
}
|
||
})
|
||
const radioValue = ref(1)
|
||
const cycle01 = ref(0)
|
||
const cycle02 = ref(1)
|
||
const average01 = ref(0)
|
||
const average02 = ref(1)
|
||
const checkboxList = ref([])
|
||
const checkCopy = ref([0])
|
||
const cycleTotal = computed(() => {
|
||
cycle01.value = props.check(cycle01.value, 0, 58)
|
||
cycle02.value = props.check(cycle02.value, cycle01.value + 1, 59)
|
||
return cycle01.value + '-' + cycle02.value
|
||
})
|
||
const averageTotal = computed(() => {
|
||
average01.value = props.check(average01.value, 0, 58)
|
||
average02.value = props.check(average02.value, 1, 59 - average01.value)
|
||
return average01.value + '/' + average02.value
|
||
})
|
||
const checkboxString = computed(() => {
|
||
return checkboxList.value.join(',')
|
||
})
|
||
watch(() => props.cron.min, value => changeRadioValue(value))
|
||
watch([radioValue, cycleTotal, averageTotal, checkboxString], () => onRadioChange())
|
||
function changeRadioValue(value) {
|
||
if (value === '*') {
|
||
radioValue.value = 1
|
||
} else if (value.indexOf('-') > -1) {
|
||
const indexArr = value.split('-')
|
||
cycle01.value = Number(indexArr[0])
|
||
cycle02.value = Number(indexArr[1])
|
||
radioValue.value = 2
|
||
} else if (value.indexOf('/') > -1) {
|
||
const indexArr = value.split('/')
|
||
average01.value = Number(indexArr[0])
|
||
average02.value = Number(indexArr[1])
|
||
radioValue.value = 3
|
||
} else {
|
||
checkboxList.value = [...new Set(value.split(',').map(item => Number(item)))]
|
||
radioValue.value = 4
|
||
}
|
||
}
|
||
function onRadioChange() {
|
||
switch (radioValue.value) {
|
||
case 1:
|
||
emit('update', 'min', '*', 'min')
|
||
break
|
||
case 2:
|
||
emit('update', 'min', cycleTotal.value, 'min')
|
||
break
|
||
case 3:
|
||
emit('update', 'min', averageTotal.value, 'min')
|
||
break
|
||
case 4:
|
||
if (checkboxList.value.length === 0) {
|
||
checkboxList.value.push(checkCopy.value[0])
|
||
} else {
|
||
checkCopy.value = checkboxList.value
|
||
}
|
||
emit('update', 'min', checkboxString.value, 'min')
|
||
break
|
||
}
|
||
}
|
||
</script>
|
||
|
||
<style lang="scss" scoped>
|
||
.el-input-number--small, .el-select, .el-select--small {
|
||
margin: 0 0.2rem;
|
||
}
|
||
.el-select, .el-select--small {
|
||
width: 19.8rem;
|
||
}
|
||
</style> |