From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
index 3001654..e9355b7 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
@@ -1,22 +1,22 @@
<template>
- <el-dialog v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
- <el-form ref="formRef" :model="formData" :rules="rules" label-width="100px">
+ <el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
+ <el-form class="dialog-form" ref="formRef" :model="formData" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
<el-form-item label="报废原因" prop="scrapReason">
- <el-input v-model="formData.scrapReason" maxlength="200" type="textarea" placeholder="请输入" clearable />
+ <el-input class="command-data-cockpit-search-input" v-model="formData.scrapReason" maxlength="200" type="textarea" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="处置方式" prop="disposeWay">
- <el-input v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
+ <el-input class="command-data-cockpit-search-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
+ <el-date-picker class="command-data-cockpit-date-picker" popper-class="command-data-cockpit-date-picker-popper"
v-model="formData.scrapTime"
- type="date"
+ type="datetime"
placeholder="选择日期"
value-format="YYYY-MM-DD HH:mm:ss"
clearable
@@ -26,10 +26,11 @@
</el-row>
</el-form>
<template #footer>
- <el-button @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+ <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
<el-button
v-if="!dialogReadonly"
type="primary"
+ color="#284FE3"
:loading="submitting"
:disabled="submitting"
@click="handleSubmit"
@@ -87,7 +88,7 @@
submitting.value = true
try {
await fwDeviceScrapSaveApi(formData.value)
- ElMessage.success(dialogMode.value === 'add' ? '出库成功' : '更新成功')
+ ElMessage.success('报废成功')
visible.value = false
emit('success')
} finally {
--
Gitblit v1.9.3