Merge remote-tracking branch 'origin/master'

张含笑

2026-01-09 edaf70cb7f0c4e7c997ddab584b3b05798d58528

 applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue

@@ -3,13 +3,13 @@
      <el-form ref="formRef" :model="formData" :rules="rules" :disabled="dialogReadonly" label-width="100px">
         <el-row>
            <el-col :span="12">
               <el-form-item label="设备名称" prop="fwDeviceDTO.deviceName">
                  <el-input v-model="formData.fwDeviceDTO.deviceName" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="设备名称" prop="deviceName">
                  <el-input v-model="formData.deviceName" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="设备类型" prop="fwDeviceDTO.deviceType">
                  <el-select v-model="formData.fwDeviceDTO.deviceType" placeholder="请选择" clearable>
               <el-form-item label="设备类型" prop="deviceType">
                  <el-select v-model="formData.deviceType" placeholder="请选择" clearable>
                     <el-option
                        v-for="item in dictObj.deviceType"
                        :key="item.dictKey"
@@ -20,8 +20,8 @@
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="设备属性" prop="fwDeviceDTO.deviceAtt">
                  <el-select v-model="formData.fwDeviceDTO.deviceAtt" placeholder="请选择" clearable>
               <el-form-item label="设备属性" prop="deviceAtt">
                  <el-select v-model="formData.deviceAtt" placeholder="请选择" clearable>
                     <el-option
                        v-for="item in dictObj.deviceAtt"
                        :key="item.dictKey"
@@ -32,44 +32,34 @@
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="型号" prop="fwDeviceDTO.deviceModel">
                  <el-input v-model="formData.fwDeviceDTO.deviceModel" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="型号" prop="deviceModel">
                  <el-input v-model="formData.deviceModel" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="规格" prop="fwDeviceDTO.deviceSpecification">
                  <el-input
                     v-model="formData.fwDeviceDTO.deviceSpecification"
                     maxlength="50"
                     placeholder="请输入"
                     clearable
                  />
               <el-form-item label="规格" prop="deviceSpecification">
                  <el-input v-model="formData.deviceSpecification" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="生产厂商" prop="fwDeviceDTO.manufacturer">
                  <el-input v-model="formData.fwDeviceDTO.manufacturer" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="生产厂商" prop="manufacturer">
                  <el-input v-model="formData.manufacturer" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="出库去向" prop="stockOutDestination">
                  <el-input v-model="formData.stockOutDestination" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="来源" prop="source">
                  <el-input v-model="formData.source" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="来源" prop="fwDeviceDTO.source">
                  <el-input v-model="formData.fwDeviceDTO.source" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="用途" prop="purpose">
                  <el-input v-model="formData.purpose" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="用途" prop="fwDeviceTrackDTO.purpose">
                  <el-input v-model="formData.fwDeviceTrackDTO.purpose" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="所属部门" prop="fwDeviceDTO.ownerDept">
               <el-form-item label="所属部门" prop="belongDept">
                  <el-tree-select
                     v-model="formData.fwDeviceDTO.ownerDept"
                     v-model="formData.belongDept"
                     node-key="id"
                     :data="deptTree"
                     :props="treeProps"
@@ -80,25 +70,15 @@
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="负责人" prop="fwDeviceTrackDTO.charger">
                  <el-select
                     v-model="formData.fwDeviceTrackDTO.charger"
                     placeholder="请选择"
                     :disabled="!formData.fwDeviceDTO.ownerDept"
                     clearable
                  >
               <el-form-item label="负责人" prop="charger">
                  <el-select v-model="formData.charger" placeholder="请选择" :disabled="!formData.belongDept" clearable>
                     <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="联系电话" prop="fwDeviceTrackDTO.contactPhone">
                  <el-input v-model="formData.fwDeviceTrackDTO.contactPhone" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="联系电话" prop="fwDeviceTrackDTO.contactPhone">
                  <el-input v-model="formData.fwDeviceTrackDTO.contactPhone" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="联系电话" prop="contactPhone">
                  <el-input v-model="formData.contactPhone" maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
         </el-row>
@@ -126,24 +106,17 @@
import { fieldRules } from '@ztzf/utils'

const initForm = () => ({
   'fwDeviceDTO': {
      'deviceAtt': '',
      'deviceModel': '',
      'deviceName': '',
      'deviceSpecification': '',
      'deviceType': '',
      'manufacturer': '',
      'remark': '',
      'source': '',
   },
   'fwDeviceTrackDTO': {
      'charger': '',
      'purpose': '',
      'contactPhone': '',
      'deptName': '',
      'outTarget': '',
      'outTime': '',
   },
   belongDept: '', // 所属部门
   charger: '', // 负责人
   contactPhone: '', // 联系电话
   deviceAtt: '', // 设备属性
   deviceType: '', // 设备类型
   deviceModel: '', // 型号
   deviceSpecification: '', // 规格
   deviceName: '', // 设备名称
   manufacturer: '', // 生产厂商
   purpose: '', // 用途
   source: '', // 来源
})
const treeProps = {
   label: 'name',
@@ -176,10 +149,10 @@
   deviceModel: fieldRules(true, 50),
   deviceSpecification: fieldRules(true, 50),
   manufacturer: fieldRules(true, 50),
   stockOutDestination: fieldRules(true, 50),
   source: fieldRules(true, 50),
   purpose: fieldRules(true, 50),
   ownerDept: fieldRules(true, 50),
   belongDept: fieldRules(true, 50),
   contactPhone: fieldRules(true, 50),
   charger: fieldRules(true, 0),
}