From 25aace375476ad7f73089cac6bfed606828c5371 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十一月 2024 09:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/project/buildingList.vue | 149 +++++++++++++++++--------------------------------
1 files changed, 53 insertions(+), 96 deletions(-)
diff --git a/admin/src/views/project/buildingList.vue b/admin/src/views/project/buildingList.vue
index 82b1bcc..d84c6b1 100644
--- a/admin/src/views/project/buildingList.vue
+++ b/admin/src/views/project/buildingList.vue
@@ -2,62 +2,13 @@
<TableLayout :permissions="['business:ywbuilding:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="妤煎畤鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユゼ瀹囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
- <el-input v-model="searchForm.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缂栧彿" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ョ紪鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="addr">
- <el-input v-model="searchForm.addr" placeholder="璇疯緭鍏ュ湴鍧�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="闈㈢Н锛堝钩鏂圭背锛�" prop="area">
- <el-input v-model="searchForm.area" placeholder="璇疯緭鍏ラ潰绉紙骞虫柟绫筹級" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浜ф潈闈㈢Н锛堝钩鏂圭背锛�" prop="cqArea">
- <el-input v-model="searchForm.cqArea" placeholder="璇疯緭鍏ヤ骇鏉冮潰绉紙骞虫柟绫筹級" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍙闈㈢Н锛堝钩鏂圭背锛�" prop="rentArea">
- <el-input v-model="searchForm.rentArea" placeholder="璇疯緭鍏ュ彲绉熼潰绉紙骞虫柟绫筹級" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍦颁笂灞傛暟" prop="onFloor">
- <el-input v-model="searchForm.onFloor" placeholder="璇疯緭鍏ュ湴涓婂眰鏁�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍦颁笅灞傛暟" prop="underFloor">
- <el-input v-model="searchForm.underFloor" placeholder="璇疯緭鍏ュ湴涓嬪眰鏁�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
- <el-input v-model="searchForm.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" @keypress.enter.native="search"></el-input>
+ <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-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -68,7 +19,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywbuilding:create', 'business:ywbuilding:delete']">
- <li><el-button type="primary" @click="$refs.operaYwBuildingWindow.open('鏂板缓杩愮淮妤煎畤淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywbuilding:create']">鏂板缓</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
@@ -78,25 +29,17 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0鍚敤 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="imgurl" label="鍥炬爣" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="缂栧彿" min-width="100px"></el-table-column>
- <el-table-column prop="addr" label="鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="area" label="闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="cqArea" label="浜ф潈闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="rentArea" label="鍙闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="onFloor" label="鍦颁笂灞傛暟" min-width="100px"></el-table-column>
- <el-table-column prop="underFloor" label="鍦颁笅灞傛暟" min-width="100px"></el-table-column>
- <el-table-column prop="projectId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="妤煎畤鍚嶇О" min-width="100px">
+ <template v-slot="scope">
+ <span class="primaryColor cu" @click="handleDetail(scope.row)">{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
+ <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
v-if="containPermissions(['business:ywbuilding:update', 'business:ywbuilding:delete'])"
label="鎿嶄綔"
@@ -104,7 +47,8 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwBuildingWindow.open('缂栬緫杩愮淮妤煎畤淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywbuilding:update']">缂栬緫</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>
@@ -118,6 +62,8 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaYwBuildingWindow ref="operaYwBuildingWindow" @success="handlePageChange"/>
+ <FloorLevel ref="FloorLevelRef" @success="handlePageChange"/>
+ <BuildingDetail ref="BuildingDetailRef" />
</TableLayout>
</template>
@@ -126,34 +72,21 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaYwBuildingWindow from './components/OperaYwBuildingWindow'
+import BuildingDetail from './components/buildingDetail.vue'
+import FloorLevel from './components/floorLevel.vue'
+import { getProjectList } from '@/api/project/ywProject'
export default {
name: 'YwBuilding',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaYwBuildingWindow },
+ components: { TableLayout, Pagination, OperaYwBuildingWindow ,BuildingDetail, FloorLevel},
data () {
return {
// 鎼滅储
- searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
+ searchForm: {
name: '',
- remark: '',
- status: '',
- sortnum: '',
- imgurl: '',
- code: '',
- addr: '',
- area: '',
- cqArea: '',
- rentArea: '',
- onFloor: '',
- underFloor: '',
projectId: ''
- }
+ },
+ projectList: []
}
},
created () {
@@ -164,6 +97,30 @@
'field.main': 'id'
})
this.search()
+ this.getProject()
+ },
+ methods: {
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+ },
+ editClick(row) {
+ if(row && row.id){
+ this.$refs.operaYwBuildingWindow.open('缂栬緫妤煎畤')
+ }else{
+ this.$refs.operaYwBuildingWindow.open('鏂板缓妤煎畤')
+ }
+ this.$refs.operaYwBuildingWindow.getProject()
+ },
+ editFloor(row) {
+ this.$refs.FloorLevelRef.getList(row.id)
+ this.$refs.FloorLevelRef.visible = true
+ },
+ handleDetail(row) {
+ this.$refs.BuildingDetailRef.getDetail(row.id)
+ this.$refs.BuildingDetailRef.visible = true
+ },
}
}
</script>
--
Gitblit v1.9.3