From 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/project/buildingList.vue | 63 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/admin/src/views/project/buildingList.vue b/admin/src/views/project/buildingList.vue
index d84c6b1..b3dd1ec 100644
--- a/admin/src/views/project/buildingList.vue
+++ b/admin/src/views/project/buildingList.vue
@@ -6,28 +6,26 @@
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユゼ瀹囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎵�灞為」鐩�" prop="projectId">
- <el-select v-model="searchForm.projectId">
- <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
- </el-select>
+ <el-select v-model="searchForm.projectId">
+ <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</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>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<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 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>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="妤煎畤鍚嶇О" min-width="100px">
<template v-slot="scope">
@@ -39,30 +37,25 @@
<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
- v-if="containPermissions(['business:ywbuilding:update', 'business:ywbuilding:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column prop="" 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}">
- <el-button type="text" @click="editClick(row)" icon="el-icon-edit" v-permissions="['business:ywbuilding:update']">缂栬緫</el-button>
- <el-button type="text" @click="editFloor(row)" v-permissions="['business:ywbuilding:update']">妤煎眰绠＄悊</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywbuilding:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="editClick(row)" icon="el-icon-edit"
+ v-permissions="['business:ywbuilding:update']">缂栬緫</el-button>
+ <el-button type="text" @click="editFloor(row)"
+ v-permissions="['business:ywbuilding:update']">妤煎眰绠＄悊</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:ywbuilding:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaYwBuildingWindow ref="operaYwBuildingWindow" @success="handlePageChange"/>
- <FloorLevel ref="FloorLevelRef" @success="handlePageChange"/>
+ <OperaYwBuildingWindow ref="operaYwBuildingWindow" @success="handlePageChange" />
+ <FloorLevel ref="FloorLevelRef" @success="handlePageChange" />
<BuildingDetail ref="BuildingDetailRef" />
</TableLayout>
</template>
@@ -78,18 +71,18 @@
export default {
name: 'YwBuilding',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaYwBuildingWindow ,BuildingDetail, FloorLevel},
- data () {
+ components: { TableLayout, Pagination, OperaYwBuildingWindow, BuildingDetail, FloorLevel },
+ data() {
return {
// 鎼滅储
- searchForm: {
+ searchForm: {
name: '',
projectId: ''
},
projectList: []
}
},
- created () {
+ created() {
this.config({
module: '杩愮淮妤煎畤淇℃伅琛�',
api: '/project/ywBuilding',
@@ -106,9 +99,9 @@
})
},
editClick(row) {
- if(row && row.id){
+ if (row && row.id) {
this.$refs.operaYwBuildingWindow.open('缂栬緫妤煎畤')
- }else{
+ } else {
this.$refs.operaYwBuildingWindow.open('鏂板缓妤煎畤')
}
this.$refs.operaYwBuildingWindow.getProject()
--
Gitblit v1.9.3