6/22完善引入,

This commit is contained in:
Zy
2026-06-22 08:14:35 +08:00
parent ea8129216b
commit 826bf3c782
208 changed files with 1122 additions and 1685 deletions

View File

@@ -147,7 +147,7 @@ function goBack() {
cursor: pointer;
font-size: 14px;
&:hover {
box-shadow: 0px 2px 6px 0px rgba(26, 117, 255, 0.1);
box-shadow: 0 2px 6px 0 rgba(26, 117, 255, 0.1);
}
}
.AddBuildingBox {

View File

@@ -139,7 +139,7 @@ async function init() {
if (route.query.id) {
houseid.value = route.query.id;
}
nextTick(() => geteditinfo());
await nextTick(() => geteditinfo());
}
init();
@@ -320,7 +320,7 @@ const cancelForm = () => {
align-items: center;
.el-input {
width: 100px;
margin-right: 0px;
margin-right: 0;
}
span {
margin: 0 20px;

View File

@@ -4,7 +4,7 @@
<div class="AddBuildingBody">
<div class="title">
<span>基本信息</span>
<el-button v-hasPermi="['system:house:edit']" type="primary" text v-if="HouseInfo.house" @click="editHouse">编辑</el-button>
<el-button v-has-permi="['system:house:edit']" type="primary" text v-if="HouseInfo.house" @click="editHouse">编辑</el-button>
</div>
<div class="addBuildingFormBody" v-if="HouseInfo.house">
<div class="descriptionsbox">
@@ -52,7 +52,7 @@
<div class="AddBuildingBody">
<div class="title">
<span>储藏室信息 </span>
<el-button v-hasPermi="['storeroom:storeroom:edit']" type="primary" text v-if="HouseInfo.storeroom" @click="editStoreRoom">编辑</el-button>
<el-button v-has-permi="['storeroom:storeroom:edit']" type="primary" text v-if="HouseInfo.storeroom" @click="editStoreRoom">编辑</el-button>
</div>
<div class="" v-if="HouseInfo.storeroom">
<div class="addBuildingFormBody">
@@ -182,7 +182,7 @@
<span>缴费账单</span>
</div>
<div>
<el-table :data="HouseInfo.billResidentList" align="center" style="width: 100%">
<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="账单项目" />
@@ -206,6 +206,7 @@
<script setup lang="ts">
import { ref } from 'vue';
import DictTag from '@/components/DictTag/index.vue';
import PageHeader from '@/components/Pageheader/index.vue';
import { Data, getHouseMain } from '@/api/system/house';

View File

@@ -3,7 +3,7 @@
<div class="buildingheader flex align-center justify-between">
<div>楼栋</div>
<div>
<span class="pointer" @click="handleAddBuilding" v-hasPermi="['system:building:add']">+增加楼栋</span>
<span class="pointer" @click="handleAddBuilding" v-has-permi="['system:building:add']">+增加楼栋</span>
</div>
</div>
<ul class="flex-1 overflow-y-auto overflow-x-hidden">
@@ -16,8 +16,8 @@
>
<div class="buildingname" :title="item.buildingName ?? ''" @click="switchBuilding(item.id ?? null)">{{ item.buildingName ?? '' }}</div>
<div class="buildactions flex align-center justify-around">
<el-icon class="pointer hover-color-blue" @click="editBuilding(item.id)" v-hasPermi="['system:building:edit']"><Setting /></el-icon>
<el-icon class="pointer hover-color-red" @click="deleteBuilding(item.id)" v-hasPermi="['system:building:remove']"><Delete /></el-icon>
<el-icon class="pointer hover-color-blue" @click="editBuilding(item.id)" v-has-permi="['system:building:edit']"><Setting /></el-icon>
<el-icon class="pointer hover-color-red" @click="deleteBuilding(item.id)" v-has-permi="['system:building:remove']"><Delete /></el-icon>
</div>
</li>
</ul>
@@ -27,6 +27,7 @@
<script setup lang="ts">
import { deleteBuildingApi } from '@/api/system/house';
import { useHouseStore } from '@/store/modules/house';
import { Delete, Setting } from '@element-plus/icons-vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const houseStore = useHouseStore();
@@ -106,8 +107,7 @@ $primary_color: #1978fe;
.buildactions {
width: 75px;
font-size: 15px;
padding: 15px 0;
padding-right: 10px;
padding: 15px 10px 15px 0;
color: rgba(153, 153, 153, 1);
}

View File

@@ -17,9 +17,9 @@
<template #header>
<div class="flex align-center justify-center">
<div class="houseName" :title="unit.unitNoName">{{ unit.unitNoName }}</div>
<el-button v-hasPermi="['unitNo:unitNo:edit']" link type="primary" icon="Edit" @click="HandleEditUnit(unit)"></el-button>
<el-button v-has-permi="['unitNo:unitNo:edit']" link type="primary" icon="Edit" @click="HandleEditUnit(unit)"></el-button>
<el-button
v-hasPermi="['unitNo:unitNo:remove']"
v-has-permi="['unitNo:unitNo:remove']"
link
type="danger"
icon="Delete"

View File

@@ -28,10 +28,10 @@
</span>
</div>
<div style="text-wrap: nowrap" class="rightActions flex flex-items-center">
<span class="mr-20px" @click="handleAddUnit" v-hasPermi="['unitNo:unitNo:add']">+添加单元</span>
<span class="mr-20px" @click="handleAddHouse" v-hasPermi="['system:house:add']">+增加房屋</span>
<span class="mr-20px" @click="handleAddUnit" v-has-permi="['unitNo:unitNo:add']">+添加单元</span>
<span class="mr-20px" @click="handleAddHouse" v-has-permi="['system:house:add']">+增加房屋</span>
<!-- <span class="mr-20px">收费标准设置</span> -->
<span @click="deleteAllhouse" v-hasPermi="['system:house:remove']">批量删除房屋</span>
<span @click="deleteAllhouse" v-has-permi="['system:house:remove']">批量删除房屋</span>
<el-select clearable @clear="handleClearUse" @change="handleChangeUse" v-model="houseUse" placeholder="筛选房屋类型" class="selectbox">
<el-option v-for="item in houseUseTypeList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
@@ -72,9 +72,8 @@
import { deleteHouseApi } from '@/api/system/house';
import TableUnit from './components/table.vue';
import { useHouseStore } from '@/store/modules/house';
import { listHouseUseType, listHouseUseType_add_house } from '@/api/system/houseUse';
import { listHouseUseType_add_house } from '@/api/system/houseUse';
import { addUnitNo, delUnitNo, getUnitNo, updateUnitNo } from '@/api/system/houseUnit';
import { UnitNoVO } from '@/api/system/houseUnit/type';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -89,7 +88,7 @@ const houseUseTypeList = ref([]);
* 获取房屋 类型
*/
function init() {
listHouseUseType_add_house().then((res) => {
listHouseUseType_add_house({}).then((res) => {
houseUseTypeList.value = res.data;
});
}