From 40c2702c3da24d9d9fda6bd63894c3206779f812 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 17 Jan 2026 16:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceScrap/index.vue | 100 +++++++++++++++++++++++++++++++------------------
1 files changed, 63 insertions(+), 37 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
index 481235a..8c17107 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
@@ -1,23 +1,46 @@
<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
- <el-form-item label="名称" prop="deviceName">
- <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
- clearable @clear="handleSearch" />
+ <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
+ <el-form-item label="设备名称" prop="deviceName">
+ <el-input
+ class="command-data-cockpit-search-input"
+ v-model="searchParams.deviceName"
+ placeholder="请输入"
+ clearable
+ @clear="handleSearch"
+ />
</el-form-item>
- <el-form-item label="类型" prop="deviceType">
- <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
- v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
- <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-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
+ v-model="searchParams.deviceType"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ >
+ <el-option
+ v-for="item in dictObj.deviceType"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey"
+ />
</el-select>
</el-form-item>
- <el-form-item label="部门" prop="belongDept">
- <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-tree-select-popper"
- v-model="searchParams.belongDept" :data="deptTree" :props="treeProps" node-key="id" check-strictly
- clearable @change="handleSearch" />
+ <el-form-item label="所属部门" prop="belongDept">
+ <el-tree-select
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-tree-select-popper"
+ v-model="searchParams.belongDept"
+ :data="deptTree"
+ :props="treeProps"
+ node-key="id"
+ check-strictly
+ clearable
+ @change="handleSearch"
+ />
</el-form-item>
<el-form-item class="history-search-actions">
@@ -26,10 +49,9 @@
</el-form-item>
</el-form>
- <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
- <div class="ztzf-table-content ztzf-table-content-bg">
- <el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" />
+ <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+ <div class="command-table-content command-table-content-bg">
+ <el-table class="command-data-cockpit-table" :data="list">
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
<el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
<el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
@@ -41,11 +63,15 @@
<el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
<el-table-column prop="createTime" show-overflow-tooltip label="入库时间" />
<el-table-column prop="source" show-overflow-tooltip label="来源" />
+ <el-table-column prop="belongDeptName" show-overflow-tooltip label="所属部门" />
<el-table-column prop="charger" show-overflow-tooltip label="负责人" />
- <el-table-column prop="scrapTime" show-overflow-tooltip label="报废时间" />
+ <el-table-column prop="scrapTime" show-overflow-tooltip label="报废时间">
+ <template v-slot="{ row }">
+ {{dayjs(row.scrapTime).format('YYYY-MM-DD')}}
+ </template>
+ </el-table-column>
<el-table-column prop="scrapReason" show-overflow-tooltip label="报废原因" />
<el-table-column prop="disposeWay" show-overflow-tooltip label="处置方式" />
- <el-table-column prop="maintainReminder" show-overflow-tooltip label="维护提醒" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
@@ -54,10 +80,15 @@
</el-table>
</div>
- <div class="ztzf-table-pagination">
- <el-pagination popper-class="ztzf-data-cockpit-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 class="command-table-pagination">
+ <el-pagination
+ popper-class="command-data-cockpit-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>
@@ -74,6 +105,7 @@
import FormDiaLog from './FormDiaLog.vue'
import MaintenanceDiaLog from '@/views/basicManage/maintainRecord/MaintenanceDiaLog.vue'
import { fwDeviceScrapPageApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
+import dayjs from 'dayjs'
const initSearchParams = () => ({
deviceName: '', // 设备名称
@@ -86,7 +118,6 @@
const total = ref(0) // 总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
-const selectedIds = ref([]) // 勾选的ID列表
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const maintenanceDialogRef = ref(null) // 弹框实例
@@ -108,7 +139,7 @@
provide('planCycleOptions', planCycleOptions)
// 获取列表
-async function getList () {
+async function getList() {
loading.value = true
try {
const res = await fwDeviceScrapPageApi(searchParams.value)
@@ -120,48 +151,43 @@
}
// 查询
-function handleSearch () {
+function handleSearch() {
searchParams.value.current = 1
getList()
}
// 重置查询
-function resetForm () {
+function resetForm() {
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
getList()
}
// 查看
-function handleView (row) {
+function handleView(row) {
dialogRef.value?.open({ mode: 'view', row: { ...row } })
}
-// 勾选值设置
-function handleSelectionChange (rows) {
- selectedIds.value = rows.map(item => item.id)
-}
-
// 获取字典
-function getDictList () {
+function getDictList() {
getDictionaryByCode('deviceType,deviceAtt').then(res => {
dictObj.value = res.data.data
})
}
// 获取部门树
-function getDeptTreeFun () {
+function getDeptTreeFun() {
getDeptTree().then(res => {
deptTree.value = res.data.data
})
}
// 新增
-function handleAdd () {
+function handleAdd() {
dialogRef.value?.open({ mode: 'add' })
}
-function getPlanCycleLabel (row) {
+function getPlanCycleLabel(row) {
const item = planCycleOptions.find(option => option.value === row.planCycleType)
return item?.label + '-' + row.planCycleValue.join(',')
}
--
Gitblit v1.9.3