From 27f63c34e229f6188400a93d246967c1b4dcb9e2 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 22 Jan 2026 10:31:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 5c8a414..e91ecf3 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed"
- destroy-on-close>
+ destroy-on-close :close-on-click-modal="false">
<div class="detail-container" v-if="dialogReadonly">
<div class="detail-title">设备详情</div>
<el-row>
@@ -11,6 +11,10 @@
<el-col :span="12">
<div class="label">设备类型</div>
<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>
@@ -55,8 +59,8 @@
<div class="command-table-content">
<el-table class="command-table" :data="list">
<el-table-column type="index" width="60" label="序号" />
- <el-table-column prop="charger" label="用户" />
- <el-table-column prop="contactPhone" label="电话" />
+ <el-table-column prop="charger" label="负责人" />
+ <el-table-column prop="contactPhone" label="联系电话" />
<el-table-column prop="outTarget" label="出库去向" />
<el-table-column prop="outTime" label="出库时间" />
<el-table-column prop="purpose" label="用途" />
@@ -75,7 +79,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
- <el-input class="command-search-input" v-model="formData.deviceName" maxlength="50"
+ <el-input class="command-input" v-model="formData.deviceName" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
</el-col>
@@ -89,6 +93,12 @@
</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">
<el-form-item label="设备属性" prop="deviceAtt">
<el-select class="command-select" popper-class="command-select-popper"
v-model="formData.deviceAtt" placeholder="请选择" clearable>
@@ -99,31 +109,31 @@
</el-col>
<el-col :span="12">
<el-form-item label="型号" prop="deviceModel">
- <el-input class="command-search-input" v-model="formData.deviceModel" maxlength="50"
+ <el-input class="command-input" v-model="formData.deviceModel" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规格" prop="deviceSpecification">
- <el-input class="command-search-input" v-model="formData.deviceSpecification"
+ <el-input class="command-input" v-model="formData.deviceSpecification"
maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产厂商" prop="manufacturer">
- <el-input class="command-search-input" v-model="formData.manufacturer" maxlength="50"
+ <el-input class="command-input" v-model="formData.manufacturer" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="来源" prop="source">
- <el-input class="command-search-input" v-model="formData.source" maxlength="50"
+ <el-input class="command-input" v-model="formData.source" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用途" prop="purpose">
- <el-input class="command-search-input" v-model="formData.purpose" maxlength="50"
+ <el-input class="command-input" v-model="formData.purpose" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
</el-col>
@@ -145,7 +155,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="contactPhone">
- <el-input class="command-search-input" v-model="formData.contactPhone" maxlength="50"
+ <el-input class="command-input" v-model="formData.contactPhone" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
</el-col>
@@ -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