From 82d4c4fe5034e63fbd3877118a40c4c63bd8ce6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Thu, 29 Jun 2023 23:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E3=80=81=E6=9C=BA=E6=9E=84=E7=AD=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Selector/orgSelectorPlus.vue | 15 +++++++-------- .../components/Selector/posSelectorPlus.vue | 15 +++++++-------- .../components/Selector/roleSelectorPlus.vue | 19 +++++++++---------- .../components/Selector/userSelectorPlus.vue | 16 ++++++++-------- 4 files changed, 31 insertions(+), 34 deletions(-) diff --git a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue index 8790fb77..60c94c4d 100644 --- a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue @@ -169,7 +169,7 @@ const dataIsConverterFlw = props.dataIsConverterFlw || false // 分页相关 const current = ref(0) // 当前页数 - const pageSize = ref(0) // 每页条数 + const pageSize = ref(20) // 每页条数 const total = ref(0) // 数据总数 // 打开弹框 @@ -201,6 +201,7 @@ } }) } + searchFormState.value.size = pageSize.value loadData() if (props.checkedOrgListApi) { if (isEmpty(recordIds.value)) { @@ -223,7 +224,6 @@ pageLoading.value = true props.orgPageApi(searchFormState.value).then((data) => { current.value = data.current - pageSize.value = data.size total.value = data.total // 重置、赋值 tableData.value = [] @@ -241,11 +241,9 @@ } // pageSize改变回调分页事件 const paginationChange = (page, pageSize) => { - const param = { - current: page, - size: pageSize - } - loadData(param) + searchFormState.value.current = page + searchFormState.value.size = pageSize + loadData() } const judge = () => { if (radioModel && selectedData.value.length > 0) { @@ -293,6 +291,7 @@ } // 点击树查询 const treeSelect = (selectedKeys) => { + searchFormState.value.current = 0 if (selectedKeys.length > 0) { searchFormState.value.orgId = selectedKeys.toString() } else { @@ -329,7 +328,7 @@ tableRecordNum.value = 0 tableData.value = [] current.value = 0 - pageSize.value = 0 + pageSize.value = 20 total.value = 0 selectedData.value = [] visible.value = false diff --git a/snowy-admin-web/src/components/Selector/posSelectorPlus.vue b/snowy-admin-web/src/components/Selector/posSelectorPlus.vue index caa80d4e..1072bd65 100644 --- a/snowy-admin-web/src/components/Selector/posSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/posSelectorPlus.vue @@ -169,7 +169,7 @@ const dataIsConverterFlw = props.dataIsConverterFlw || false // 分页相关 const current = ref(0) // 当前页数 - const pageSize = ref(0) // 每页条数 + const pageSize = ref(20) // 每页条数 const total = ref(0) // 数据总数 // 打开弹框 @@ -202,6 +202,7 @@ } }) } + searchFormState.value.size = pageSize.value loadData() if (props.checkedPosListApi) { if (isEmpty(recordIds.value)) { @@ -224,7 +225,6 @@ pageLoading.value = true props.posPageApi(searchFormState.value).then((data) => { current.value = data.current - pageSize.value = data.size total.value = data.total // 重置、赋值 tableData.value = [] @@ -242,11 +242,9 @@ } // pageSize改变回调分页事件 const paginationChange = (page, pageSize) => { - const param = { - current: page, - size: pageSize - } - loadData(param) + searchFormState.value.current = page + searchFormState.value.size = pageSize + loadData() } const judge = () => { if (radioModel && selectedData.value.length > 0) { @@ -294,6 +292,7 @@ } // 点击树查询 const treeSelect = (selectedKeys) => { + searchFormState.value.current = 0 if (selectedKeys.length > 0) { searchFormState.value.orgId = selectedKeys.toString() } else { @@ -330,7 +329,7 @@ tableRecordNum.value = 0 tableData.value = [] current.value = 0 - pageSize.value = 0 + pageSize.value = 20 total.value = 0 selectedData.value = [] visible.value = false diff --git a/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue b/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue index 44723d07..b78592ed 100644 --- a/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue @@ -199,7 +199,7 @@ const roleGlobal = props.roleGlobal // 分页相关 const current = ref(0) // 当前页数 - const pageSize = ref(0) // 每页条数 + const pageSize = ref(20) // 每页条数 const total = ref(0) // 数据总数 // 打开弹框 @@ -242,6 +242,7 @@ } }) } + searchFormState.value.size = pageSize.value loadData() if (props.checkedRoleListApi) { if (isEmpty(recordIds.value)) { @@ -268,7 +269,6 @@ pageLoading.value = true props.rolePageApi(searchFormState.value).then((data) => { current.value = data.current - pageSize.value = data.size total.value = data.total // 重置、赋值 tableData.value = [] @@ -286,11 +286,9 @@ } // pageSize改变回调分页事件 const paginationChange = (page, pageSize) => { - const param = { - current: page, - size: pageSize - } - loadData(param) + searchFormState.value.current = page + searchFormState.value.size = pageSize + loadData() } const judge = () => { if (radioModel && selectedData.value.length > 0) { @@ -338,6 +336,7 @@ } // 点击树查询 const treeSelect = (selectedKeys) => { + searchFormState.value.current = 0 if (selectedKeys.length > 0) { if (selectedKeys[0] === 'GLOBAL') { searchFormState.value.category = selectedKeys[0] @@ -380,7 +379,7 @@ tableRecordNum.value = 0 tableData.value = [] current.value = 0 - pageSize.value = 0 + pageSize.value = 20 total.value = 0 selectedData.value = [] visible.value = false @@ -430,10 +429,10 @@ overflow: auto; } .cardTag { - margin-left: 10px; + margin-left: 20px; } .primarySele { - margin-right: 10px; + margin-right: 20px; } .ant-form-item { margin-bottom: 0 !important; diff --git a/snowy-admin-web/src/components/Selector/userSelectorPlus.vue b/snowy-admin-web/src/components/Selector/userSelectorPlus.vue index 37e2d1bb..62a76ebc 100644 --- a/snowy-admin-web/src/components/Selector/userSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/userSelectorPlus.vue @@ -169,7 +169,7 @@ const dataIsConverterFlw = props.dataIsConverterFlw || false // 分页相关 const current = ref(0) // 当前页数 - const pageSize = ref(0) // 每页条数 + const pageSize = ref(20) // 每页条数 const total = ref(0) // 数据总数 // 打开弹框 @@ -202,6 +202,7 @@ } }) } + searchFormState.value.size = pageSize.value loadData() if (props.checkedUserListApi) { if (isEmpty(recordIds.value)) { @@ -224,7 +225,7 @@ pageLoading.value = true props.userPageApi(searchFormState.value).then((data) => { current.value = data.current - pageSize.value = data.size + // pageSize.value = data.size total.value = data.total // 重置、赋值 tableData.value = [] @@ -242,11 +243,9 @@ } // pageSize改变回调分页事件 const paginationChange = (page, pageSize) => { - const param = { - current: page, - size: pageSize - } - loadData(param) + searchFormState.value.current = page + searchFormState.value.size = pageSize + loadData() } const judge = () => { if (radioModel && selectedData.value.length > 0) { @@ -294,6 +293,7 @@ } // 点击树查询 const treeSelect = (selectedKeys) => { + searchFormState.value.current = 0 if (selectedKeys.length > 0) { searchFormState.value.orgId = selectedKeys.toString() } else { @@ -330,7 +330,7 @@ tableRecordNum.value = 0 tableData.value = [] current.value = 0 - pageSize.value = 0 + pageSize.value = 20 total.value = 0 selectedData.value = [] visible.value = false