Răsfoiți Sursa

feat: 选择 优化

lanceJiang 11 luni în urmă
părinte
comite
dc5ee7d67d
2 a modificat fișierele cu 11 adăugiri și 5 ștergeri
  1. 1 0
      src/components/SelectRole.vue
  2. 10 5
      src/components/SelectUser.vue

+ 1 - 0
src/components/SelectRole.vue

@@ -127,6 +127,7 @@ const removeItem = (index: number) => {
 }
 const selectHandler = () => {
 	dialogVisible.value = true
+	selected.value = JSON.parse(JSON.stringify(props.modelValue || []))
 	const _info = dataInfo.value
 	if (!_info.loading && !_info.list.length) {
 		queryRoleData()

+ 10 - 5
src/components/SelectUser.vue

@@ -58,7 +58,7 @@
 									small
 									:total="dataInfo.total"
 									:page-size="searchParams.pageSize"
-									@current-change="queryData"
+									@current-change="queryData()"
 								></el-pagination>
 							</footer>
 						</div>
@@ -164,20 +164,21 @@ const removeItem = (index: number) => {
 }
 const selectHandler = () => {
 	dialogVisible.value = true
+	selected.value = JSON.parse(JSON.stringify(props.modelValue || []))
 	const _group = groupData.value
 	if (!_group.loading && !_group.list.length) {
 		queryGroupData()
 	}
 	const _info = dataInfo.value
-	if (!_info.loading && !_info.list.length) {
-		queryData()
+	if (!_info.loading && !_info.list.length || searchParams.value.username || searchParams.value.departmentId) {
+		queryData(true)
 	}
 }
 const searchParams = ref({
 	username: undefined,
 	departmentId: undefined,
 	currentPage: 1,
-	pageSize: 5 // 20
+	pageSize: 20
 })
 const groupData = ref({ list: [], loading: false })
 const groupClick = (data: any) => {
@@ -200,7 +201,11 @@ const queryGroupData = () => {
 			groupData.value.loading = false
 		})
 }
-const queryData = () => {
+const queryData = (init = false) => {
+	if (init) {
+		searchParams.value.username = undefined
+		searchParams.value.departmentId = undefined
+	}
 	dataInfo.value.loading = true
 	const _search = searchParams.value
 	const params = {