From 4dcf21fb09e5fc5dd974cc20ec1e2f3baaef3924 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 16 Jan 2026 14:48:09 +0800
Subject: [PATCH] feat: 细节调整

---
 applications/drone-command/src/views/basicManage/deviceScrap/index.vue |   75 +++++++++++++++++++++++++++----------
 1 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
index d843ada..7ab4213 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
@@ -2,22 +2,45 @@
 	<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-input
+					class="ztzf-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-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-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-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>
 
 			<el-form-item class="history-search-actions">
@@ -42,7 +65,11 @@
 					<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 label="操作" class-name="operation-btns">
@@ -54,9 +81,14 @@
 			</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" />
+				<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>
 		</div>
 
@@ -73,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: '', // 设备名称
@@ -106,7 +139,7 @@
 provide('planCycleOptions', planCycleOptions)
 
 // 获取列表
-async function getList () {
+async function getList() {
 	loading.value = true
 	try {
 		const res = await fwDeviceScrapPageApi(searchParams.value)
@@ -118,43 +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 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