From d0bb243cc0ed63ee5133a5135a93dc3043077549 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 09 Jan 2026 11:22:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 80 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 313e70d..f862525 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -1,6 +1,58 @@
<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">
+ <el-row>
+ <el-col :span="12">
+ <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.belongDept }}</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>
+ <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">
@@ -101,9 +153,10 @@
<script setup>
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
-import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { fwDeviceDetailApi, fwDevicePageApi, 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 = () => ({
belongDept: '', // 所属部门
@@ -122,6 +175,12 @@
label: 'name',
children: 'children',
}
+
+const initSearchParams = () => ({
+ current: 1, // 当前页
+ size: 10, // 每页大小
+})
+const searchParams = ref(initSearchParams())
const dictObj = inject('dictObj')
const deptTree = inject('deptTree')
@@ -197,6 +256,20 @@
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 } = {}) {
@@ -207,6 +280,7 @@
formData.value = initForm()
} else {
await loadDetail()
+ getList()
}
}
--
Gitblit v1.9.3