From 40c2702c3da24d9d9fda6bd63894c3206779f812 Mon Sep 17 00:00:00 2001 From: chenyao <1219716595@qq.com> Date: Sat, 17 Jan 2026 16:46:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue index 49bb872..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 class="ztzf-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> <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 class="ztzf-data-cockpit-search-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 class="ztzf-data-cockpit-search-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 class="ztzf-data-cockpit-date-picker" popper-class="ztzf-data-cockpit-date-picker-popper" + <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 -- Gitblit v1.9.3