From fefcc01cec5a6ec86ddefb6f0a0946eda0896eb2 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 22 Jan 2026 10:00:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 12 ++++++++++++
1 files changed, 12 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..e91ecf3 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">
@@ -175,6 +185,7 @@
contactPhone: '', // 联系电话
deviceAtt: '', // 设备属性
deviceType: '', // 设备类型
+ deviceSn: '', // 设备编码
deviceModel: '', // 型号
deviceSpecification: '', // 规格
deviceName: '', // 设备名称
@@ -215,6 +226,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),
--
Gitblit v1.9.3