gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】人员、机构等选择器分页问题修复

pull/124/head
小诺 2023-06-29 23:51:25 +08:00 committed by 俞宝山
parent 5eb8ed8d1e
commit 82d4c4fe50
4 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
snowy-admin-web/src/components/Selector/orgSelectorPlus.vue
View File

@ -169,7 +169,7 @@
const dataIsConverterFlw = props.dataIsConverterFlw || false const dataIsConverterFlw = props.dataIsConverterFlw || false
// 分页相关 // 分页相关
const current = ref(0) // 当前页数 const current = ref(0) // 当前页数
const pageSize = ref(0) // 每页条数 const pageSize = ref(20) // 每页条数
const total = ref(0) // 数据总数 const total = ref(0) // 数据总数
// 打开弹框 // 打开弹框
@ -201,6 +201,7 @@
} }
}) })
} }
searchFormState.value.size = pageSize.value
loadData() loadData()
if (props.checkedOrgListApi) { if (props.checkedOrgListApi) {
if (isEmpty(recordIds.value)) { if (isEmpty(recordIds.value)) {
@ -223,7 +224,6 @@
pageLoading.value = true pageLoading.value = true
props.orgPageApi(searchFormState.value).then((data) => { props.orgPageApi(searchFormState.value).then((data) => {
current.value = data.current current.value = data.current
pageSize.value = data.size
total.value = data.total total.value = data.total
// 重置、赋值 // 重置、赋值
tableData.value = [] tableData.value = []
@ -241,11 +241,9 @@
} }
// pageSize改变回调分页事件 // pageSize改变回调分页事件
const paginationChange = (page, pageSize) => { const paginationChange = (page, pageSize) => {
const param = { searchFormState.value.current = page
current: page, searchFormState.value.size = pageSize
size: pageSize loadData()
}
loadData(param)
} }
const judge = () => { const judge = () => {
if (radioModel && selectedData.value.length > 0) { if (radioModel && selectedData.value.length > 0) {
@ -293,6 +291,7 @@
} }
// 点击树查询 // 点击树查询
const treeSelect = (selectedKeys) => { const treeSelect = (selectedKeys) => {
searchFormState.value.current = 0
if (selectedKeys.length > 0) { if (selectedKeys.length > 0) {
searchFormState.value.orgId = selectedKeys.toString() searchFormState.value.orgId = selectedKeys.toString()
} else { } else {
@ -329,7 +328,7 @@
tableRecordNum.value = 0 tableRecordNum.value = 0
tableData.value = [] tableData.value = []
current.value = 0 current.value = 0
pageSize.value = 0 pageSize.value = 20
total.value = 0 total.value = 0
selectedData.value = [] selectedData.value = []
visible.value = false visible.value = false

15
snowy-admin-web/src/components/Selector/posSelectorPlus.vue
View File

@ -169,7 +169,7 @@
const dataIsConverterFlw = props.dataIsConverterFlw || false const dataIsConverterFlw = props.dataIsConverterFlw || false
// 分页相关 // 分页相关
const current = ref(0) // 当前页数 const current = ref(0) // 当前页数
const pageSize = ref(0) // 每页条数 const pageSize = ref(20) // 每页条数
const total = ref(0) // 数据总数 const total = ref(0) // 数据总数
// 打开弹框 // 打开弹框
@ -202,6 +202,7 @@
} }
}) })
} }
searchFormState.value.size = pageSize.value
loadData() loadData()
if (props.checkedPosListApi) { if (props.checkedPosListApi) {
if (isEmpty(recordIds.value)) { if (isEmpty(recordIds.value)) {
@ -224,7 +225,6 @@
pageLoading.value = true pageLoading.value = true
props.posPageApi(searchFormState.value).then((data) => { props.posPageApi(searchFormState.value).then((data) => {
current.value = data.current current.value = data.current
pageSize.value = data.size
total.value = data.total total.value = data.total
// 重置、赋值 // 重置、赋值
tableData.value = [] tableData.value = []
@ -242,11 +242,9 @@
} }
// pageSize改变回调分页事件 // pageSize改变回调分页事件
const paginationChange = (page, pageSize) => { const paginationChange = (page, pageSize) => {
const param = { searchFormState.value.current = page
current: page, searchFormState.value.size = pageSize
size: pageSize loadData()
}
loadData(param)
} }
const judge = () => { const judge = () => {
if (radioModel && selectedData.value.length > 0) { if (radioModel && selectedData.value.length > 0) {
@ -294,6 +292,7 @@
} }
// 点击树查询 // 点击树查询
const treeSelect = (selectedKeys) => { const treeSelect = (selectedKeys) => {
searchFormState.value.current = 0
if (selectedKeys.length > 0) { if (selectedKeys.length > 0) {
searchFormState.value.orgId = selectedKeys.toString() searchFormState.value.orgId = selectedKeys.toString()
} else { } else {
@ -330,7 +329,7 @@
tableRecordNum.value = 0 tableRecordNum.value = 0
tableData.value = [] tableData.value = []
current.value = 0 current.value = 0
pageSize.value = 0 pageSize.value = 20
total.value = 0 total.value = 0
selectedData.value = [] selectedData.value = []
visible.value = false visible.value = false

19
snowy-admin-web/src/components/Selector/roleSelectorPlus.vue
View File

@ -199,7 +199,7 @@
const roleGlobal = props.roleGlobal const roleGlobal = props.roleGlobal
// 分页相关 // 分页相关
const current = ref(0) // 当前页数 const current = ref(0) // 当前页数
const pageSize = ref(0) // 每页条数 const pageSize = ref(20) // 每页条数
const total = ref(0) // 数据总数 const total = ref(0) // 数据总数
// 打开弹框 // 打开弹框
@ -242,6 +242,7 @@
} }
}) })
} }
searchFormState.value.size = pageSize.value
loadData() loadData()
if (props.checkedRoleListApi) { if (props.checkedRoleListApi) {
if (isEmpty(recordIds.value)) { if (isEmpty(recordIds.value)) {
@ -268,7 +269,6 @@
pageLoading.value = true pageLoading.value = true
props.rolePageApi(searchFormState.value).then((data) => { props.rolePageApi(searchFormState.value).then((data) => {
current.value = data.current current.value = data.current
pageSize.value = data.size
total.value = data.total total.value = data.total
// 重置、赋值 // 重置、赋值
tableData.value = [] tableData.value = []
@ -286,11 +286,9 @@
} }
// pageSize改变回调分页事件 // pageSize改变回调分页事件
const paginationChange = (page, pageSize) => { const paginationChange = (page, pageSize) => {
const param = { searchFormState.value.current = page
current: page, searchFormState.value.size = pageSize
size: pageSize loadData()
}
loadData(param)
} }
const judge = () => { const judge = () => {
if (radioModel && selectedData.value.length > 0) { if (radioModel && selectedData.value.length > 0) {
@ -338,6 +336,7 @@
} }
// 点击树查询 // 点击树查询
const treeSelect = (selectedKeys) => { const treeSelect = (selectedKeys) => {
searchFormState.value.current = 0
if (selectedKeys.length > 0) { if (selectedKeys.length > 0) {
if (selectedKeys[0] === 'GLOBAL') { if (selectedKeys[0] === 'GLOBAL') {
searchFormState.value.category = selectedKeys[0] searchFormState.value.category = selectedKeys[0]
@ -380,7 +379,7 @@
tableRecordNum.value = 0 tableRecordNum.value = 0
tableData.value = [] tableData.value = []
current.value = 0 current.value = 0
pageSize.value = 0 pageSize.value = 20
total.value = 0 total.value = 0
selectedData.value = [] selectedData.value = []
visible.value = false visible.value = false
@ -430,10 +429,10 @@
overflow: auto; overflow: auto;
} }
.cardTag { .cardTag {
margin-left: 10px; margin-left: 20px;
} }
.primarySele { .primarySele {
margin-right: 10px; margin-right: 20px;
} }
.ant-form-item { .ant-form-item {
margin-bottom: 0 !important; margin-bottom: 0 !important;

16
snowy-admin-web/src/components/Selector/userSelectorPlus.vue
View File

@ -169,7 +169,7 @@
const dataIsConverterFlw = props.dataIsConverterFlw || false const dataIsConverterFlw = props.dataIsConverterFlw || false
// 分页相关 // 分页相关
const current = ref(0) // 当前页数 const current = ref(0) // 当前页数
const pageSize = ref(0) // 每页条数 const pageSize = ref(20) // 每页条数
const total = ref(0) // 数据总数 const total = ref(0) // 数据总数
// 打开弹框 // 打开弹框
@ -202,6 +202,7 @@
} }
}) })
} }
searchFormState.value.size = pageSize.value
loadData() loadData()
if (props.checkedUserListApi) { if (props.checkedUserListApi) {
if (isEmpty(recordIds.value)) { if (isEmpty(recordIds.value)) {
@ -224,7 +225,7 @@
pageLoading.value = true pageLoading.value = true
props.userPageApi(searchFormState.value).then((data) => { props.userPageApi(searchFormState.value).then((data) => {
current.value = data.current current.value = data.current
pageSize.value = data.size // pageSize.value = data.size
total.value = data.total total.value = data.total
// 重置、赋值 // 重置、赋值
tableData.value = [] tableData.value = []
@ -242,11 +243,9 @@
} }
// pageSize改变回调分页事件 // pageSize改变回调分页事件
const paginationChange = (page, pageSize) => { const paginationChange = (page, pageSize) => {
const param = { searchFormState.value.current = page
current: page, searchFormState.value.size = pageSize
size: pageSize loadData()
}
loadData(param)
} }
const judge = () => { const judge = () => {
if (radioModel && selectedData.value.length > 0) { if (radioModel && selectedData.value.length > 0) {
@ -294,6 +293,7 @@
} }
// 点击树查询 // 点击树查询
const treeSelect = (selectedKeys) => { const treeSelect = (selectedKeys) => {
searchFormState.value.current = 0
if (selectedKeys.length > 0) { if (selectedKeys.length > 0) {
searchFormState.value.orgId = selectedKeys.toString() searchFormState.value.orgId = selectedKeys.toString()
} else { } else {
@ -330,7 +330,7 @@
tableRecordNum.value = 0 tableRecordNum.value = 0
tableData.value = [] tableData.value = []
current.value = 0 current.value = 0
pageSize.value = 0 pageSize.value = 20
total.value = 0 total.value = 0
selectedData.value = [] selectedData.value = []
visible.value = false visible.value = false