Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-22 27f63c34e229f6188400a93d246967c1b4dcb9e2

 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="用途" />
@@ -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),