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/deviceStock/DeviceScrapDiaLog.vue | 17 ++++-------------
1 files changed, 4 insertions(+), 13 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..69323a6 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">
@@ -10,17 +11,6 @@
<el-col :span="24">
<el-form-item label="处置方式" prop="disposeWay">
<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>
@@ -46,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
@@ -73,7 +64,6 @@
const rules = {
scrapReason: fieldRules(true, 200),
disposeWay: fieldRules(true, 200),
- scrapTime: fieldRules(true),
}
// 关闭弹框
@@ -87,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