From cfbf7533b8cfc395a110390da23cf6bb641daff9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 08 一月 2025 16:05:17 +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/housingList.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/project/housingList.vue b/admin/src/views/project/housingList.vue
index f800cc8..fabf9e7 100644
--- a/admin/src/views/project/housingList.vue
+++ b/admin/src/views/project/housingList.vue
@@ -17,8 +17,8 @@
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywroom:exportExcel']"
- @click="exportExcel">瀵煎嚭</el-button>
+ <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywroom:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button> -->
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
@@ -27,8 +27,8 @@
<ul class="toolbar" v-permissions="['business:ywroom:create', 'business:ywroom:delete']">
<li><el-button type="primary" @click="editClick()" icon="el-icon-plus"
v-permissions="['business:ywroom:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
- v-permissions="['business:ywroom:delete']">鍒犻櫎</el-button></li>
+ <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywroom: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>
@@ -38,7 +38,13 @@
<el-table-column prop="roomNum" label="鎴垮彿" min-width="60px"></el-table-column>
<el-table-column prop="rentArea" label="璁＄闈㈢Н(m虏)" min-width="80px"></el-table-column>
<el-table-column prop="feeArea" label="璁¤垂闈㈢Н(m虏)" min-width="80px"></el-table-column>
- <el-table-column prop="feeArea" label="绉熻祦鐘舵��" min-width="80px"></el-table-column>
+ <el-table-column prop="" label="绉熻祦鐘舵��" min-width="80px">
+ <template v-slot="{row}">
+ <span v-if="row.leaseStatus == 0">寰呯</span>
+ <span v-else-if="row.leaseStatus == 1">宸茬</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
<el-table-column prop="isInvestment" label="鎷涘晢鐘舵��" min-width="60px">
<template v-slot="scope">
<span v-if="scope.row.isInvestment == 1" class="green">鎷涘晢</span>
@@ -46,8 +52,9 @@
</template>
</el-table-column>
<el-table-column v-if="containPermissions(['business:ywroom:update', 'business:ywroom:delete'])" label="鎿嶄綔"
- min-width="100" fixed="right">
+ min-width="140" fixed="right">
<template slot-scope="{row}">
+ <el-button type="text" @click="$refs.houseDetails.open('鎴挎簮璇︽儏')">鏌ョ湅璇︽儏</el-button>
<el-button type="text" @click="editClick(row)" icon="el-icon-edit"
v-permissions="['business:ywroom:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
@@ -60,6 +67,8 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaYwRoomWindow ref="operaYwRoomWindow" @success="handlePageChange" />
+ <!-- 璇︽儏 -->
+ <houseDetails ref="houseDetails" />
</TableLayout>
</template>
@@ -68,12 +77,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaYwRoomWindow from './components/OperaYwRoomWindow'
+import houseDetails from './components/houseDetails'
import { getProjectList } from '@/api/project/ywProject'
import { getBuildList } from '@/api/project/ywBuilding'
export default {
name: 'YwRoom',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaYwRoomWindow },
+ components: { TableLayout, Pagination, OperaYwRoomWindow, houseDetails },
data() {
return {
// 鎼滅储
--
Gitblit v1.9.3