From 1d46e10e2a56b2cf56d5453d908e06d2ba24ef3e Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 13 Jan 2026 14:44:43 +0800
Subject: [PATCH] feat: 校验调整
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 207 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 130 insertions(+), 77 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 37ec544..213fd1a 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -1,15 +1,69 @@
<template>
<el-dialog v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
- <el-form ref="formRef" :model="formData" :rules="rules" :disabled="dialogReadonly" label-width="100px">
+ <div v-if="dialogReadonly">
+ <h3>设备详情</h3>
<el-row>
<el-col :span="12">
- <el-form-item label="设备名称" prop="fwDeviceDTO.deviceName">
- <el-input v-model="formData.fwDeviceDTO.deviceName" maxlength="50" placeholder="请输入" clearable />
+ <div>设备信息: {{ formData.deviceName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>设备类型: {{ formData.deviceType }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>设备属性: {{ formData.deviceAtt }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>型号: {{ formData.deviceModel }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>规格: {{ formData.deviceSpecification }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>生产厂商: {{ formData.manufacturer }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>来源: {{ formData.source }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>用途: {{ formData.purpose }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>所属部门: {{ formData.belongDeptName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>负责人: {{ formData.charger }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div>联系电话: {{ formData.contactPhone }}</div>
+ </el-col>
+ </el-row>
+ <h3>出库去向详情</h3>
+ <el-table v-loading="loading" :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="outTarget" label="出库去向" />
+ <el-table-column prop="outTime" label="出库时间" />
+ <el-table-column prop="purpose" label="用途" />
+ </el-table>
+ <el-pagination
+ v-model:current-page="searchParams.current"
+ v-model:page-size="searchParams.size"
+ :total="total"
+ @change="getList"
+ />
+ </div>
+
+ <el-form v-else ref="formRef" :model="formData" :rules="rules" label-width="100px">
+ <el-row>
+ <el-col :span="12">
+ <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 +74,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,73 +86,53 @@
</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"
check-strictly
- @change="getUserList"
+ @change="belongDeptChange"
clearable
/>
</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-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+ <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.name" />
</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>
@@ -121,34 +155,34 @@
<script setup>
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
-import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
import { getUserListApi } from '@/api/system/user'
-import { fieldRules } from '@ztzf/utils'
+import { fieldRules, getDictLabel } from '@ztzf/utils'
+import { fwDeviceTrackPageApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
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',
children: 'children',
}
+
+const initSearchParams = () => ({
+ current: 1, // 当前页
+ size: 10, // 每页大小
+})
+const searchParams = ref(initSearchParams())
const dictObj = inject('dictObj')
const deptTree = inject('deptTree')
@@ -171,27 +205,31 @@
const rules = {
deviceName: fieldRules(true, 50),
- deviceType: fieldRules(true, 0),
- deviceAtt: fieldRules(true, 0),
+ deviceType: fieldRules(true),
+ deviceAtt: fieldRules(true),
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),
- charger: fieldRules(true, 0),
+ belongDept: fieldRules(true),
+ contactPhone: fieldRules(true, 50),
+ charger: fieldRules(true),
}
const userList = ref([])
-function getUserList(val) {
+
+function belongDeptChange() {
formData.value.charger = ''
- if (val) {
- getUserListApi(val).then(res => {
- userList.value = res.data.data.records
- })
- }
}
+
+function getUserList() {
+ getUserListApi(formData.value.belongDept).then(res => {
+ userList.value = res.data.data.records
+ })
+}
+
+watch(() => formData.value.belongDept, getUserList)
// 关闭弹框
function handleCancel() {
@@ -224,16 +262,31 @@
function handleClosed() {
formData.value = initForm()
}
+const total = ref(0) // 总条数
+const loading = ref(false) // 列表加载中
+const list = ref([]) // 列表数据
+async function getList() {
+ loading.value = true
+ try {
+ const params = { ...searchParams.value, deviceId: formData.value.id }
+ const res = await fwDeviceTrackPageApi(params)
+ list.value = res?.data?.data?.records ?? []
+ total.value = res?.data?.data?.total ?? 0
+ } finally {
+ loading.value = false
+ }
+}
// 打开弹框
async function open({ mode, row } = {}) {
dialogMode.value = mode || 'add'
- formData.value = row
visible.value = true
if (dialogMode.value === 'add') {
formData.value = initForm()
} else {
+ formData.value = row
await loadDetail()
+ getList()
}
}
--
Gitblit v1.9.3