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/DeviceTrackDiaLog.vue | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue index 9b5a411..4e05934 100644 --- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue +++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue @@ -1,24 +1,25 @@ <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="12"> <el-form-item label="负责人" prop="charger"> - <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper" v-model="formData.charger" placeholder="请选择" clearable> + <el-select class="command-select" popper-class="command-select-popper" v-model="formData.charger" placeholder="请选择" clearable> <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" /> </el-select> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="联系电话" prop="contactPhone"> - <el-input class="command-data-cockpit-search-input" v-model="formData.contactPhone" maxlength="50" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.contactPhone" maxlength="50" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="出库去向" prop="outTarget"> <el-select - class="command-data-cockpit-select" - popper-class="command-data-cockpit-select-popper" + class="command-select" + popper-class="command-select-popper" v-model="formData.outTarget" placeholder="请选择" clearable @@ -29,7 +30,7 @@ </el-col> <el-col :span="12"> <el-form-item label="出库时间" prop="outTime"> - <el-date-picker class="command-data-cockpit-date-picker" popper-class="command-data-cockpit-date-picker-popper" + <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper" v-model="formData.outTime" type="date" placeholder="选择日期" @@ -40,7 +41,7 @@ </el-col> <el-col :span="12"> <el-form-item label="用途" prop="purpose"> - <el-input class="command-data-cockpit-search-input" v-model="formData.purpose" maxlength="50" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.purpose" maxlength="50" placeholder="请输入" clearable /> </el-form-item> </el-col> </el-row> -- Gitblit v1.9.3