Преглед изворни кода

!1301 一些前端页面,异步方法,没有调用await的bug修复
Merge pull request !1301 from NeoLu/next

zuohuaijun пре 2 година
родитељ
комит
beebd4da8d

+ 11 - 11
Web/src/views/system/region/index.vue

@@ -89,27 +89,27 @@ const state = reactive({
 	editRegionTitle: '',
 });
 
-onMounted(() => {
-	handleQuery();
+onMounted(async () => {
+	await handleQuery();
 });
 
 // 查询操作
 const handleQuery = async () => {
 	state.loading = true;
 	let params = Object.assign(state.queryParams, state.tableParams);
-	var res = await getAPI(SysRegionApi).apiSysRegionPagePost(params);
+	let res = await getAPI(SysRegionApi).apiSysRegionPagePost(params);
 	state.regionData = res.data.result?.items ?? [];
 	state.tableParams.total = res.data.result?.total;
 	state.loading = false;
 };
 
 // 重置操作
-const resetQuery = () => {
+const resetQuery = async () => {
 	state.queryParams.id = -1;
 	state.queryParams.pid = undefined;
 	state.queryParams.name = undefined;
 	state.queryParams.code = undefined;
-	handleQuery();
+	await handleQuery();
 };
 
 // 打开新增页面
@@ -133,7 +133,7 @@ const delRegion = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysRegionApi).apiSysRegionDeletePost({ id: row.id });
-			handleQuery();
+			await handleQuery();
 			// 编辑删除后更新机构数据
 			regionTreeRef.value?.initTreeData();
 			ElMessage.success('删除成功');
@@ -146,7 +146,7 @@ const nodeClick = async (node: any) => {
 	state.queryParams.pid = node.id;
 	state.queryParams.name = undefined;
 	state.queryParams.code = undefined;
-	handleQuery();
+	await handleQuery();
 };
 
 // 同步国家统计局操作
@@ -169,14 +169,14 @@ const handlSync = async () => {
 };
 
 // 改变页面容量
-const handleSizeChange = (val: number) => {
+const handleSizeChange = async (val: number) => {
 	state.tableParams.pageSize = val;
-	handleQuery();
+	await handleQuery();
 };
 
 // 改变页码序号
-const handleCurrentChange = (val: number) => {
+const handleCurrentChange = async (val: number) => {
 	state.tableParams.page = val;
-	handleQuery();
+	await handleQuery();
 };
 </script>

+ 9 - 9
Web/src/views/system/role/index.vue

@@ -102,24 +102,24 @@ const state = reactive({
 });
 
 onMounted(async () => {
-	handleQuery();
+	await handleQuery();
 });
 
 // 查询操作
 const handleQuery = async () => {
 	state.loading = true;
 	let params = Object.assign(state.queryParams, state.tableParams);
-	var res = await getAPI(SysRoleApi).apiSysRolePagePost(params);
+	let res = await getAPI(SysRoleApi).apiSysRolePagePost(params);
 	state.roleData = res.data.result?.items ?? [];
 	state.tableParams.total = res.data.result?.total;
 	state.loading = false;
 };
 
 // 重置操作
-const resetQuery = () => {
+const resetQuery = async () => {
 	state.queryParams.name = undefined;
 	state.queryParams.code = undefined;
-	handleQuery();
+	await handleQuery();
 };
 
 // 打开新增页面
@@ -148,21 +148,21 @@ const delRole = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysRoleApi).apiSysRoleDeletePost({ id: row.id });
-			handleQuery();
+			await handleQuery();
 			ElMessage.success('删除成功');
 		})
 		.catch(() => {});
 };
 
 // 改变页面容量
-const handleSizeChange = (val: number) => {
+const handleSizeChange = async (val: number) => {
 	state.tableParams.pageSize = val;
-	handleQuery();
+	await handleQuery();
 };
 
 // 改变页码序号
-const handleCurrentChange = (val: number) => {
+const handleCurrentChange = async (val: number) => {
 	state.tableParams.page = val;
-	handleQuery();
+	await handleQuery();
 };
 </script>

+ 12 - 12
Web/src/views/system/user/index.vue

@@ -144,14 +144,14 @@ const state = reactive({
 });
 
 onMounted(async () => {
-	loadOrgData();
-	handleQuery();
+	await loadOrgData();
+	await handleQuery();
 });
 
 // 查询机构数据
 const loadOrgData = async () => {
 	state.loading = true;
-	var res = await getAPI(SysOrgApi).apiSysOrgListGet(0);
+	let res = await getAPI(SysOrgApi).apiSysOrgListGet(0);
 	state.orgTreeData = res.data.result ?? [];
 	state.loading = false;
 };
@@ -160,19 +160,19 @@ const loadOrgData = async () => {
 const handleQuery = async () => {
 	state.loading = true;
 	let params = Object.assign(state.queryParams, state.tableParams);
-	var res = await getAPI(SysUserApi).apiSysUserPagePost(params);
+	let res = await getAPI(SysUserApi).apiSysUserPagePost(params);
 	state.userData = res.data.result?.items ?? [];
 	state.tableParams.total = res.data.result?.total;
 	state.loading = false;
 };
 
 // 重置操作
-const resetQuery = () => {
+const resetQuery = async () => {
 	state.queryParams.orgId = -1;
 	state.queryParams.account = undefined;
 	state.queryParams.realName = undefined;
 	state.queryParams.phone = undefined;
-	handleQuery();
+	await handleQuery();
 };
 
 // 打开新增页面
@@ -196,7 +196,7 @@ const delUser = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysUserApi).apiSysUserDeletePost({ id: row.id });
-			handleQuery();
+			await handleQuery();
 			ElMessage.success('删除成功');
 		})
 		.catch(() => {});
@@ -209,14 +209,14 @@ const handleSizeChange = (val: number) => {
 };
 
 // 改变页码序号
-const handleCurrentChange = (val: number) => {
+const handleCurrentChange = async (val: number) => {
 	state.tableParams.page = val;
-	handleQuery();
+	await handleQuery();
 };
 
 // 修改状态
-const changeStatus = (row: any) => {
-	getAPI(SysUserApi)
+const changeStatus = async (row: any) => {
+	await getAPI(SysUserApi)
 		.apiSysUserSetStatusPost({ id: row.id, status: row.status })
 		.then(() => {
 			ElMessage.success('账号状态设置成功');
@@ -266,6 +266,6 @@ const nodeClick = async (node: any) => {
 	state.queryParams.account = undefined;
 	state.queryParams.realName = undefined;
 	state.queryParams.phone = undefined;
-	handleQuery();
+	await handleQuery();
 };
 </script>