From 4b072d941ea2e1438013b65539370d77365589fe Mon Sep 17 00:00:00 2001
From: zhongchangyuyu <rain66_zcy@163.com>
Date: Fri, 25 Apr 2025 09:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc/src/api/building.js | 20 +++++------
pc/src/api/project.js | 10 +++---
pc/src/api/room.js | 20 +++++------
pc/src/views/project/index.vue | 4 +--
.../project/room/components/DetailView.vue | 10 +++---
.../project/room/components/RoomForm.vue | 32 ++++++++---------
pc/src/views/project/room/index.vue | 34 +++++++++----------
7 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/pc/src/api/building.js b/pc/src/api/building.js
index 73f6970..1a84d68 100644
--- a/pc/src/api/building.js
+++ b/pc/src/api/building.js
@@ -35,7 +35,7 @@ export function addBuilding(data) {
})
return request({
- url: '/room/building',
+ url: '/room/building/add',
method: 'post',
data: processedData
})
@@ -59,8 +59,8 @@ export function updateBuilding(data) {
})
return request({
- url: '/room/building',
- method: 'put',
+ url: '/room/building/edit',
+ method: 'post',
data: processedData
})
}
@@ -68,8 +68,8 @@ export function updateBuilding(data) {
// 删除楼宇
export function deleteBuilding(ids) {
return request({
- url: `/room/building/${ids}`,
- method: 'delete'
+ url: `/room/building/remove/${ids}`,
+ method: 'post'
})
}
@@ -100,7 +100,7 @@ export function getFloorDetail(id) {
// 新增楼层
export function addFloor(data) {
return request({
- url: '/room/floor',
+ url: '/room/floor/add',
method: 'post',
data: data
})
@@ -109,8 +109,8 @@ export function addFloor(data) {
// 修改楼层
export function updateFloor(data) {
return request({
- url: '/room/floor',
- method: 'put',
+ url: '/room/floor/edit',
+ method: 'post',
data: data
})
}
@@ -118,8 +118,8 @@ export function updateFloor(data) {
// 删除楼层
export function deleteFloor(ids) {
return request({
- url: `/room/floor/${ids}`,
- method: 'delete'
+ url: `/room/floor/remove/${ids}`,
+ method: 'post'
})
}
diff --git a/pc/src/api/project.js b/pc/src/api/project.js
index b84c48e..5878920 100644
--- a/pc/src/api/project.js
+++ b/pc/src/api/project.js
@@ -20,7 +20,7 @@ export function getProjectDetail(id) {
// 新增项目
export function addProject(data) {
return request({
- url: '/room/project',
+ url: '/room/project/add',
method: 'post',
data: data
})
@@ -30,8 +30,8 @@ export function addProject(data) {
export function updateProject(id, data) {
const updateData = { ...data, id }
return request({
- url: '/room/project',
- method: 'put',
+ url: '/room/project/edit',
+ method: 'post',
data: updateData
})
}
@@ -39,8 +39,8 @@ export function updateProject(id, data) {
// 删除项目
export function deleteProject(id) {
return request({
- url: `/room/project/${id}`,
- method: 'delete'
+ url: `/room/project/remove/${id}`,
+ method: 'post'
})
}
diff --git a/pc/src/api/room.js b/pc/src/api/room.js
index 4496ed6..79b20b2 100644
--- a/pc/src/api/room.js
+++ b/pc/src/api/room.js
@@ -20,7 +20,7 @@ export function getRoom(id) {
// 新增房源
export function addRoom(data) {
return request({
- url: '/room',
+ url: '/room/add',
method: 'post',
data: data
})
@@ -29,8 +29,8 @@ export function addRoom(data) {
// 修改房源
export function updateRoom(data) {
return request({
- url: '/room',
- method: 'put',
+ url: '/room/edit',
+ method: 'post',
data: data
})
}
@@ -38,16 +38,16 @@ export function updateRoom(data) {
// 删除房源
export function delRoom(id) {
return request({
- url: '/room/' + id,
- method: 'delete'
+ url: '/room/remove/' + id,
+ method: 'post'
})
}
// 批量删除房源
export function delRoomBatch(ids) {
return request({
- url: '/room/batch/' + ids,
- method: 'delete'
+ url: '/room/batch/remove/' + ids,
+ method: 'post'
})
}
@@ -139,7 +139,7 @@ export function checkRoomContractStatus(roomId) {
export function updateRoomLeaseStatus(id, status) {
return request({
url: '/room/lease-status',
- method: 'put',
+ method: 'post',
data: { id, status }
})
}
@@ -185,7 +185,7 @@ export function uploadRoomImage(roomId, imageType, file, sortOrder) {
export function deleteRoomImage(id) {
return request({
url: '/room/image/' + id,
- method: 'delete'
+ method: 'post'
})
}
@@ -193,7 +193,7 @@ export function deleteRoomImage(id) {
export function batchDeleteRoomImages(ids) {
return request({
url: '/room/images/batch',
- method: 'delete',
+ method: 'post',
data: { ids }
})
}
\ No newline at end of file
diff --git a/pc/src/views/project/index.vue b/pc/src/views/project/index.vue
index e66e3bf..cfe9034 100644
--- a/pc/src/views/project/index.vue
+++ b/pc/src/views/project/index.vue
@@ -191,11 +191,11 @@
<el-descriptions-item label="竣工时间">{{ detail.completionTime }}</el-descriptions-item>
<el-descriptions-item label="标准层高">{{ detail.standardHeight }}m</el-descriptions-item>
<el-descriptions-item label="物业">{{ detail.property }}</el-descriptions-item>
- <el-descriptions-item label="物业费">{{ detail.propertyFee }}元/㎡/月</el-descriptions-item>
+ <el-descriptions-item label="物业费">{{ detail.propertyFee }}元/㎡·月</el-descriptions-item>
<el-descriptions-item label="车位数量">{{ detail.parkingSpaces }}</el-descriptions-item>
<el-descriptions-item label="车位月租金">{{ detail.parkingFee }}元/月</el-descriptions-item>
<el-descriptions-item label="空调">{{ detail.airConditioning }}</el-descriptions-item>
- <el-descriptions-item label="空调费">{{ detail.airConditioningFee }}元/㎡/月</el-descriptions-item>
+ <el-descriptions-item label="空调费">{{ detail.airConditioningFee }}元/㎡·月</el-descriptions-item>
<el-descriptions-item label="空调开放时间">{{ detail.airConditioningTime }}</el-descriptions-item>
<el-descriptions-item label="电梯">{{ detail.elevator }}</el-descriptions-item>
<el-descriptions-item label="网络">{{ detail.network }}</el-descriptions-item>
diff --git a/pc/src/views/project/room/components/DetailView.vue b/pc/src/views/project/room/components/DetailView.vue
index 06905bb..1011c76 100644
--- a/pc/src/views/project/room/components/DetailView.vue
+++ b/pc/src/views/project/room/components/DetailView.vue
@@ -176,8 +176,8 @@ export default {
},
priceUnitText() {
const unitMap = {
- '1': '元/㎡/天',
- '2': '元/㎡/月',
+ '1': '元/㎡·天',
+ '2': '元/㎡·月',
'3': '元/月',
'4': '元/天',
'5': '元/年'
@@ -186,8 +186,8 @@ export default {
},
floorPriceUnitText() {
const unitMap = {
- '1': '元/㎡/天',
- '2': '元/㎡/月',
+ '1': '元/㎡·天',
+ '2': '元/㎡·月',
'3': '元/月',
'4': '元/天',
'5': '元/年'
@@ -216,7 +216,7 @@ export default {
this.loading = true
getRoom(this.roomId).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.roomDetail = response.data
// 处理业务信息
diff --git a/pc/src/views/project/room/components/RoomForm.vue b/pc/src/views/project/room/components/RoomForm.vue
index 84dcf1d..d2e4ee6 100644
--- a/pc/src/views/project/room/components/RoomForm.vue
+++ b/pc/src/views/project/room/components/RoomForm.vue
@@ -216,8 +216,8 @@
<el-form-item label="报价" prop="price">
<el-input v-model="form.price" placeholder="请输入报价" @input="handleInputChange">
<el-select slot="append" v-model="form.priceUnit" style="width: 100px" @change="handleInputChange">
- <el-option label="元/㎡/天" value="1" />
- <el-option label="元/㎡/月" value="2" />
+ <el-option label="元/㎡·天" value="1" />
+ <el-option label="元/㎡·月" value="2" />
<el-option label="元/月" value="3" />
<el-option label="元/天" value="4" />
<el-option label="元/年" value="5" />
@@ -230,8 +230,8 @@
<el-form-item label="底价" prop="floorPrice">
<el-input v-model="form.floorPrice" placeholder="请输入底价" @input="handleInputChange">
<el-select slot="append" v-model="form.floorPriceUnit" style="width: 100px" @change="handleInputChange">
- <el-option label="元/㎡/天" value="1" />
- <el-option label="元/㎡/月" value="2" />
+ <el-option label="元/㎡·天" value="1" />
+ <el-option label="元/㎡·月" value="2" />
<el-option label="元/月" value="3" />
<el-option label="元/天" value="4" />
<el-option label="元/年" value="5" />
@@ -415,9 +415,9 @@ export default {
availableDate: '',
decorationStatus: '4', // 默认标准交付
price: '',
- priceUnit: '2', // 默认元/㎡/月
+ priceUnit: '2', // 默认元/㎡·月
floorPrice: '',
- floorPriceUnit: '2', // 默认元/㎡/月
+ floorPriceUnit: '2', // 默认元/㎡·月
businessNumber: '',
businessCondition: '',
rentFreePeriod: '',
@@ -462,7 +462,7 @@ export default {
getRoomDetail() {
this.loading = true
getRoom(this.roomId).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.form = { ...response.data }
// 处理业务信息字段
@@ -540,7 +540,7 @@ export default {
/** 获取项目选项 */
getProjectOptions() {
getProjectList({ pageSize: 100 }).then(res => {
- if (res.code === '000000') {
+ if (res.code === '0000000000000000') {
this.projectOptions = res.data.list.map(item => {
return { id: item.id, projectName: item.projectName }
})
@@ -563,7 +563,7 @@ export default {
pageSize: 100,
}
getBuildingList(params).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.buildingOptions = response.data.list || []
} else {
this.$message.error(response.msg || '获取楼宇列表失败')
@@ -579,7 +579,7 @@ export default {
return
}
return listFloors(buildingId).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.floorOptions = response.data || []
} else {
this.$message.error(response.msg || '获取楼层列表失败')
@@ -602,7 +602,7 @@ export default {
/** 获取业主详情 */
getOwnerDetail(ownerId) {
listOwners({ id: ownerId }).then(response => {
- if (response.code === '000000' && response.data && response.data.length > 0) {
+ if (response.code === '0000000000000000' && response.data && response.data.length > 0) {
this.ownerOptions = response.data
}
})
@@ -614,7 +614,7 @@ export default {
this.ownerLoading = true
listOwners({ keyword: query }).then(response => {
this.ownerLoading = false
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.ownerOptions = response.data
} else {
this.ownerOptions = []
@@ -649,7 +649,7 @@ export default {
if (buildingId) {
getFloorListByBuilding(buildingId).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.floorOptions = response.data || []
} else {
this.$message.error(response.msg || '获取楼层列表失败')
@@ -666,7 +666,7 @@ export default {
/** 房源图片上传成功 */
handleImageSuccess(response, file, fileList) {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.form.imageUrls.push(response.data.imageUrl)
this.imageList = fileList.map(file => {
if (file.response) {
@@ -689,7 +689,7 @@ export default {
/** 户型图上传成功 */
handleFloorPlanImageSuccess(response, file, fileList) {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.form.floorPlanImageUrls.push(response.data.imageUrl)
this.floorPlanImageList = fileList.map(file => {
if (file.response) {
@@ -788,7 +788,7 @@ export default {
const method = this.isEdit ? updateRoom : addRoom
method(formData).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.$message.success(this.isEdit ? '修改成功' : '新增成功')
this.$emit('refreshList')
this.$emit('close')
diff --git a/pc/src/views/project/room/index.vue b/pc/src/views/project/room/index.vue
index 8596b92..3f1755b 100644
--- a/pc/src/views/project/room/index.vue
+++ b/pc/src/views/project/room/index.vue
@@ -39,7 +39,7 @@
<el-input v-model="queryParams.roomNumber" placeholder="请输入房号" clearable style="width: 240px;" />
</el-form-item>
<el-form-item label="标签" prop="tags">
- <el-select v-model="queryParams.tags" placeholder="请选择房源标签" clearable multiple style="width: 240px;">
+ <el-select v-model="queryParams.tags" placeholder="请选择房源标签" clearable style="width: 240px;">
<el-option v-for="tag in tagOptions" :key="tag.id" :label="tag.tagName" :value="tag.id" />
</el-select>
</el-form-item>
@@ -262,7 +262,7 @@ export default {
buildingId: undefined,
floorId: undefined,
roomNumber: undefined,
- tags: [],
+ tags: undefined,
rentalStatus: undefined,
businessStatus: undefined,
decorationStatus: undefined
@@ -321,7 +321,7 @@ export default {
}
listRoom(params).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.roomList = response.data.list || []
this.total = response.data.total
} else {
@@ -339,7 +339,7 @@ export default {
getProjectOptions() {
// 调用项目列表接口获取项目选项
getProjectList({ pageSize: 100 }).then(res => {
- if (res.code === '000000') {
+ if (res.code === '0000000000000000') {
this.projectOptions = res.data.list.map(item => {
return { id: item.id, projectName: item.projectName }
})
@@ -362,7 +362,7 @@ export default {
pageSize: 100,
}
getBuildingList(params).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.buildingOptions = response.data.list || []
} else {
this.$message.error(response.msg || '获取楼宇列表失败')
@@ -379,7 +379,7 @@ export default {
}
listFloors(buildingId).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.floorOptions = response.data || []
} else {
this.$message.error(response.msg || '获取楼层列表失败')
@@ -420,7 +420,7 @@ export default {
if (buildingId) {
getFloorListByBuilding(buildingId).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.floorOptions = response.data || []
} else {
this.$message.error(response.msg || '获取楼层列表失败')
@@ -451,7 +451,7 @@ export default {
buildingId: undefined,
floorId: undefined,
roomNumber: undefined,
- tags: [],
+ tags: undefined,
rentalStatus: undefined,
businessStatus: tabBusinessStatus,
decorationStatus: undefined
@@ -476,13 +476,13 @@ export default {
/** 导出房源数据 */
handleExport() {
- const params = this.ids
- if(this.ids.length === 0){
- this.$message.warning('请至少选择一条数据')
- return
+ const params = {...this.queryParams}
+ if (this.dateRange && this.dateRange.length > 0) {
+ params.beginTime = this.dateRange[0]
+ params.endTime = this.dateRange[1]
}
- this.$confirm('是否确认导出所选房源数据?', '警告', {
+ this.$confirm('是否确认导出查询房源数据?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -519,7 +519,7 @@ export default {
this.upload.isUploading = false
this.$refs.upload.clearFiles()
this.importOpen = false
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.$alert(`response.data.message `, { type: 'success' })
this.getList()
} else {
@@ -564,7 +564,7 @@ export default {
type: 'warning'
}).then(() => {
delRoom(roomId).then(response => {
- if (response.code === '000000') {
+ if (response.code === '0000000000000000') {
this.$message.success('删除成功')
this.getList()
} else {
@@ -590,8 +590,8 @@ export default {
getPriceUnitText(unitType) {
if (!unitType) return '';
const unitMap = {
- '1': '元/㎡/天',
- '2': '元/㎡/月',
+ '1': '元/㎡·天',
+ '2': '元/㎡·月',
'3': '元/月',
'4': '元/天',
'5': '元/年'