1.移除查询二 日期范围必填校验
main
liuhr 2 years ago
parent 41ddb7a76a
commit d56d63a7b6

@ -25,9 +25,8 @@
</div> </div>
<!-- 搜索条件 --> <!-- 搜索条件 -->
<div class="col-xl-2 col-lg-2 col-sm-3"> <div class="col-xl-2 col-lg-2 col-sm-3">
<q-input dense label="日期范围" ref="rangDateRef" readonly outlined v-model="rangDateText" :rules="[ <!-- :rules="[ (val: string) => (val !== null && val !== '' && val !== undefined) || '请选择日期范围' ]" -->
(val: string) => (val !== null && val !== '' && val !== undefined) || '请选择日期范围', <q-input dense label="日期范围" ref="rangDateRef" readonly outlined v-model="rangDateText">
]">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]" <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]"
@ -175,7 +174,7 @@ const onRequest = (props: any) => {
const pagination = ref(new Pagination(new EquipmentRecord())); const pagination = ref(new Pagination(new EquipmentRecord()));
const getPage = () => { const getPage = () => {
rangDateRef.value.resetValidation(); // rangDateRef.value.resetValidation();
if (rangeDate.value) { if (rangeDate.value) {
pagination.value.data.begTime = rangeDate.value.from + ' 00:00:00'; pagination.value.data.begTime = rangeDate.value.from + ' 00:00:00';
pagination.value.data.endTime = rangeDate.value.to + ' 23:59:59'; pagination.value.data.endTime = rangeDate.value.to + ' 23:59:59';
@ -267,23 +266,23 @@ const wrapCsvValue = (val: any, formatFn: any) => {
// Excel // Excel
const equipmentNoTimeRecord = ref(); const equipmentNoTimeRecord = ref();
const exportTable = () => { const exportTable = () => {
rangDateRef.value.validate(); // rangDateRef.value.validate();
if (!rangDateRef.value.hasError) { // if (!rangDateRef.value.hasError) {
if (rangeDate.value) { if (rangeDate.value) {
let begTime = rangeDate.value.from + ' 00:00:00'; let begTime = rangeDate.value.from + ' 00:00:00';
let endTime = rangeDate.value.to + ' 23:59:59'; let endTime = rangeDate.value.to + ' 23:59:59';
const diff = date.getDateDiff(new Date(endTime), new Date(begTime), 'days') // //const diff = date.getDateDiff(new Date(endTime), new Date(begTime), 'days') //
// 30 // 30
if (diff > 30) { // if (diff > 30) {
Notify.create({ // Notify.create({
position: 'top', // position: 'top',
message: '日期范围不能大于30天', // message: '30',
icon: 'feedback', // icon: 'feedback',
color: 'negative', // color: 'negative',
}) // })
return // return
} // }
equipmentNoTimeRecord.value = new EquipmentNoTimeRecord(); equipmentNoTimeRecord.value = new EquipmentNoTimeRecord();
equipmentNoTimeRecord.value.begTime = begTime; equipmentNoTimeRecord.value.begTime = begTime;
equipmentNoTimeRecord.value.endTime = endTime; equipmentNoTimeRecord.value.endTime = endTime;
@ -370,7 +369,7 @@ const exportTable = () => {
Loading.hide(); Loading.hide();
}); });
}).onCancel(() => { }) }).onCancel(() => { })
} // }
} }

Loading…
Cancel
Save