修改时间
This commit is contained in:
@@ -11,15 +11,15 @@
|
|||||||
class="table-com-search-form"
|
class="table-com-search-form"
|
||||||
:label-width="90"
|
:label-width="90"
|
||||||
>
|
>
|
||||||
<slot name="select"></slot>
|
|
||||||
<el-form-item label="日期" v-if="datePicker">
|
<el-form-item label="日期" v-if="datePicker">
|
||||||
<DatePicker v-model="date" @change="dateChange"></DatePicker>
|
<DatePicker fef="Picker"></DatePicker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<slot name="select"></slot>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
</transition>
|
</transition>
|
||||||
<div class="table-header ba-scroll-style">
|
<div class="table-header ba-scroll-style">
|
||||||
<div style="flex: 1; height: 32px; overflow: hidden">
|
<div style="flex: 1; height: 32px; overflow: hidden">
|
||||||
<el-form
|
<el-form
|
||||||
v-show="!showSelect"
|
v-show="!showSelect"
|
||||||
id="header-form"
|
id="header-form"
|
||||||
@@ -30,9 +30,11 @@
|
|||||||
class="table-com-search-form2"
|
class="table-com-search-form2"
|
||||||
:label-width="100"
|
:label-width="100"
|
||||||
>
|
>
|
||||||
|
|
||||||
<slot name="select"></slot>
|
<slot name="select"></slot>
|
||||||
|
|
||||||
<el-form-item label="日期" v-if="datePicker">
|
<el-form-item label="日期" v-if="datePicker">
|
||||||
<DatePicker v-model="date" @change="dateChange"></DatePicker>
|
<DatePicker ref="Picker"></DatePicker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -58,6 +60,7 @@ import { mainHeight } from '@/utils/layout'
|
|||||||
|
|
||||||
const tableStore = inject('tableStore') as TableStore
|
const tableStore = inject('tableStore') as TableStore
|
||||||
const tableHeader = ref()
|
const tableHeader = ref()
|
||||||
|
const Picker = ref()
|
||||||
const date = ref([
|
const date = ref([
|
||||||
window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd'),
|
window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd'),
|
||||||
window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
|
window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
|
||||||
@@ -71,8 +74,8 @@ const props = withDefaults(defineProps<Props>(), {
|
|||||||
datePicker: false
|
datePicker: false
|
||||||
})
|
})
|
||||||
if (props.datePicker) {
|
if (props.datePicker) {
|
||||||
tableStore.table.params.searchBeginTime = date.value[0]
|
// tableStore.table.params.searchBeginTime = Picker.value.timeValue[0]
|
||||||
tableStore.table.params.searchEndTime = date.value[1]
|
// tableStore.table.params.searchEndTime = Picker.value.timeValue[1]
|
||||||
}
|
}
|
||||||
// 动态计算table高度
|
// 动态计算table高度
|
||||||
const resizeObserver = new ResizeObserver(entries => {
|
const resizeObserver = new ResizeObserver(entries => {
|
||||||
@@ -82,10 +85,12 @@ const resizeObserver = new ResizeObserver(entries => {
|
|||||||
})
|
})
|
||||||
const showUnfoldButton = ref(false)
|
const showUnfoldButton = ref(false)
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
tableStore.table.params.searchBeginTime = Picker.value.timeValue[0]
|
||||||
|
tableStore.table.params.searchEndTime = Picker.value.timeValue[1]
|
||||||
nextTick(() => {
|
nextTick(() => {
|
||||||
resizeObserver.observe(tableHeader.value)
|
resizeObserver.observe(tableHeader.value)
|
||||||
const dom = document.getElementById('header-form')
|
const dom = document.getElementById('header-form')
|
||||||
console.log(dom.offsetHeight,'123123')
|
console.log(dom.offsetHeight, '123123')
|
||||||
if (dom.offsetHeight > 50) {
|
if (dom.offsetHeight > 50) {
|
||||||
showUnfoldButton.value = true
|
showUnfoldButton.value = true
|
||||||
}
|
}
|
||||||
@@ -107,15 +112,19 @@ const showSelectChange = () => {
|
|||||||
handlerHeight()
|
handlerHeight()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
const onComSearch = () => {
|
const onComSearch = async () => {
|
||||||
tableStore.onTableAction('search', {})
|
console.log('时间1233123')
|
||||||
|
|
||||||
|
tableStore.table.params.searchBeginTime = Picker.value.timeValue[0]
|
||||||
|
tableStore.table.params.searchEndTime = Picker.value.timeValue[1]
|
||||||
|
await tableStore.onTableAction('search', {})
|
||||||
}
|
}
|
||||||
const onResetForm = () => {
|
const onResetForm = () => {
|
||||||
tableStore.onTableAction('reset', {})
|
tableStore.onTableAction('reset', {})
|
||||||
}
|
}
|
||||||
const dateChange = () => {
|
const dateChange = () => {
|
||||||
tableStore.table.params.searchBeginTime = date.value[0]
|
// tableStore.table.params.searchBeginTime = date.value[0]
|
||||||
tableStore.table.params.searchEndTime = date.value[1]
|
// tableStore.table.params.searchEndTime = date.value[1]
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user