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/components/houseDetails.vue | 118 ++++++++++++++++-------------------------------------------
1 files changed, 32 insertions(+), 86 deletions(-)
diff --git a/admin/src/views/project/components/houseDetails.vue b/admin/src/views/project/components/houseDetails.vue
index 394d64a..98310e9 100644
--- a/admin/src/views/project/components/houseDetails.vue
+++ b/admin/src/views/project/components/houseDetails.vue
@@ -6,10 +6,10 @@
width="100%">
<div class="right">
<div class="right_head">
- <span>{{info.roomNum}}</span>
- <el-tag type="success" v-if="info.leaseStatus === 0">寰呯璧�</el-tag>
- <el-tag type="success" v-if="info.leaseStatus === 1">宸茬璧�</el-tag>
- <el-tag type="success" v-if="info.leaseStatus === 2">鏈紑鍚璧�</el-tag>
+ <span class="right_head_title">{{info.roomNum}}</span>
+ <el-tag type="info" v-if="info.leaseStatus == 0">寰呯璧�</el-tag>
+ <el-tag type="success" v-if="info.leaseStatus == 1">宸茬璧�</el-tag>
+ <el-tag type="info" v-if="info.leaseStatus == 2">鏈紑鍚璧�</el-tag>
</div>
<div class="right_cate">
<el-tabs v-model="activeName" @tab-click="handleClick">
@@ -85,8 +85,13 @@
</template>
</el-table-column>
<el-table-column
- prop="renterName"
label="瀹㈡埛鍚嶇О">
+ <template slot-scope="{row}">
+ <div style="display: flex; align-items: center;">
+ {{row.renterName}}
+ <el-tag type="success" v-if="row.status === 1">褰撳墠绉熸埛</el-tag>
+ </div>
+ </template>
</el-table-column>
<el-table-column
prop="startDate"
@@ -177,14 +182,15 @@
value: 'id',
children: 'childCategoryList'
}" />
- <el-select v-model="form.status" style="width: 150px; margin-right: 15px;" placeholder="宸ュ崟鐘舵��">
- <el-option label="鍚敤" :value="0"></el-option>
- <el-option label="绂佺敤" :value="1"></el-option>
+ <el-select v-model="form.dealStatus" style="width: 150px; margin-right: 15px;" placeholder="宸ュ崟鐘舵��">
+ <el-option label="寰呮寚娲�" :value="0"></el-option>
+ <el-option label="宸叉寚娲�" :value="1"></el-option>
+ <el-option label="宸插鐞�" :value="2"></el-option>
</el-select>
<el-button type="primary" @click="getFetchList">鏌ヨ</el-button>
<el-button @click="clear">娓呯┖</el-button>
</div>
- <el-button type="primary" @click="$refs.operaYwWorkorderWindow.open('鏂板缓宸ュ崟')">鏂板宸ュ崟</el-button>
+ <el-button type="primary" @click="addWorkOrder">鏂板宸ュ崟</el-button>
</div>
<el-table
:data="tableData"
@@ -322,80 +328,6 @@
</el-card>
</div>
</el-tab-pane>
- <el-tab-pane label="璧勪骇淇℃伅" name="fourth">
- <div class="xm">
- <el-card>
- <div slot="header" class="clearfix">
- <span>璧勪骇娓呭崟</span>
- </div>
- <div class="xm_table">
- <div class="xm_table_search">
- <div class="xm_table_search_left">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ヨ祫浜у悕绉�/缂栫爜" style="width: 200px; margin-right: 15px;"></el-input>
- <el-select v-model="value" style="width: 200px; margin-right: 15px;" placeholder="璧勪骇鍒嗙被">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <el-button type="primary" @click="getPropertyLists">鏌ヨ</el-button>
- <el-button @click="clear">娓呯┖</el-button>
- </div>
- <el-button type="primary" @click="$refs.newMaterial.open('鏂板缓鐗╂枡')">鏂板</el-button>
- </div>
- <el-table
- :data="tableData"
- border
- v-loading="loading"
- style="width: 100%">
- <el-table-column
- prop="code"
- label="璧勪骇缂栫爜">
- </el-table-column>
- <el-table-column
- prop="name"
- label="璧勪骇鍚嶇О">
- </el-table-column>
- <el-table-column
- prop="qrcode"
- label="鏉＄爜">
- </el-table-column>
- <el-table-column
- prop="brand"
- label="鍝佺墝">
- </el-table-column>
- <el-table-column
- prop="attr"
- label="瑙勬牸鍨嬪彿">
- </el-table-column>
- <el-table-column
- prop="unitName"
- label="鍗曚綅">
- </el-table-column>
- <el-table-column
- label="搴撳瓨鏁伴噺">
- <template v-slot="scope">
- <span>{{ scope.row.maxStock }} ~ {{ scope.row.minStock }}</span>
- </template>
- </el-table-column>
- </el-table>
- <div class="xm_table_f">
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="page"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="pageTotal"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total">
- </el-pagination>
- </div>
- </div>
- </el-card>
- </div>
- </el-tab-pane>
</el-tabs>
</div>
</div>
@@ -448,7 +380,8 @@
areaIds: [],
cateId: '',
status: '',
- name: ''
+ name: '',
+ dealStatus: ''
},
cateList: [],
categaryList: [],
@@ -460,6 +393,7 @@
methods: {
open (title, id) {
this.title = title
+ this.activeName = 'houseinfo'
this.houseId = id
detailById(id)
.then(res => {
@@ -470,7 +404,10 @@
handleEdit(row) {
this.showEdit1 = true
this.$nextTick(() => {
+ this.$refs.EditRef.param.projectId = this.info.projectId
+ this.$refs.EditRef.param.rooms = [this.info.projectId, this.info.buildingId, this.info.floor, this.info.id]
this.$refs.EditRef.isShowModal = true
+ this.$refs.EditRef.changeProject()
})
},
handleDetail(row) {
@@ -479,6 +416,13 @@
this.$refs.DetailRef.visible = true
this.$refs.DetailRef.id = row.id
this.$refs.DetailRef.getDetail()
+ })
+ },
+ addWorkOrder() {
+ this.$refs.operaYwWorkorderWindow.open('鏂板缓宸ュ崟', {
+ rooms: [this.info.projectId, this.info.buildingId, this.info.floor, this.info.id],
+ areaType: 0,
+ content: ''
})
},
// 鑾峰彇璁惧鐘舵��
@@ -562,6 +506,7 @@
this.form.status = ''
this.form.areaIds = []
this.form.cateId = ''
+ this.form.dealStatus = ''
this.form.name = ''
if (this.propsName === 'project') {
this.getTenantContract()
@@ -607,7 +552,7 @@
capacity: this.pageTotal,
page: this.page,
model: {
- roomIds: [this.houseId],
+ roomId: this.houseId,
code: this.form.code
}
}).then(res => {
@@ -739,6 +684,7 @@
this.form.cateId = ''
this.form.status = ''
this.form.name = ''
+ this.form.dealStatus = ''
this.propsName = tab._props.name
if (tab._props.name === 'project') {
this.getTenantContract()
@@ -791,7 +737,7 @@
width: 100%;
padding: 20px;
box-sizing: border-box;
- span {
+ .right_head_title {
font-size: 16px;
font-weight: bold;
color: black;
--
Gitblit v1.9.3