From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/basicManage/deviceScrap/index.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..d2ff2f9 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="负责人" />
@@ -72,7 +76,7 @@
</el-table-column>
<el-table-column prop="scrapReason" show-overflow-tooltip label="报废原因" />
<el-table-column prop="disposeWay" show-overflow-tooltip label="处置方式" />
- <el-table-column label="操作" class-name="operation-btns">
+ <el-table-column label="操作" class-name="operation-btns" fixed="right">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
</template>
--
Gitblit v1.9.3