From 470bd526f3e62ad331409a542638d836fea20665 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 17:37:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/project/buildingList.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/project/buildingList.vue b/admin/src/views/project/buildingList.vue
index b3dd1ec..ad86ed4 100644
--- a/admin/src/views/project/buildingList.vue
+++ b/admin/src/views/project/buildingList.vue
@@ -36,8 +36,8 @@
<el-table-column prop="code" label="妤煎畤缂栫爜" min-width="80px"></el-table-column>
<el-table-column prop="area" label="寤虹瓚闈㈢Н(m虏)" min-width="80px"></el-table-column>
<el-table-column prop="cqArea" label="绠＄悊闈㈢Н(m虏)" min-width="80px"></el-table-column>
- <el-table-column prop="" label="鎴块棿鎬绘暟(闂�)" min-width="80px"></el-table-column>
- <el-table-column prop="" label="鍙嫑鍟嗘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
+ <el-table-column prop="roomNum" label="鎴块棿鎬绘暟(闂�)" min-width="80px"></el-table-column>
+ <el-table-column prop="roomeRentNum" label="鍙嫑鍟嗘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
<el-table-column v-if="containPermissions(['business:ywbuilding:update', 'business:ywbuilding:delete'])"
label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
@@ -107,7 +107,8 @@
this.$refs.operaYwBuildingWindow.getProject()
},
editFloor(row) {
- this.$refs.FloorLevelRef.getList(row.id)
+ this.$refs.FloorLevelRef.id = row.id
+ this.$refs.FloorLevelRef.getList()
this.$refs.FloorLevelRef.visible = true
},
handleDetail(row) {
--
Gitblit v1.9.3