From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index e91ecf3..b570b0f 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -162,7 +162,7 @@
 			</el-row>
 		</el-form>
 		<template #footer>
-			<el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+			<el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
 			<el-button color="#284FE3" v-if="!dialogReadonly" type="primary" :loading="submitting"
 				:disabled="submitting" @click="handleSubmit">
 				保存
@@ -178,6 +178,8 @@
 import { getUserListApi } from '@/api/system/user'
 import { fieldRules, getDictLabel } from '@ztzf/utils'
 import { fwDeviceTrackPageApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
 
 const initForm = () => ({
 	belongDept: '', // 所属部门
@@ -207,6 +209,7 @@
 const dictObj = inject('dictObj')
 const deptTree = inject('deptTree')
 const emit = defineEmits(['success'])
+const route = useRoute()
 const formRef = ref(null) // 表单实例
 const formData = ref(initForm()) // 表单数据
 const visible = ref(false) // 弹框显隐
@@ -264,6 +267,12 @@
 	submitting.value = true
 	try {
 		await fwDeviceSubmitApi(formData.value)
+		const actionText = dialogMode.value === 'add' ? '建档' : '编辑'
+		saveOperationLog({
+			requestUri: route.path,
+			title: `${route.name || '设备出入库'}-${actionText}`,
+			type: 1
+		})
 		ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
 		visible.value = false
 		emit('success')

--
Gitblit v1.9.3