From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 319 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 208 insertions(+), 111 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..92a83a7 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -1,158 +1,222 @@
<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">
+ <el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed"
+ destroy-on-close :close-on-click-modal="false">
+ <div class="detail-container" v-if="dialogReadonly">
+ <div class="detail-title">设备详情</div>
<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 class="label">设备信息</div>
+ <div class="val">{{ formData.deviceName }}</div>
+ </el-col>
+ <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>
+ <div class="val">{{ formData.deviceAtt }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">型号</div>
+ <div class="val">{{ formData.deviceModel }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">规格</div>
+ <div class="val">{{ formData.deviceSpecification }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">生产厂商</div>
+ <div class="val">{{ formData.manufacturer }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">来源</div>
+ <div class="val">{{ formData.source }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">用途</div>
+ <div class="val">{{ formData.purpose }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">所属部门</div>
+ <div class="val">{{ formData.belongDeptName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">负责人</div>
+ <div class="val">{{ formData.charger }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">联系电话</div>
+ <div class="val">{{ formData.contactPhone }}</div>
+ </el-col>
+ </el-row>
+
+ <div class="detail-title">设备跟踪流转</div>
+ <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+ <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="outTarget" label="出库去向" />
+
+ <el-table-column prop="outTime" show-overflow-tooltip label="出库时间">
+ <template v-slot="{ row }">
+ {{ dayjs(row.outTime).format('YYYY-MM-DD') }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="purpose" label="用途" />
+ </el-table>
+ </div>
+
+ <div class="command-table-pagination">
+ <el-pagination popper-class="command-select-popper" v-model:current-page="searchParams.current"
+ v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" :total="total"
+ @change="getList" />
+ </div>
+ </div>
+ </div>
+
+ <el-form class="dialog-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 class="command-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-option
- v-for="item in dictObj.deviceType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-form-item label="设备类型" prop="deviceType">
+ <el-select class="command-select" popper-class="command-select-popper"
+ v-model="formData.deviceType" placeholder="请选择" clearable>
+ <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="fwDeviceDTO.deviceAtt">
- <el-select v-model="formData.fwDeviceDTO.deviceAtt" placeholder="请选择" clearable>
- <el-option
- v-for="item in dictObj.deviceAtt"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <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">
+ <el-form-item label="设备属性" prop="deviceAtt">
+ <el-select class="command-select" popper-class="command-select-popper"
+ v-model="formData.deviceAtt" placeholder="请选择" clearable>
+ <el-option v-for="item in dictObj.deviceAtt" :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="fwDeviceDTO.deviceModel">
- <el-input v-model="formData.fwDeviceDTO.deviceModel" maxlength="50" placeholder="请输入" clearable />
+ <el-form-item label="型号" prop="deviceModel">
+ <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="fwDeviceDTO.deviceSpecification">
- <el-input
- v-model="formData.fwDeviceDTO.deviceSpecification"
- maxlength="50"
- placeholder="请输入"
- clearable
- />
+ <el-form-item label="规格" prop="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="fwDeviceDTO.manufacturer">
- <el-input v-model="formData.fwDeviceDTO.manufacturer" maxlength="50" placeholder="请输入" clearable />
+ <el-form-item label="生产厂商" prop="manufacturer">
+ <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="stockOutDestination">
- <el-input v-model="formData.stockOutDestination" maxlength="50" placeholder="请输入" clearable />
+ <el-form-item label="来源" prop="source">
+ <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="fwDeviceDTO.source">
- <el-input v-model="formData.fwDeviceDTO.source" maxlength="50" placeholder="请输入" clearable />
+ <el-form-item label="用途" prop="purpose">
+ <el-input class="command-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 label="所属部门" prop="belongDept">
+ <el-tree-select class="command-select" popper-class="command-tree-select-popper"
+ v-model="formData.belongDept" node-key="id" :data="deptTree" :props="treeProps"
+ check-strictly @change="belongDeptChange" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="所属部门" prop="fwDeviceDTO.ownerDept">
- <el-tree-select
- v-model="formData.fwDeviceDTO.ownerDept"
- node-key="id"
- :data="deptTree"
- :props="treeProps"
- check-strictly
- @change="getUserList"
- 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 class="command-select" popper-class="command-select-popper"
+ 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 class="command-input" v-model="formData.contactPhone" maxlength="50" placeholder="请输入"
+ clearable />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
- <el-button @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
- <el-button
- v-if="!dialogReadonly"
- type="primary"
- :loading="submitting"
- :disabled="submitting"
- @click="handleSubmit"
- >
- 确定
+ <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消'
+ }}</el-button>
+ <el-button color="#284FE3" v-if="!dialogReadonly" type="primary" :loading="submitting"
+ :disabled="submitting" @click="handleSubmit">
+ 保存
</el-button>
</template>
</el-dialog>
</template>
<script setup>
+import dayjs from 'dayjs'
+
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
import { getUserListApi } from '@/api/system/user'
-import { fieldRules } from '@ztzf/utils'
+import { contactPhoneRules, fieldRules, getDictLabel } from '@ztzf/utils'
+import { fwDeviceTrackPageApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
const initForm = () => ({
- 'fwDeviceDTO': {
- 'deviceAtt': '',
- 'deviceModel': '',
- 'deviceName': '',
- 'deviceSpecification': '',
- 'deviceType': '',
- 'manufacturer': '',
- 'remark': '',
- 'source': '',
- },
- 'fwDeviceTrackDTO': {
- 'charger': '',
- 'purpose': '',
- 'contactPhone': '',
- 'deptName': '',
- 'outTarget': '',
- 'outTime': '',
- },
+ belongDept: '', // 所属部门
+ charger: '', // 负责人
+ contactPhone: '', // 联系电话
+ deviceAtt: '', // 设备属性
+ deviceType: '', // 设备类型
+ deviceSn: '', // 设备编码
+ 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')
const emit = defineEmits(['success'])
+const route = useRoute()
const formRef = ref(null) // 表单实例
const formData = ref(initForm()) // 表单数据
const visible = ref(false) // 弹框显隐
@@ -171,40 +235,58 @@
const rules = {
deviceName: fieldRules(true, 50),
- deviceType: fieldRules(true, 0),
- deviceAtt: fieldRules(true, 0),
+ deviceType: fieldRules(true),
+ deviceSn: fieldRules(true, 50),
+ 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: contactPhoneRules(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() {
+function handleCancel () {
visible.value = false
}
// 提交新增/编辑
-async function handleSubmit() {
+async function handleSubmit () {
const isValid = await formRef.value?.validate().catch(() => false)
if (!isValid) return
submitting.value = true
+
+ let deviceSet = {}
+
try {
- await fwDeviceSubmitApi(formData.value)
+ const actionText = dialogMode.value === 'add' ? '建档' : '编辑'
+ deviceSet = dialogMode.value === 'add' ? { status: 0 } : {}
+ await fwDeviceSubmitApi({
+ ...formData.value,
+ ...deviceSet
+ })
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '设备出入库'}-${actionText}`,
+ type: 1
+ })
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
emit('success')
@@ -214,26 +296,41 @@
}
// 加载详情
-async function loadDetail() {
+async function loadDetail () {
if (!formData.value.id) return
const res = await fwDeviceDetailApi({ id: formData.value.id })
formData.value = res?.data?.data ?? {}
}
// 关闭后重置
-function handleClosed() {
+function handleClosed () {
formData.value = initForm()
+}
+const total = ref(0) // 总条数
+const loading = ref(true) // 列表加载中
+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 } = {}) {
+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