From d0bb243cc0ed63ee5133a5135a93dc3043077549 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 09 Jan 2026 11:22:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
index 5b16c2f..90e54f5 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
@@ -75,6 +75,7 @@
 				<template v-slot="{ row }">
 					<el-link @click="handleView(row)" type="primary">查看</el-link>
 					<el-link @click="handleEdit(row)" type="warning">编辑</el-link>
+					<el-link @click="outbound(row)" type="warning">出库</el-link>
 					<el-link @click="handleDelete(row)" type="danger">删除</el-link>
 				</template>
 			</el-table-column>
@@ -89,6 +90,7 @@
 		</div>
 
 		<FormDiaLog ref="dialogRef" @success="getList" />
+		<DeviceTrackDiaLog ref="outboundDialogRef" @success="getList" />
 	</basic-container>
 </template>
 
@@ -100,6 +102,7 @@
 import { getDictionaryByCode } from '@/api/system/dictbiz'
 import { getDeptTree } from '@/api/system/dept'
 import { blobDownload, dateRangeFormat, getDictLabel } from '@ztzf/utils'
+import DeviceTrackDiaLog from '@/views/basicManage/deviceStock/DeviceTrackDiaLog.vue'
 
 const initSearchParams = () => ({
 	deviceName: '', // 设备名称
@@ -109,12 +112,12 @@
 	size: 10, // 每页大小
 })
 const searchParams = ref(initSearchParams()) // 查询参数
-const total = ref(0) // 总条数
 const loading = ref(false) // 列表加载中
 const list = ref([]) // 列表数据
 const selectedIds = ref([]) // 勾选的设备ID列表
 const queryParamsRef = ref(null) // 查询表单实例
 const dialogRef = ref(null) // 弹框实例
+const outboundDialogRef = ref(null) // 弹框实例
 const dictObj = ref({
 	deviceType: [], //设备类型
 	deviceAtt: [], //设备属性
@@ -167,6 +170,10 @@
 	dialogRef.value?.open({ mode: 'edit', row: { ...row } })
 }
 
+function outbound(row) {
+	outboundDialogRef.value?.open({ mode: 'add', row: { ...row } })
+}
+
 // 删除
 async function handleDelete(row) {
 	const tips = row ? '该条' : '选中的项'

--
Gitblit v1.9.3