From b2a8ee3a7c3628d7c8f6ee330630c18e58da92c3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 09 Jan 2026 11:36:37 +0800
Subject: [PATCH] feat: 完成基础设备入库

---
 applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
index 90e54f5..d6cbde7 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
@@ -63,14 +63,25 @@
 		<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" />
 			<el-table-column type="index" width="60" label="序号" />
-			<el-table-column prop="deviceName" label="名称" />
+			<el-table-column prop="deviceName" label="设备名称" />
 			<el-table-column prop="deviceType" label="类型">
 				<template v-slot="{ row }">
 					{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
 				</template>
 			</el-table-column>
-			<el-table-column prop="deviceModel" label="设备型号" />
+			<el-table-column prop="deviceModel" label="型号" />
 			<el-table-column prop="deviceSpecification" label="规格" />
+			<el-table-column prop="manufacturer" label="生产厂商" />
+			<el-table-column prop="createTime" label="入库时间" />
+			<el-table-column prop="source" label="来源" />
+			<el-table-column prop="purpose" label="用途" />
+			<el-table-column prop="belongDeptName" label="所属部门" />
+			<el-table-column prop="charger" label="负责人" />
+			<el-table-column prop="yxzt" label="运行状态">
+				<template v-slot="{ row }">
+					{{ DEVICE_STATUS[row.status] || '-' }}
+				</template>
+			</el-table-column>
 			<el-table-column label="操作">
 				<template v-slot="{ row }">
 					<el-link @click="handleView(row)" type="primary">查看</el-link>
@@ -102,6 +113,7 @@
 import { getDictionaryByCode } from '@/api/system/dictbiz'
 import { getDeptTree } from '@/api/system/dept'
 import { blobDownload, dateRangeFormat, getDictLabel } from '@ztzf/utils'
+import { DEVICE_STATUS } from '@ztzf/constants'
 import DeviceTrackDiaLog from '@/views/basicManage/deviceStock/DeviceTrackDiaLog.vue'
 
 const initSearchParams = () => ({

--
Gitblit v1.9.3