From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceScrap/index.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
index 7bd6f96..cf1553e 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
@@ -61,7 +61,11 @@
</el-table-column>
<el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
<el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
- <el-table-column prop="createTime" show-overflow-tooltip label="入库时间" />
+ <el-table-column prop="createTime" show-overflow-tooltip label="入库时间">
+ <template v-slot="{ row }">
+ {{dayjs(row.scrapTime).format('YYYY-MM-DD')}}
+ </template>
+ </el-table-column>
<el-table-column prop="source" show-overflow-tooltip label="来源" />
<el-table-column prop="belongDeptName" show-overflow-tooltip label="所属部门" />
<el-table-column prop="charger" show-overflow-tooltip label="负责人" />
--
Gitblit v1.9.3