From 98ff0df343bd4e5d2d5e138a02c6db2b7fa9696b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 27 Jan 2026 10:23:03 +0800
Subject: [PATCH] feat:角色权限弹窗配置页面,调整

---
 applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
index 456a8a0..ad4958c 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
@@ -1,5 +1,6 @@
 <template>
-	<el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
+	<el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close
+		:close-on-click-modal="false">
 		<el-form class="dialog-form" ref="formRef" :model="formData" :rules="rules" label-width="100px">
 			<el-row>
 				<el-col :span="24">
@@ -12,21 +13,10 @@
 						<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>
-			<el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+			<el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
 			<el-button
 				v-if="!dialogReadonly"
 				type="primary"
@@ -46,6 +36,9 @@
 import { ElMessage } from 'element-plus'
 import { fieldRules } from '@ztzf/utils'
 import { fwDeviceScrapSaveApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
+import dayjs from 'dayjs'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
 
 const initForm = () => ({
 	deviceId: '', // 设备ID
@@ -59,6 +52,7 @@
 const visible = ref(false) // 弹框显隐
 const dialogMode = ref('add') // 弹框模式
 const submitting = ref(false)
+const route = useRoute()
 const dialogReadonly = computed(() => dialogMode.value === 'view')
 const dialogTitle = computed(() => {
 	if (dialogMode.value === 'edit') {
@@ -73,7 +67,6 @@
 const rules = {
 	scrapReason: fieldRules(true, 200),
 	disposeWay: fieldRules(true, 200),
-	scrapTime: fieldRules(true),
 }
 
 // 关闭弹框
@@ -87,7 +80,13 @@
 	if (!isValid) return
 	submitting.value = true
 	try {
+		formData.value.scrapTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 		await fwDeviceScrapSaveApi(formData.value)
+		saveOperationLog({
+			requestUri: route.path,
+			title: `${route.name || '设备出入库'}-报废`,
+			type: 1
+		})
 		ElMessage.success('报废成功')
 		visible.value = false
 		emit('success')

--
Gitblit v1.9.3