diff --git a/src/api/system/house/index.ts b/src/api/system/house/index.ts index 3c6fbfb..80d2da3 100644 --- a/src/api/system/house/index.ts +++ b/src/api/system/house/index.ts @@ -166,6 +166,8 @@ export interface Storeroom { remark: string; unitNoId: string; unitNo: number; + + unitNoName:string; } export interface Parking { diff --git a/src/permission.ts b/src/permission.ts index e6bce67..cb6273e 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -60,7 +60,7 @@ router.beforeEach(async (to, from) => { removeDynamicRoutes(); // 获取用户信息 - const [err, res] = await tos(userStore.getInfo()); + const [err] = await tos(userStore.getInfo()); if (err) { await userStore.logout(); ElMessage.error(err); diff --git a/src/store/modules/house.ts b/src/store/modules/house.ts index ff17447..01823fe 100644 --- a/src/store/modules/house.ts +++ b/src/store/modules/house.ts @@ -1,7 +1,7 @@ -import { getCommunitylistAPI, getVillageByIdAPI } from '@/api/system/community'; +import { getVillageByIdAPI } from '@/api/system/community'; import { communitylist_rows_type } from '@/api/system/community/type'; -import { deleteHouseApi, getBuildinglistAPI, getHouselistAPI, getVillageTree } from '@/api/system/house'; -import type { addBuildingType, BuildingUnit, BuildingVo } from '@/api/system/house/type'; +import { getBuildinglistAPI, getHouselistAPI, getVillageTree } from '@/api/system/house'; +import type { BuildingUnit, BuildingVo } from '@/api/system/house/type'; import { convertBuildingToTree } from '@/utils/house'; import { defineStore } from 'pinia'; // 数字排序 @@ -13,7 +13,6 @@ function sortNumberStr(a: string, b: string) { if (!isNaN(numA) && !isNaN(numB)) { return numA - numB; } - // 否则按自然语言排 return a.localeCompare(b, 'zh-CN', { numeric: true }); } diff --git a/src/views/system/Sdb/SdbCashier/history.vue b/src/views/system/Sdb/SdbCashier/history.vue index ac3d57b..8068d23 100644 --- a/src/views/system/Sdb/SdbCashier/history.vue +++ b/src/views/system/Sdb/SdbCashier/history.vue @@ -103,7 +103,7 @@