From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
index b955fba..cb60414 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
@@ -1,6 +1,6 @@
<template>
- <el-dialog class="ztzf-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]" @closed="handleClosed"
- destroy-on-close>
+ <el-dialog class="command-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]" @closed="handleClosed"
+ destroy-on-close :close-on-click-modal="false">
<div class="detail-container" v-if="dialogReadonly">
<el-row>
<el-col :span="12">
@@ -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,9 +37,9 @@
</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">
+ <el-col :span="12">
<div class="label">报废原因</div>
<div class="val">{{ formData.scrapReason }}</div>
</el-col>
@@ -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'])
--
Gitblit v1.9.3