From d501430ad87bbd14680f080bf49b383aae251873 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 20 Jan 2026 16:23:51 +0800
Subject: [PATCH] feat:报废时间相关调整
---
applications/drone-command/src/views/basicManage/deviceScrap/index.vue | 6 +++++-
applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue | 5 +++--
applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue | 14 ++------------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
index b97ca68..0e42fdb 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
@@ -21,7 +21,7 @@
</el-col>
<el-col :span="12">
<div class="label">入库时间</div>
- <div class="val">{{ formData.createTime }}</div>
+ <div class="val">{{dayjs(formData.createTime).format('YYYY-MM-DD')}}</div>
</el-col>
<el-col :span="12">
<div class="label">来源</div>
@@ -37,7 +37,7 @@
</el-col>
<el-col :span="12">
<div class="label">报废时间</div>
- <div class="val">{{ formData.scrapTime }}</div>
+ <div class="val">{{dayjs(formData.scrapTime).format('YYYY-MM-DD')}}</div>
</el-col>
<el-col :span="24">
<div class="label">报废原因</div>
@@ -59,6 +59,7 @@
import { computed, ref } from 'vue'
import { getDictLabel } from '@ztzf/utils'
import { fwDeviceScrapDetailApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
+import dayjs from 'dayjs'
const initForm = () => ({})
const emit = defineEmits(['success'])
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
index 7bd6f96..cf1553e 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
@@ -61,7 +61,11 @@
</el-table-column>
<el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
<el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
- <el-table-column prop="createTime" show-overflow-tooltip label="入库时间" />
+ <el-table-column prop="createTime" show-overflow-tooltip label="入库时间">
+ <template v-slot="{ row }">
+ {{dayjs(row.scrapTime).format('YYYY-MM-DD')}}
+ </template>
+ </el-table-column>
<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="负责人" />
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
index caea697..69323a6 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
@@ -13,17 +13,6 @@
<el-input class="command-input" v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="报废时间" prop="scrapTime">
- <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
- v-model="formData.scrapTime"
- type="datetime"
- placeholder="选择日期"
- value-format="YYYY-MM-DD HH:mm:ss"
- clearable
- />
- </el-form-item>
- </el-col>
</el-row>
</el-form>
<template #footer>
@@ -47,6 +36,7 @@
import { ElMessage } from 'element-plus'
import { fieldRules } from '@ztzf/utils'
import { fwDeviceScrapSaveApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
+import dayjs from 'dayjs'
const initForm = () => ({
deviceId: '', // 设备ID
@@ -74,7 +64,6 @@
const rules = {
scrapReason: fieldRules(true, 200),
disposeWay: fieldRules(true, 200),
- scrapTime: fieldRules(true),
}
// 关闭弹框
@@ -88,6 +77,7 @@
if (!isValid) return
submitting.value = true
try {
+ formData.value.scrapTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
await fwDeviceScrapSaveApi(formData.value)
ElMessage.success('报废成功')
visible.value = false
--
Gitblit v1.9.3