From 039679bf092a8a6cb1f8c921c8a2cfa5306dcf73 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 26 Feb 2026 14:25:02 +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 b1754c0..cf1553e 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
@@ -3,7 +3,7 @@
<el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
<el-form-item label="设备名称" prop="deviceName">
<el-input
- class="command-search-input"
+ class="command-input"
v-model="searchParams.deviceName"
placeholder="请输入"
clearable
@@ -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