From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue |   20 ++++++++++----------
 1 files changed, 10 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..700af68 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>
@@ -55,8 +55,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 +75,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>
@@ -99,31 +99,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 +145,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>

--
Gitblit v1.9.3