From 27f63c34e229f6188400a93d246967c1b4dcb9e2 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 22 Jan 2026 10:31:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
index b97ca68..cb60414 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
@@ -21,7 +21,7 @@
</el-col>
<el-col :span="12">
<div class="label">入库时间</div>
- <div class="val">{{ formData.createTime }}</div>
+ <div class="val">{{dayjs(formData.createTime).format('YYYY-MM-DD')}}</div>
</el-col>
<el-col :span="12">
<div class="label">来源</div>
@@ -37,9 +37,9 @@
</el-col>
<el-col :span="12">
<div class="label">报废时间</div>
- <div class="val">{{ formData.scrapTime }}</div>
+ <div class="val">{{dayjs(formData.scrapTime).format('YYYY-MM-DD')}}</div>
</el-col>
- <el-col :span="24">
+ <el-col :span="12">
<div class="label">报废原因</div>
<div class="val">{{ formData.scrapReason }}</div>
</el-col>
@@ -59,6 +59,7 @@
import { computed, ref } from 'vue'
import { getDictLabel } from '@ztzf/utils'
import { fwDeviceScrapDetailApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
+import dayjs from 'dayjs'
const initForm = () => ({})
const emit = defineEmits(['success'])
--
Gitblit v1.9.3