From bcfa7fec8c6d2d222989e34f01b5fd6300befaf8 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 23 Jan 2026 15:26:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 700af68..c115e2e 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -13,6 +13,10 @@
<div class="val">{{ formData.deviceType }}</div>
</el-col>
<el-col :span="12">
+ <div class="label">设备编码</div>
+ <div class="val">{{ formData.deviceSn }}</div>
+ </el-col>
+ <el-col :span="12">
<div class="label">设备属性</div>
<div class="val">{{ formData.deviceAtt }}</div>
</el-col>
@@ -86,6 +90,12 @@
<el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="设备编码" prop="deviceSn">
+ <el-input class="command-input" v-model="formData.deviceSn" maxlength="50"
+ placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -168,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: '', // 所属部门
@@ -175,6 +187,7 @@
contactPhone: '', // 联系电话
deviceAtt: '', // 设备属性
deviceType: '', // 设备类型
+ deviceSn: '', // 设备编码
deviceModel: '', // 型号
deviceSpecification: '', // 规格
deviceName: '', // 设备名称
@@ -196,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) // 弹框显隐
@@ -215,6 +229,7 @@
const rules = {
deviceName: fieldRules(true, 50),
deviceType: fieldRules(true),
+ deviceSn: fieldRules(true, 50),
deviceAtt: fieldRules(true),
deviceModel: fieldRules(true, 50),
deviceSpecification: fieldRules(true, 50),
@@ -252,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