人员选择组件调整

src/api/cw/projectRecords/ProjectReportArchiveService.js

@@ -116,4 +116,12 @@ export default class ProjectReportArchiveService {
 			params: params,
 		});
 	}
+	//根据报告年份修改文档存放位置
+	updatePlaceByYear(data) {
+		return request({
+			url: prefix + "/cwProjectReportArchive/updatePlaceByYear",
+			method: "post",
+			data: data,
+		});
+	}
 }

src/api/sys/userService.js

@@ -88,6 +88,14 @@ export default {
 			params: params,
 		});
 	},
+	findUserList: function (params) {
+		return request({
+			url: prefix + "/sys/user/findUserList",
+			method: "get",
+			params: params,
+		});
+	},
+
 	allUserList: function (params) {
 		return request({
 			url: prefix + "/sys/user/allUserList",

src/components/userSelect/UserSelectDialog.vue

@@ -67,8 +67,8 @@
 								</el-scrollbar>
 							</div>
 							<footer>
-								<el-pagination background layout="prev,next" small :total="total" :page-size="pageSize"
-									v-model:currentPage="currentPage"
+								<el-pagination background layout="prev, pager, next" small :total="total"
+									:page-size="pageSize" v-model:currentPage="currentPage"
 									@current-change="paginationChange"></el-pagination>
 							</footer>
 						</div>
@@ -91,8 +91,8 @@
 												item.tenantId
 											) + '!important',
 									}">{{
-											item.name.substring(0, 1)
-										}}</el-avatar>
+										item.name.substring(0, 1)
+									}}</el-avatar>
 									<el-avatar v-else>{{
 										item.name.substring(0, 1)
 									}}</el-avatar>
@@ -190,7 +190,7 @@ export default {
 		async getUser() {
 			this.showUserloading = true;
 			userService
-				.list({
+				.findUserList({
 					current: this.currentPage,
 					size: this.pageSize,
 					...this.searchForm,
@@ -242,9 +242,9 @@ export default {
 			}
 		},
 
-		resetSearch() {
-			this.getGroup()
+		async resetSearch() {
 			this.searchForm.companyDTO.id = ''
+			await this.getGroup()
 			this.searchForm.name = ''
 			this.currentPage = 1;
 			this.getUser();