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-01 18:12:58 +08:00
parent 38274ab612
commit 50e7b14fd6
183 changed files with 8956 additions and 4803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/system/storeroom/addStoreRoom.vue
View File

@@ -15,9 +15,9 @@
</el-col>
<el-col :span="2"></el-col>
<el-col :span="11">
<el-form-item label="单元" prop="unit">
<el-select v-model="form.unitNo" placeholder="请选择单元">
<el-option v-for="item in units" :key="item.no" :label="item.name" :value="item.no" />
<el-form-item label="单元" prop="unitNoId">
<el-select v-model="form.unitNoId" placeholder="请选择单元">
<el-option v-for="item in units" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
@@ -25,7 +25,7 @@
<el-row>
<el-col :span="11">
<el-form-item label="储藏室号" prop="storeroomNo">
<el-input v-model.number="form.storeroomNo" placeholder="请输入储藏室号" />
<el-input v-model="form.storeroomNo" placeholder="请输入储藏室号" />
</el-form-item>
</el-col>
<el-col :span="2"></el-col>
@@ -68,6 +68,7 @@ import PageHeader from '@/components/Pageheader/index.vue';
import { getBuildinglistAPI, getBuildinglists, getBuildingOnly, getHouselistAPI } from '@/api/system/house';
import { addStoreroom, getStoreroom, updateStoreroom } from '@/api/system/storeroom';
import { StoreroomVO } from '@/api/system/storeroom/types';
import { getByBUildingidtoUnitNo } from '@/api/system/houseUnit';
const route = useRoute();
const router = useRouter();
@@ -75,7 +76,8 @@ const formRef = ref();
const form = ref<StoreroomVO>({
id: null,
buildingId: '',
unitNo: '',
unitNoId: '',
unitName: '',
storeroomNo: '',
houseArea: null,
shareArea: null,
@@ -86,7 +88,7 @@ const form = ref<StoreroomVO>({
});
const rules = ref({
buildingId: [{ required: true, message: '请选择楼栋', trigger: 'blur' }],
unitNo: [{ required: true, message: '请选择单元', trigger: 'blur' }],
unitNoId: [{ required: true, message: '请选择单元', trigger: 'blur' }],
storeroomNo: [{ required: true, message: '请输入储藏室号', trigger: 'blur' }]
});
@@ -103,9 +105,10 @@ function getStoreRoominfo(id: string) {
};
if (form.value.buildingId) {
handleChangeBuild(form.value.buildingId, () => {
form.value.unitNo = res.data.unitNo;
form.value.unitNoId = res.data.unitNoId;
});
}
console.log(form.value);
});
}
// 根据小区id获取楼栋单元
@@ -123,13 +126,8 @@ onMounted(() => {
});
// 根据楼栋id获取单元
function handleChangeBuild(val: string, callback?: () => void) {
getBuildingOnly(val).then((res) => {
units.value = Array.from({ length: res.data.unitCount }).map((_, index) => {
return {
no: index + 1,
name: index + 1 + '单元'
};
});
getByBUildingidtoUnitNo(val).then((res) => {
units.value = res.data;
callback && callback();
});
}

27
src/views/system/storeroom/index.vue
View File

@@ -48,14 +48,14 @@
<el-table class="tablebody" v-loading="loading" border :data="storeroomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="楼栋名" align="center" prop="buildingName" />
<el-table-column label="单元号" align="center" prop="unitNo" />
<el-table-column label="储藏室号" align="center" prop="storeroomNo" />
<el-table-column label="建筑面积(㎡)" align="center" prop="houseArea" />
<el-table-column label="公摊面积(㎡)" align="center" prop="shareArea" />
<el-table-column label="实用面积(㎡)" align="center" prop="internalArea" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<el-table-column label="楼栋名" width="150" align="center" prop="buildingName" />
<el-table-column label="单元号" show-overflow-tooltip width="150" align="center" prop="unitName" />
<el-table-column label="储藏室号" width="150" align="center" prop="storeroomNo" />
<el-table-column label="建筑面积(㎡)" width="100" align="center" prop="houseArea" />
<el-table-column label="公摊面积(㎡)" width="100" align="center" prop="shareArea" />
<el-table-column label="实用面积(㎡)" width="100" align="center" prop="internalArea" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="150" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['storeroom:storeroom:edit']">修改</el-button>
<el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['storeroom:storeroom:remove']">删除</el-button>
@@ -70,9 +70,8 @@
<script setup name="Storeroom" lang="ts">
import Pageheader from '@/components/Pageheader/index.vue';
import { listStoreroom, getStoreroom, delStoreroom, addStoreroom, updateStoreroom } from '@/api/system/storeroom/index';
import { listStoreroom, delStoreroom } from '@/api/system/storeroom/index';
import { StoreroomVO, StoreroomQuery, StoreroomForm } from '@/api/system/storeroom/types';
import { getBuildinglists } from '@/api/system/house';
import { checkPermi } from '@/utils/permission';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -129,14 +128,6 @@ const data = reactive<PageData<StoreroomForm, StoreroomQuery>>({
const { queryParams, form, rules } = toRefs(data);
const buildinglist = ref([]);
function getbudilinglist() {
getBuildinglists().then((res) => {
buildinglist.value = res.rows;
});
}
getbudilinglist();
/** 查询储藏室管理列表 */
const getList = async () => {
loading.value = true;