From 105be897f4e9555c2d3166a13278bbad78e2ef35 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 08 二月 2025 17:49:48 +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/roomStatus/index.vue | 12 ++++++++++--
admin/src/views/contract/components/terminateLease.vue | 15 ++++++++++++---
admin/src/views/finance/components/bullDetail.vue | 2 +-
admin/src/views/contract/components/terminationAgreement.vue | 2 +-
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index ac7f8f2..5520b8a 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -27,6 +27,7 @@
<el-date-picker
v-model="form.btDate"
type="date"
+ :picker-options="pickerOptions"
@change="changeBtDate"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨">
@@ -56,12 +57,12 @@
<el-table-column prop="projectName" label="椤圭洰鍚嶇О" show-overflow-tooltip />
<el-table-column label="鎴挎簮鍚嶇О" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.buildingName}}/{{row.code}}
+ {{row.buildingName}}/{{row.roomNum}}
</template>
</el-table-column>
<el-table-column label="绉熻祦闈㈢Н(銕�)" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.area}}銕�
+ {{row.rentArea}}銕�
</template>
</el-table-column>
</el-table>
@@ -250,7 +251,7 @@
},
list: [],
-
+ pickerOptions: {},
agentList: [],
receivable: '',
@@ -263,6 +264,14 @@
open (title, info) {
this.title = title
this.info = info
+ this.pickerOptions = {
+ disabledDate(time) {
+ // 濡傛灉娌℃湁鍚庨潰鐨� -8.64e7 灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ const beginDate = new Date(info.startDate).getTime() - 8.64e7
+ const endDate = new Date(info.endDate).getTime()
+ return beginDate > time.getTime() || endDate < time.getTime()
+ }
+ }
this.form.id = info.id
this.form.btSignDate = this.getDay()
this.form.btUserId = this.userInfo.id
diff --git a/admin/src/views/contract/components/terminationAgreement.vue b/admin/src/views/contract/components/terminationAgreement.vue
index e9ed052..d870309 100644
--- a/admin/src/views/contract/components/terminationAgreement.vue
+++ b/admin/src/views/contract/components/terminationAgreement.vue
@@ -23,7 +23,7 @@
</el-table-column>
<el-table-column label="闈㈢Н" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.area}}銕�
+ {{row.rentArea}}銕�
</template>
</el-table-column>
</el-table>
diff --git a/admin/src/views/finance/components/bullDetail.vue b/admin/src/views/finance/components/bullDetail.vue
index 976f0a0..468dd98 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/admin/src/views/finance/components/bullDetail.vue
@@ -9,7 +9,7 @@
<el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
</div>
<div style="display: flex; align-items: center;">
- <el-button @click="$refs.call.open('鍙戦�佸偓缂撮�氱煡', [info.id])">鍙戦�佺即璐归�氱煡</el-button>
+ <el-button @click="$refs.call.open('鍙戦�佸偓缂撮�氱煡', [info.id])" v-if="info.billType === 0">鍙戦�佺即璐归�氱煡</el-button>
<el-button plain type="primary" v-if="![1].includes(info.payStatus)" @click="$refs.flowingWater.open('鍒涘缓鏀舵敮娴佹按', {
billType: returnBillType(),
billId: info.id,
diff --git a/admin/src/views/roomStatus/index.vue b/admin/src/views/roomStatus/index.vue
index ac4fd77..2af5abd 100644
--- a/admin/src/views/roomStatus/index.vue
+++ b/admin/src/views/roomStatus/index.vue
@@ -587,7 +587,7 @@
<el-table-column
label="璁惧缂栫爜">
<template slot-scope="{row}">
- <el-button type="text">{{row.code}}</el-button>
+ <el-button type="text" @click="handledeviveDetail(row.id)">{{row.code}}</el-button>
</template>
</el-table-column>
<el-table-column
@@ -646,6 +646,8 @@
<Edit v-if="showEdit1" ref="EditRef" @success="getDevicePage" @close="showEdit1 = false" />
<!-- 鍚堝悓璇︽儏 -->
<ContractDetail ref="ContractDetailRef" />
+ <!-- 璁惧璇︽儏 -->
+ <deviceDetail ref="deviceDetail" />
</div>
</template>
@@ -662,9 +664,10 @@
import { fetchList as devicePage, getDeviceCateData, getDeviceStatus } from '@/api/Inspection/device'
import Edit from '../operation/components/deviceEdit'
import ContractDetail from '../contract/components/contractDetail'
+ import deviceDetail from '../operation/components/deviceDetail'
export default {
name: 'index',
- components: { OperaYwWorkorderWindow, Detail, Edit, ContractDetail },
+ components: { OperaYwWorkorderWindow, Detail, Edit, ContractDetail, deviceDetail },
data() {
return {
showDetail: false,
@@ -719,6 +722,11 @@
}
},
methods: {
+ handledeviveDetail(id) {
+ this.$refs.deviceDetail.visible = true
+ this.$refs.deviceDetail.id = id
+ this.$refs.deviceDetail.getDetail()
+ },
nodeClick(e) {
this.tableData = []
this.pageSize = 10
--
Gitblit v1.9.3