|
@@ -123,8 +123,15 @@
|
|
|
<el-dialog title="选择导出时间范围" :close-on-click-modal="false" draggable width="600px" append-to-body
|
|
<el-dialog title="选择导出时间范围" :close-on-click-modal="false" draggable width="600px" append-to-body
|
|
|
v-model="exportVisible" @close="closeExportDialog" top="30vh">
|
|
v-model="exportVisible" @close="closeExportDialog" top="30vh">
|
|
|
<el-form ref="exportFormRef" :model="exportForm" label-width="160px" @submit.native.prevent>
|
|
<el-form ref="exportFormRef" :model="exportForm" label-width="160px" @submit.native.prevent>
|
|
|
- <el-form-item label="选择导出时间范围:" prop="dateRange"
|
|
|
|
|
- :rules="[{ required: true, type: 'array', message: '请选择导出时间范围', trigger: 'change' }]">
|
|
|
|
|
|
|
+ <el-form-item label="" prop="dateRange">
|
|
|
|
|
+ <template #label>
|
|
|
|
|
+ <el-tooltip class="box-item" effect="dark" content="如果未选择时间范围,则默认导出全部数据" placement="bottom">
|
|
|
|
|
+ <span>
|
|
|
|
|
+ 选择导出时间范围:
|
|
|
|
|
+ </span>
|
|
|
|
|
+ </el-tooltip>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ <!-- :rules="[{ required: true, type: 'array', message: '请选择导出时间范围', trigger: 'change' }]" -->
|
|
|
<el-date-picker placement="bottom-start" format="YYYY-MM-DD HH:mm:ss"
|
|
<el-date-picker placement="bottom-start" format="YYYY-MM-DD HH:mm:ss"
|
|
|
value-format="YYYY-MM-DD HH:mm:ss" v-model="exportForm.dateRange" type="datetimerange"
|
|
value-format="YYYY-MM-DD HH:mm:ss" v-model="exportForm.dateRange" type="datetimerange"
|
|
|
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%">
|
|
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%">
|
|
@@ -333,12 +340,12 @@ export default {
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
submitExport() {
|
|
submitExport() {
|
|
|
- this.$refs.exportFormRef.validate((valid) => {
|
|
|
|
|
- if (!valid) {
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
- this.doExport()
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ // this.$refs.exportFormRef.validate((valid) => {
|
|
|
|
|
+ // if (!valid) {
|
|
|
|
|
+ // return
|
|
|
|
|
+ // }
|
|
|
|
|
+ this.doExport()
|
|
|
|
|
+ // })
|
|
|
},
|
|
},
|
|
|
doExport() {
|
|
doExport() {
|
|
|
const options = {
|
|
const options = {
|