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

8/31 dev 权限,sse,账单,bug

Browse Source
This commit is contained in:
Zy
2026-08-31 18:00:11 +08:00
parent 466ec4675e
commit de4bae3bc1
51 changed files with 575 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,12 +4,12 @@
<div class="AddBuildingBody">
<div class="title">
<span>基本信息</span>
<el-button v-has-permi="['system:house:edit']" type="primary" text v-if="HouseInfo.house" @click="editHouse">编辑</el-button>
<el-button v-if="HouseInfo.house" v-has-permi="['system:house:edit']" text type="primary" @click="editHouse">编辑</el-button>
</div>
<div class="addBuildingFormBody" v-if="HouseInfo.house">
<div v-if="HouseInfo.house" class="addBuildingFormBody">
<div class="descriptionsbox">
<div class="label">房号:</div>
<div class="value">{{ HouseInfo.house?.houseNo ?? '--' }}</div>
<div class="value">{{ HouseInfo.house?.buildingName }}-{{ HouseInfo.house?.unitNoName }}-{{ HouseInfo.house?.houseNo ?? '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="label">所属小区:</div>
@@ -31,6 +31,10 @@
<div class="label">建筑面积:</div>
<div class="value">{{ HouseInfo.house?.houseArea ? `${HouseInfo.house?.houseArea} ㎡` : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="label">套内面积:</div>
<div class="value">{{ HouseInfo.house?.internalArea ? `${HouseInfo.house?.internalArea} ㎡` : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="label">公摊面积:</div>
<div class="value">{{ HouseInfo.house?.shareArea ? `${HouseInfo.house?.shareArea} ㎡` : '--' }}</div>
@@ -52,9 +56,9 @@
<div class="AddBuildingBody">
<div class="title">
<span>储藏室信息 </span>
<el-button v-has-permi="['storeroom:storeroom:edit']" type="primary" text v-if="HouseInfo.storeroom" @click="editStoreRoom">编辑</el-button>
<el-button v-if="HouseInfo.storeroom" v-has-permi="['storeroom:storeroom:edit']" text type="primary" @click="editStoreRoom">编辑</el-button>
</div>
<div class="" v-if="HouseInfo.storeroom">
<div v-if="HouseInfo.storeroom" class="">
<div class="addBuildingFormBody">
<div class="descriptionsbox">
<div class="label">楼栋:</div>
@@ -95,32 +99,32 @@
<div class="title">
<span>车位信息</span>
</div>
<div class="" v-if="HouseInfo.parkingList.length > 0">
<div v-if="HouseInfo.parkingList.length > 0" class="">
<el-table :data="HouseInfo.parkingList">
<el-table-column align="center" prop="areaName" label="区域" />
<el-table-column align="center" prop="parkingCode" label="车位编号" />
<el-table-column align="center" width="100" prop="parkingArea" label="车位面积">
<el-table-column align="center" label="区域" prop="areaName" />
<el-table-column align="center" label="车位编号" prop="parkingCode" />
<el-table-column align="center" label="车位面积" prop="parkingArea" width="100">
<template #default="scope">
<span>{{ scope.row.parkingArea ?? '--' }} /㎡</span>
</template>
</el-table-column>
<el-table-column align="center" width="50" prop="parkingFloor" label="楼层" />
<el-table-column align="center" width="100" prop="type" label="车位类型">
<el-table-column align="center" label="楼层" prop="parkingFloor" width="50" />
<el-table-column align="center" label="车位类型" prop="type" width="100">
<template #default="scope">
<dict-tag :options="com_parking_type" :value="scope.row.type"></dict-tag>
</template>
</el-table-column>
<el-table-column align="center" width="100" prop="parkingStatus" label="车位状态">
<el-table-column align="center" label="车位状态" prop="parkingStatus" width="100">
<template #default="scope">
<dict-tag :options="com_parking_status" :value="scope.row.parkingStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="residentName" label="持有人">
<el-table-column align="center" label="持有人" prop="residentName">
<template #default="scope">
<el-button link type="primary" @click="handleEditUser(scope.row.residentId)">{{ scope.row.residentName }}</el-button>
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip prop="remark" label="备注" />
<el-table-column align="center" label="备注" prop="remark" show-overflow-tooltip />
</el-table>
</div>
<div v-else class="w-full h-full flex flex-center min-h-4rem">
@@ -134,25 +138,24 @@
</div>
<div>
<el-table :data="HouseInfo.chargeItemList" style="width: 100%">
<el-table-column prop="itemName" label="收费项目" />
<el-table-column prop="name" label="收费标准">
<el-table-column label="收费项目" prop="itemName" />
<el-table-column label="收费标准" prop="name">
<template #default="scope">
<div class="flex">
<span>{{ scope.row.fixedPrice }}</span>
<span v-if="scope.row.fixedPrice && scope.row.unit">/</span>
<span v-else>---</span>
<dict-tag :options="com_charge_item_unit" :value="scope.row.unit"></dict-tag>
</div>
</template>
</el-table-column>
<el-table-column prop="createTime" label="开始时间" />
<el-table-column prop="name" label="结束时间">
<el-table-column label="开始时间" prop="createTime" />
<el-table-column label="结束时间" prop="name">
<template #default>
<span>---</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column label="备注" prop="remark" />
</el-table>
</div>
</div>
@@ -163,19 +166,19 @@
</div>
<div>
<el-table :data="HouseInfo.residentList" style="width: 100%">
<el-table-column prop="residentName" label="姓名" />
<el-table-column prop="gender" label="性别">
<el-table-column label="姓名" prop="residentName" />
<el-table-column label="性别" prop="gender">
<template #default="scope">
<DictTag :options="sys_user_sex" :value="scope.row.gender"></DictTag>
</template>
</el-table-column>
<el-table-column prop="phone" label="联系电话" />
<el-table-column prop="ownerRelationship" label="身份">
<el-table-column label="联系电话" prop="phone" />
<el-table-column label="身份" prop="ownerRelationship">
<template #default="scope">
<DictTag :options="com_resident_relationship" :value="scope.row.ownerRelationship"></DictTag>
</template>
</el-table-column>
<el-table-column prop="name" label="备注" />
<el-table-column label="备注" prop="name" />
</el-table>
</div>
</div>
@@ -186,19 +189,19 @@
</div>
<div>
<el-table :data="HouseInfo.billResidentList" style="width: 100%">
<el-table-column prop="billCode" label="账单编号" />
<el-table-column prop="billName" label="账单名称" />
<el-table-column prop="chargeTypeName" label="账单项目" />
<el-table-column prop="money" label="金额">
<el-table-column label="账单编号" prop="billCode" />
<el-table-column label="账单名称" prop="billName" />
<el-table-column label="账单项目" prop="chargeTypeName" />
<el-table-column label="金额" prop="money">
<template #default="scope">
<span v-if="scope.row.chargeTypeName === '水费' || scope.row.chargeTypeName === '电费'">--</span>
<span v-else>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column prop="payStatus" label="支付状态">
<el-table-column label="支付状态" prop="payStatus">
<template #default="scope">
<span v-if="scope.row.chargeTypeName === '水费' || scope.row.chargeTypeName === '电费'">--</span>
<DictTag :options="com_pay_status" :value="scope.row.payStatus"></DictTag>
<DictTag :options="com_pay_status" :value="scope.row.payStatus ?? 0"></DictTag>
</template>
</el-table-column>
</el-table>
@@ -207,7 +210,7 @@
</div>
</template>
<script setup lang="ts">
<script lang="ts" setup>
import { ref } from 'vue';
import DictTag from '@/components/DictTag/index.vue';
import PageHeader from '@/components/Pageheader/index.vue';
@@ -251,7 +254,8 @@ function editStoreRoom() {
function handleEditUser(id: string) {
router.push({
path: '/house/editResident',
// path: '/house/editResident',
path: '/house/ResidentMain',
query: {
id: id
}
@@ -268,7 +272,7 @@ function init() {
init();
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.AddBuildingBox {
padding: 15px;
height: 100%;