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/permissionManage/permissionUser/FormDiaLog.vue |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
index 62957b1..0aca836 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
@@ -231,7 +231,7 @@
 		</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">
 				保存
 			</el-button>
@@ -246,6 +246,8 @@
 import { getDeptTree } from '@/api/system/dept'
 import { getRoleTree } from '@/api/system/role'
 import func from '@/utils/func'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
 
 const initForm = () => ({
 	account: '',
@@ -289,6 +291,7 @@
 })
 const roleTree = ref([])
 const deptTree = ref([])
+const route = useRoute()
 
 const validatePass = (rule, value, callback) => {
 	if (value === '') {
@@ -363,8 +366,18 @@
 		submitData.name = submitData.realName
 		if (dialogMode.value === 'add') {
 			await add(submitData)
+			saveOperationLog({
+				requestUri: route.path,
+				title: `${route.name || '用户管理'}-新增`,
+				type: 1
+			})
 		} else {
 			await update(submitData)
+			saveOperationLog({
+				requestUri: route.path,
+				title: `${route.name || '用户管理'}-编辑`,
+				type: 1
+			})
 		}
 		ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
 		visible.value = false

--
Gitblit v1.9.3