Commit 8f9889bb by yuzhenWang

修改页面查询不对bug

parent 226ccd0a
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
:type="btn.type || 'primary'" :type="btn.type || 'primary'"
:icon="btn.icon" :icon="btn.icon"
:size="btn.size || 'default'" :size="btn.size || 'default'"
@click="handleButtonClick(btn)" @click.stop="handleButtonClick(btn)"
:disabled="btn.disabled" :disabled="btn.disabled"
:loading="btn.loading" :loading="btn.loading"
:class="btn.customClass" :class="btn.customClass"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
:type="btn.type || 'primary'" :type="btn.type || 'primary'"
:icon="btn.icon" :icon="btn.icon"
:size="btn.size || 'default'" :size="btn.size || 'default'"
@click="handleButtonClick(btn)" @click.stop="handleButtonClick(btn)"
:disabled="btn.disabled" :disabled="btn.disabled"
:loading="btn.loading" :loading="btn.loading"
:class="btn.customClass" :class="btn.customClass"
...@@ -316,6 +316,9 @@ const checkConditions = () => { ...@@ -316,6 +316,9 @@ const checkConditions = () => {
// 处理按钮点击 // 处理按钮点击
const handleButtonClick = async (btn: OperationButton) => { const handleButtonClick = async (btn: OperationButton) => {
console.log('====================================')
console.log('按钮')
console.log('====================================')
// 触发通用按钮点击事件 // 触发通用按钮点击事件
emit('btn-click', btn) emit('btn-click', btn)
...@@ -362,6 +365,9 @@ const handleSizeChange = (size: number) => { ...@@ -362,6 +365,9 @@ const handleSizeChange = (size: number) => {
const handleCurrentChange = (page: number) => { const handleCurrentChange = (page: number) => {
currentPage.value = page currentPage.value = page
console.log('====================================')
console.log('当前页')
console.log('====================================')
emit('current-change', page) emit('current-change', page)
} }
......
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
style="width: 100%" style="width: 100%"
v-loading="loading" v-loading="loading"
> >
<el-table-column type="selection" width="40" fixed="left"/> <el-table-column type="selection" width="40" fixed="left" />
<el-table-column prop="payableNo" label="业务编号" width="150" fixed="left"/> <el-table-column prop="payableNo" label="业务编号" width="150" fixed="left" />
<el-table-column prop="status" label="出账状态" width="160" sortable> <el-table-column prop="status" label="出账状态" width="160" sortable>
<template #default="{ row }"> <template #default="{ row }">
{{ selectDictLabel(csf_fortune_status, row.status) }} {{ selectDictLabel(csf_fortune_status, row.status) }}
...@@ -1313,6 +1313,7 @@ const handleReset = () => { ...@@ -1313,6 +1313,7 @@ const handleReset = () => {
console.log('表单已重置') console.log('表单已重置')
} }
const handleQuery = async () => { const handleQuery = async () => {
currentPage.value = 1
const params = searchFormRef.value.getFormData() const params = searchFormRef.value.getFormData()
loadTableData(params) loadTableData(params)
} }
......
...@@ -962,8 +962,9 @@ const handleReset = () => { ...@@ -962,8 +962,9 @@ const handleReset = () => {
console.log('表单已重置') console.log('表单已重置')
} }
const handleQuery = async () => { const handleQuery = async () => {
currentPage.value = 1
const params = searchFormRef.value.getFormData() const params = searchFormRef.value.getFormData()
console.log('父组件发起查询:', params) console.log('查询:', params)
loadTableData(params) loadTableData(params)
} }
...@@ -1053,6 +1054,7 @@ const handleSizeChange = val => { ...@@ -1053,6 +1054,7 @@ const handleSizeChange = val => {
} }
const handleCurrentChange = val => { const handleCurrentChange = val => {
currentPage.value = val currentPage.value = val
loadTableData() loadTableData()
} }
// 表格数据 // 表格数据
......
...@@ -849,6 +849,7 @@ const getStatusType = status => { ...@@ -849,6 +849,7 @@ const getStatusType = status => {
// 查询 // 查询
const handleQuery = () => { const handleQuery = () => {
currentPage.value = 1
const params = searchFormRef.value.getFormData() const params = searchFormRef.value.getFormData()
console.log('父组件发起查询:', params) console.log('父组件发起查询:', params)
clearAllSelection() clearAllSelection()
......
...@@ -1019,6 +1019,7 @@ const handleReset = () => { ...@@ -1019,6 +1019,7 @@ const handleReset = () => {
} }
const handleQuery = async () => { const handleQuery = async () => {
currentPage.value = 1
loadTableData() loadTableData()
} }
......
...@@ -130,6 +130,7 @@ getList() ...@@ -130,6 +130,7 @@ getList()
// 查询 // 查询
const handleQuery = () => { const handleQuery = () => {
currentPage.value = 1
const params = searchFormRef.value.getFormData() const params = searchFormRef.value.getFormData()
console.log('父组件发起查询:', params) console.log('父组件发起查询:', params)
getList(params) getList(params)
......
...@@ -486,9 +486,9 @@ const searchConfig = ref([ ...@@ -486,9 +486,9 @@ const searchConfig = ref([
label: '保单号' label: '保单号'
}, },
{ {
type: 'daterange', type: 'monthrange',
prop: 'entryDate', prop: 'entryDate',
label: '入账(估)', label: '入账(估)',
startPlaceholder: '开始时间', startPlaceholder: '开始时间',
endPlaceholder: '结束时间' endPlaceholder: '结束时间'
}, },
...@@ -704,6 +704,7 @@ const handleReset = () => { ...@@ -704,6 +704,7 @@ const handleReset = () => {
} }
const handleQuery = () => { const handleQuery = () => {
currentPage.value = 1
loadTableData() loadTableData()
} }
const visibleDefaultButtons = ref(['add', 'export', 'reset', 'query']) const visibleDefaultButtons = ref(['add', 'export', 'reset', 'query'])
......
...@@ -386,6 +386,7 @@ const handleReset = () => { ...@@ -386,6 +386,7 @@ const handleReset = () => {
loadTableData() loadTableData()
} }
const handleQuery = async () => { const handleQuery = async () => {
currentPage.value = 1
const params = searchFormRef.value.getFormData() const params = searchFormRef.value.getFormData()
console.log('params', params) console.log('params', params)
......
...@@ -1250,6 +1250,7 @@ const handleReset = () => { ...@@ -1250,6 +1250,7 @@ const handleReset = () => {
} }
const handleQuery = async () => { const handleQuery = async () => {
const params = searchFormRef.value.getFormData() const params = searchFormRef.value.getFormData()
currentPage.value = 1
console.log('params', params) console.log('params', params)
// let msg = validateEnglish2(params.eng) // let msg = validateEnglish2(params.eng)
// if (params.eng && msg) { // if (params.eng && msg) {
......
...@@ -346,6 +346,7 @@ const handleReset = () => { ...@@ -346,6 +346,7 @@ const handleReset = () => {
loadTableData() loadTableData()
} }
const handleQuery = async () => { const handleQuery = async () => {
currentPage.value = 1
loadTableData() loadTableData()
} }
const visibleDefaultButtons = ref(['reset', 'query']) const visibleDefaultButtons = ref(['reset', 'query'])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment