From 364d3221b9a8e6dd3a19701d30c4dc4239ef8abf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 11:48:49 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/project/buildingList.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/project/buildingList.vue b/admin/src/views/project/buildingList.vue
index b3dd1ec..a94db6f 100644
--- a/admin/src/views/project/buildingList.vue
+++ b/admin/src/views/project/buildingList.vue
@@ -12,8 +12,8 @@
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywbuilding:exportExcel']"
- @click="exportExcel">瀵煎嚭</el-button>
+ <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywbuilding:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button> -->
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
@@ -22,8 +22,8 @@
<ul class="toolbar" v-permissions="['business:ywbuilding:create', 'business:ywbuilding:delete']">
<li><el-button type="primary" @click="editClick()" icon="el-icon-plus"
v-permissions="['business:ywbuilding:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
- v-permissions="['business:ywbuilding:delete']">鍒犻櫎</el-button></li>
+ <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywbuilding:delete']">鍒犻櫎</el-button></li> -->
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
@@ -35,9 +35,9 @@
<el-table-column prop="projectName" label="鎵�灞為」鐩�" min-width="100px"></el-table-column>
<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="manageArea" label="绠＄悊闈㈢Н(m虏)" min-width="80px"></el-table-column>
+ <el-table-column prop="roomNum" label="鎴块棿鎬绘暟(闂�)" min-width="80px"></el-table-column>
+ <el-table-column prop="roomRentNum" 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}">
@@ -100,14 +100,14 @@
},
editClick(row) {
if (row && row.id) {
- this.$refs.operaYwBuildingWindow.open('缂栬緫妤煎畤')
+ this.$refs.operaYwBuildingWindow.open('缂栬緫妤煎畤', row)
} else {
this.$refs.operaYwBuildingWindow.open('鏂板缓妤煎畤')
}
- 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