From 9dc78c5357c66c2dfc124ea764f09ff669996de3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 07 Jan 2026 19:00:44 +0800
Subject: [PATCH] feat: 可清空
---
applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue | 70 ++++++++++++++---------
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 109 ++++++++++++++---------------------
applications/drone-command/src/views/basicManage/deviceStock/fwDevice.js | 0
3 files changed, 86 insertions(+), 93 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceStockFormDialog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
similarity index 66%
rename from applications/drone-command/src/views/basicManage/deviceStock/DeviceStockFormDialog.vue
rename to applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 5fc6022..7e7b72a 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceStockFormDialog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -4,60 +4,60 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
- <el-input v-model="formData.deviceName" maxlength="50" placeholder="请输入" />
+ <el-input v-model="formData.deviceName" maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备类型" prop="deviceType">
- <el-input v-model="formData.deviceType" maxlength="50" placeholder="请输入" />
+ <el-input v-model="formData.deviceType" maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="型号" prop="deviceModel">
- <el-input v-model="formData.deviceModel" maxlength="50" placeholder="请输入" />
+ <el-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 v-model="formData.deviceSpecification" maxlength="50" placeholder="请输入" />
+ <el-input v-model="formData.deviceSpecification" maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生产厂商" prop="manufacturer">
- <el-input v-model="formData.manufacturer" maxlength="50" placeholder="请输入" />
+ <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="请输入" />
+ <el-input v-model="formData.stockOutDestination" maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="来源" prop="source">
- <el-input v-model="formData.source" maxlength="50" placeholder="请输入" />
+ <el-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 v-model="formData.purpose" maxlength="50" placeholder="请输入" />
+ <el-input v-model="formData.purpose" maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属部门" prop="ownerDept">
- <el-input v-model="formData.ownerDept" maxlength="50" placeholder="请输入" />
+ <el-input v-model="formData.ownerDept" maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="负责人" prop="ownerUser">
- <el-input v-model="formData.ownerUser" maxlength="50" placeholder="请输入" />
+ <el-input v-model="formData.ownerUser" maxlength="50" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -80,26 +80,27 @@
<script setup>
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
-import { fwDeviceDetailApi, fwDeviceSaveApi, fwDeviceUpdateApi } from '@/api/fwDevice'
+import { fwDeviceDetailApi, fwDeviceSaveApi, fwDeviceUpdateApi } from '@/views/basicManage/deviceStock/fwDevice'
const initForm = () => ({
- deviceModel: '',
- deviceName: '',
- deviceSpecification: '',
- deviceType: '',
- manufacturer: '',
- ownerDept: '',
- ownerUser: '',
- purpose: '',
- source: '',
- stockOutDestination: '',
+ // 表单默认值
+ deviceModel: '', // 型号
+ deviceName: '', // 设备名称
+ deviceSpecification: '', // 规格
+ deviceType: '', // 设备类型
+ manufacturer: '', // 生产厂商
+ ownerDept: '', // 所属部门
+ ownerUser: '', // 负责人
+ purpose: '', // 用途
+ source: '', // 来源
+ stockOutDestination: '', // 出库去向
})
const emit = defineEmits(['success'])
-const formRef = ref(null)
-const formData = ref(initForm())
-const visible = ref(false)
-const dialogMode = ref('add')
+const formRef = ref(null) // 表单实例
+const formData = ref(initForm()) // 表单数据
+const visible = ref(false) // 弹框显隐
+const dialogMode = ref('add') // 弹框模式
const submitting = ref(false)
const dialogReadonly = computed(() => dialogMode.value === 'view')
const dialogTitle = computed(() => {
@@ -111,47 +112,25 @@
return '新增'
}
})
+
+function verify(required, max, messageType = 1) {
+ return [
+ required ? { required: true, message: messageType ? '请输入' : '请选择', trigger: ['blur', 'change'] } : {},
+ { max, message: `长度不超过${max}`, trigger: ['blur', 'change'] },
+ ]
+}
+
const rules = {
- deviceName: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- deviceType: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- deviceModel: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- deviceSpecification: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- manufacturer: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- stockOutDestination: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- source: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- purpose: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- ownerDept: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
- ownerUser: [
- { required: true, message: '请输入', trigger: 'blur' },
- { max: 50, message: '长度不超过50', trigger: 'blur' },
- ],
+ deviceName: verify(true, 50),
+ deviceType: verify(true, 50),
+ deviceModel: verify(true, 50),
+ deviceSpecification: verify(true, 50),
+ manufacturer: verify(true, 50),
+ stockOutDestination: verify(true, 50),
+ source: verify(true, 50),
+ purpose: verify(true, 50),
+ ownerDept: verify(true, 50),
+ ownerUser: verify(true, 50),
}
// 关闭弹框
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
index dbfb894..6a0aee0 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
@@ -1,21 +1,29 @@
<template>
<basic-container>
- <el-form ref="queryParamsRef" :inline="true" :model="searchParams">
- <el-form-item label="名称" prop="deviceName">
- <el-input v-model="searchParams.deviceName" />
- </el-form-item>
- <el-form-item label="类型" prop="deviceType">
- <el-input v-model="searchParams.deviceType" />
- </el-form-item>
- <el-form-item>
- <el-button @click="resetForm">重置</el-button>
- <el-button type="primary" @click="handleSearch">查询</el-button>
- </el-form-item>
+ <el-form ref="queryParamsRef" :model="searchParams">
+ <el-row :gutter="16">
+ <el-col :span="4">
+ <el-form-item label="名称" prop="deviceName">
+ <el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="getList" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="类型" prop="deviceType">
+ <el-input v-model="searchParams.deviceType" placeholder="请输入" clearable @clear="getList" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item>
+ <el-button @click="resetForm">重置</el-button>
+ <el-button type="primary" @click="handleSearch">查询</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div>
<el-button type="primary" @click="handleAdd">新增</el-button>
</div>
- <el-table :data="list">
+ <el-table v-loading="loading" :data="list">
<el-table-column type="index" width="60" label="序号" />
<el-table-column prop="deviceName" label="名称" />
<el-table-column prop="deviceType" label="类型" />
@@ -39,34 +47,40 @@
/>
</div>
- <DeviceStockFormDialog ref="dialogRef" @success="getList" />
+ <FormDiaLog ref="dialogRef" @success="getList" />
</basic-container>
</template>
<script setup>
import { onMounted, ref } from 'vue'
import { ElMessageBox } from 'element-plus'
-import { fwDeviceListApi, fwDeviceRemoveApi } from '@/api/fwDevice'
-import DeviceStockFormDialog from './DeviceStockFormDialog.vue'
+import { fwDeviceListApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
+import FormDiaLog from './FormDiaLog.vue'
const initSearchParams = () => ({
- deviceName: '',
- deviceType: '',
- current: 1,
- size: 10,
+ // 查询参数默认值
+ deviceName: '', // 设备名称
+ deviceType: '', // 设备类型
+ current: 1, // 当前页
+ size: 10, // 每页大小
})
-const searchParams = ref(initSearchParams())
-const total = ref(0)
-const list = ref([])
-const queryParamsRef = ref(null)
-
-const dialogRef = ref(null)
+const searchParams = ref(initSearchParams()) // 查询参数
+const total = ref(0) // 总条数
+const loading = ref(false) // 列表加载中
+const list = ref([]) // 列表数据
+const queryParamsRef = ref(null) // 查询表单实例
+const dialogRef = ref(null) // 弹框实例
// 获取列表
async function getList() {
- const res = await fwDeviceListApi(searchParams.value)
- list.value = res?.data?.data?.records ?? []
- total.value = res?.data?.data?.total ?? 0
+ loading.value = true
+ try {
+ const res = await fwDeviceListApi(searchParams.value)
+ list.value = res?.data?.data?.records ?? []
+ total.value = res?.data?.data?.total ?? 0
+ } finally {
+ loading.value = false
+ }
}
// 查询
diff --git a/applications/drone-command/src/api/fwDevice/index.js b/applications/drone-command/src/views/basicManage/deviceStock/fwDevice.js
similarity index 100%
rename from applications/drone-command/src/api/fwDevice/index.js
rename to applications/drone-command/src/views/basicManage/deviceStock/fwDevice.js
--
Gitblit v1.9.3