fix: 打包流水设置结束时间格式对齐后端 YYYY-MM-DD HH:mm:ss,修复默认值计算逻辑
This commit is contained in:
parent
af204d3c70
commit
11aeb0401e
@ -121,7 +121,7 @@ export function packingGet(id: number): Promise<{
|
||||
export type PackingSetEndTimeParams = {
|
||||
/** 打包任务ID(必填) */
|
||||
id: number
|
||||
/** 结束时间 ISO 8601 格式(必填) */
|
||||
/** 结束时间 YYYY-MM-DD HH:mm:ss 格式(必填) */
|
||||
end_time: string
|
||||
}
|
||||
|
||||
|
||||
@ -236,7 +236,7 @@
|
||||
type="datetime"
|
||||
placeholder="选择结束时间"
|
||||
format="YYYY-MM-DD HH:mm:ss"
|
||||
value-format="YYYY-MM-DDTHH:mm:ss.SSS[Z]"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
@ -504,17 +504,22 @@ const setEndTimeForm = reactive({
|
||||
end_time: ''
|
||||
})
|
||||
|
||||
/** 计算结束时间默认值:已有结束时间→当前时间;无→开始时间+5分钟 */
|
||||
/** 计算结束时间默认值:已有结束时间→解析已有时间;无→开始时间+5分钟;否则当前时间 */
|
||||
function computeDefaultEndTime(): string {
|
||||
const now = dayjs()
|
||||
const fmt = 'YYYY-MM-DD HH:mm:ss'
|
||||
if (operatingRow.value?.end_time) {
|
||||
return now.toISOString()
|
||||
const existing = dayjs(operatingRow.value.end_time)
|
||||
if (existing.isValid()) {
|
||||
return existing.format(fmt)
|
||||
}
|
||||
}
|
||||
if (operatingRow.value?.start_time) {
|
||||
const start = dayjs(operatingRow.value.start_time)
|
||||
return start.add(5, 'minute').toISOString()
|
||||
if (start.isValid()) {
|
||||
return start.add(5, 'minute').format(fmt)
|
||||
}
|
||||
}
|
||||
return now.toISOString()
|
||||
return dayjs().format(fmt)
|
||||
}
|
||||
|
||||
function openSetEndTimeDialog(row: PackingTaskItem) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user