From 3ec8d3625e6fb7614e2ec4bb02ed99a3cdf4cdb7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 12 Feb 2026 11:28:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
index 0e42fdb..7e3ef76 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
@@ -39,7 +39,7 @@
<div class="label">报废时间</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>
@@ -50,7 +50,7 @@
</el-row>
</div>
<template #footer>
- <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+ <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
</template>
</el-dialog>
</template>
--
Gitblit v1.9.3