zhaoyang/estate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步6/16

Browse Source
This commit is contained in:
Zy
2026-06-16 15:35:52 +08:00
parent 50e7b14fd6
commit ea8129216b
6 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/system/house/index.ts
View File

@@ -166,6 +166,8 @@ export interface Storeroom {
remark: string; remark: string;
unitNoId: string; unitNoId: string;
unitNo: number; unitNo: number;
unitNoName:string;
} }
export interface Parking { export interface Parking {

2
src/permission.ts
View File

@@ -60,7 +60,7 @@ router.beforeEach(async (to, from) => {
removeDynamicRoutes(); removeDynamicRoutes();
// 获取用户信息 // 获取用户信息
const [err, res] = await tos(userStore.getInfo()); const [err] = await tos(userStore.getInfo());
if (err) { if (err) {
await userStore.logout(); await userStore.logout();
ElMessage.error(err); ElMessage.error(err);

7
src/store/modules/house.ts
View File

@@ -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 { communitylist_rows_type } from '@/api/system/community/type';
import { deleteHouseApi, getBuildinglistAPI, getHouselistAPI, getVillageTree } from '@/api/system/house'; import { getBuildinglistAPI, getHouselistAPI, getVillageTree } from '@/api/system/house';
import type { addBuildingType, BuildingUnit, BuildingVo } from '@/api/system/house/type'; import type { BuildingUnit, BuildingVo } from '@/api/system/house/type';
import { convertBuildingToTree } from '@/utils/house'; import { convertBuildingToTree } from '@/utils/house';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
// 数字排序 // 数字排序
@@ -13,7 +13,6 @@ function sortNumberStr(a: string, b: string) {
if (!isNaN(numA) && !isNaN(numB)) { if (!isNaN(numA) && !isNaN(numB)) {
return numA - numB; return numA - numB;
} }
// 否则按自然语言排 // 否则按自然语言排
return a.localeCompare(b, 'zh-CN', { numeric: true }); return a.localeCompare(b, 'zh-CN', { numeric: true });
} }

4
src/views/system/Sdb/SdbCashier/history.vue
View File

@@ -103,7 +103,7 @@
<div class="flex-1">交款人：</div> <div class="flex-1">交款人：</div>
<div class="flex-1 flex flex-items-center"> <div class="flex-1 flex flex-items-center">
<span style="white-space: nowrap">收款人： </span> <span style="white-space: nowrap">收款人： </span>
<el-input v-model="inHomenyUse" v-if="!isPrint" placeholder="请输入收款人姓名" style="width: 150px"></el-input> <el-input v-model="inHomelyUse" v-if="!isPrint" placeholder="请输入收款人姓名" style="width: 150px"></el-input>
<span style="white-space: nowrap" v-else> {{ inHomelyUse }}</span> <span style="white-space: nowrap" v-else> {{ inHomelyUse }}</span>
</div> </div>
</div> </div>
@@ -197,7 +197,7 @@ function printPiaoju() {
return; return;
} }
isPrint.value = false; isPrint.value = false;
inHomenyUse.value = ''; inHomelyUse.value = '';
const query = { const query = {
'residentId': props.query.residentId, 'residentId': props.query.residentId,
'detailsIds': [...ids.value.map((item) => item.detailsId)] 'detailsIds': [...ids.value.map((item) => item.detailsId)]

2
src/views/system/Sdb/SdbCashier/index.vue
View File

@@ -251,7 +251,7 @@ import { listChargeItem } from '@/api/system/SdbChargeItem';
import { ref } from 'vue'; import { ref } from 'vue';
import { printTicketDiv } from '@/utils/print'; import { printTicketDiv } from '@/utils/print';
import { moneyAdd } from '@/utils/money'; import { moneyAdd } from '@/utils/money';
import { BuildingUnitlist, BuildingVo, FloorsType, HouseType } from '@/api/system/house/type'; import { BuildingUnitlist, BuildingVo, FloorsType } from '@/api/system/house/type';
import { ChargeItemVO } from '@/api/system/SdbChargeItem/type'; import { ChargeItemVO } from '@/api/system/SdbChargeItem/type';
import { communitylist_rows_type } from '@/api/system/community/type'; import { communitylist_rows_type } from '@/api/system/community/type';

9
src/views/system/house/HouseDetails.vue
View File

@@ -244,14 +244,7 @@ function editStoreRoom() {
} }
}); });
} }
function handleEditParking() {
router.push({
path: '/carArea/editParking',
query: {
id: HouseInfo.value.parking.parkingId
}
});
}
function handleEditUser(id: string) { function handleEditUser(id: string) {
router.push({ router.push({
path: '/house/editResident', path: '/house/editResident',