diff --git a/public/import/hc.xlsx b/public/import/hc.xlsx new file mode 100644 index 0000000..d92bcf9 --- /dev/null +++ b/public/import/hc.xlsx diff --git a/public/import/hc20200610.xlsx b/public/import/hc20200610.xlsx new file mode 100644 index 0000000..5acb3fb --- /dev/null +++ b/public/import/hc20200610.xlsx diff --git a/public/import/importCar.xlsx b/public/import/importCar.xlsx new file mode 100644 index 0000000..c72ea6c --- /dev/null +++ b/public/import/importCar.xlsx diff --git a/public/import/importCarFeeDetail.xlsx b/public/import/importCarFeeDetail.xlsx new file mode 100644 index 0000000..8da8272 --- /dev/null +++ b/public/import/importCarFeeDetail.xlsx diff --git a/public/import/importFeeDetail.xlsx b/public/import/importFeeDetail.xlsx new file mode 100644 index 0000000..fc420dd --- /dev/null +++ b/public/import/importFeeDetail.xlsx diff --git a/public/import/importResourceStore.xlsx b/public/import/importResourceStore.xlsx new file mode 100644 index 0000000..658a275 --- /dev/null +++ b/public/import/importResourceStore.xlsx diff --git a/public/import/importRoom.xlsx b/public/import/importRoom.xlsx new file mode 100644 index 0000000..2830f03 --- /dev/null +++ b/public/import/importRoom.xlsx diff --git a/public/import/meterMachine.xlsx b/public/import/meterMachine.xlsx new file mode 100644 index 0000000..0c8e5cd --- /dev/null +++ b/public/import/meterMachine.xlsx diff --git a/public/import/wy.xlsx b/public/import/wy.xlsx new file mode 100644 index 0000000..0c83bee --- /dev/null +++ b/public/import/wy.xlsx diff --git a/src/api/room/addFloorApi.js b/src/api/room/addFloorApi.js index aece448..d5669c0 100644 --- a/src/api/room/addFloorApi.js +++ b/src/api/room/addFloorApi.js @@ -3,11 +3,11 @@ import request from '@/utils/request' export function addFloor(data) { return new Promise((resolve, reject) => { request({ - url: '/floor/saveFloor', + url: '/floor.saveFloor', method: 'post', data }).then(response => { - resolve(response) + resolve(response.data) }).catch(error => { reject(error) }) diff --git a/src/api/room/deleteFloorApi.js b/src/api/room/deleteFloorApi.js index c75a73b..2204490 100644 --- a/src/api/room/deleteFloorApi.js +++ b/src/api/room/deleteFloorApi.js @@ -3,11 +3,11 @@ import request from '@/utils/request' export function deleteFloor(data) { return new Promise((resolve, reject) => { request({ - url: '/floor/deleteFloor', + url: '/floor.deleteFloor', method: 'post', data }).then(response => { - resolve(response) + resolve(response.data) }).catch(error => { reject(error) }) diff --git a/src/api/room/deleteUnitApi.js b/src/api/room/deleteUnitApi.js index 60e055d..dbda741 100644 --- a/src/api/room/deleteUnitApi.js +++ b/src/api/room/deleteUnitApi.js @@ -1,14 +1,14 @@ import request from '@/utils/request' -export function deleteUnit(params) { +export function deleteUnit(data) { return new Promise((resolve, reject) => { request({ url: '/unit.deleteUnit', method: 'post', - params + data }).then(response => { const res = response.data - if (res.code === 0) { + if (res.code == 0) { resolve(res) } else { reject(new Error(res.msg || '删除单元失败')) diff --git a/src/api/room/editFloorApi.js b/src/api/room/editFloorApi.js index 2386c6f..f383286 100644 --- a/src/api/room/editFloorApi.js +++ b/src/api/room/editFloorApi.js @@ -3,11 +3,11 @@ import request from '@/utils/request' export function editFloor(data) { return new Promise((resolve, reject) => { request({ - url: '/floor/editFloor', + url: '/floor.editFloor', method: 'post', data }).then(response => { - resolve(response) + resolve(response.data) }).catch(error => { reject(error) }) diff --git a/src/api/room/editRoomApi.js b/src/api/room/editRoomApi.js index 2688c2b..1b88b0f 100644 --- a/src/api/room/editRoomApi.js +++ b/src/api/room/editRoomApi.js @@ -27,11 +27,8 @@ export function getUnits(params) { params }).then(response => { const res = response.data - if (res.code === 0) { - resolve(res.data) - } else { - reject(new Error(res.msg || '获取单元列表失败')) - } + + resolve(res) }).catch(error => { reject(error) }) diff --git a/src/api/room/floorUnitTreeApi.js b/src/api/room/floorUnitTreeApi.js index 1d6b92b..0b05b8a 100644 --- a/src/api/room/floorUnitTreeApi.js +++ b/src/api/room/floorUnitTreeApi.js @@ -8,11 +8,7 @@ export function getFloorAndUnits(communityId) { params: { communityId } }).then(response => { const res = response.data - if (res.code === 0) { - resolve(res.data) - } else { - reject(new Error(res.msg || '获取楼栋单元失败')) - } + resolve(res) }).catch(error => { reject(error) }) diff --git a/src/api/room/ownerRoomsApi.js b/src/api/room/ownerRoomsApi.js index 6736f5a..00c21b7 100644 --- a/src/api/room/ownerRoomsApi.js +++ b/src/api/room/ownerRoomsApi.js @@ -8,11 +8,7 @@ export function queryRoomsByOwner(params) { params }).then(response => { const res = response.data - if (res.code === 0) { - resolve(res.data) - } else { - reject(new Error(res.msg || '获取业主房屋失败')) - } + resolve(res) }).catch(error => { reject(error) }) diff --git a/src/api/room/roomApi.js b/src/api/room/roomApi.js index 1b9f823..9274875 100644 --- a/src/api/room/roomApi.js +++ b/src/api/room/roomApi.js @@ -9,11 +9,7 @@ export function queryRooms(params) { params }).then(response => { const res = response.data - if (res.code === 0) { resolve(res) - } else { - reject(new Error(res.msg || '获取房屋列表失败')) - } }).catch(error => { reject(error) }) @@ -29,11 +25,8 @@ export function getFloors(params) { params }).then(response => { const res = response.data - if (res.code === 0) { + resolve(res) - } else { - reject(new Error(res.msg || '获取楼栋列表失败')) - } }).catch(error => { reject(error) }) @@ -49,11 +42,8 @@ export function getUnits(params) { params }).then(response => { const res = response.data - if (res.code === 0) { + resolve(res) - } else { - reject(new Error(res.msg || '获取单元列表失败')) - } }).catch(error => { reject(error) }) diff --git a/src/components/admin/WriteAdvertMachine.vue b/src/components/admin/WriteAdvertMachine.vue index 40f4e70..102cdf5 100644 --- a/src/components/admin/WriteAdvertMachine.vue +++ b/src/components/admin/WriteAdvertMachine.vue @@ -44,7 +44,7 @@ export default { path: '/advertVedio', query: { machineCode: this.machineCode, - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() } }) this.visible = false diff --git a/src/components/community/DeleteRoomRenovation.vue b/src/components/community/DeleteRoomRenovation.vue index dad58ce..e36f9a7 100644 --- a/src/components/community/DeleteRoomRenovation.vue +++ b/src/components/community/DeleteRoomRenovation.vue @@ -38,7 +38,7 @@ export default { open(row) { this.form = { rId: row.rId, - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() } this.visible = true }, diff --git a/src/components/community/EditRoomRenovation.vue b/src/components/community/EditRoomRenovation.vue index 7f6f5ef..96149fe 100644 --- a/src/components/community/EditRoomRenovation.vue +++ b/src/components/community/EditRoomRenovation.vue @@ -177,7 +177,7 @@ export default { this.getDictData() this.form = { ...row, - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() } this.visible = true }, diff --git a/src/components/community/RoomDecorationAcceptance.vue b/src/components/community/RoomDecorationAcceptance.vue index 73c3704..9a01280 100644 --- a/src/components/community/RoomDecorationAcceptance.vue +++ b/src/components/community/RoomDecorationAcceptance.vue @@ -71,7 +71,7 @@ export default { state: '', remark: '', detailType: '1001', - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() } this.visible = true }, @@ -83,7 +83,7 @@ export default { state: '', remark: '', detailType: '1001', - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() } }, diff --git a/src/components/community/RoomRenovationCompleted.vue b/src/components/community/RoomRenovationCompleted.vue index 3c37200..cf1491e 100644 --- a/src/components/community/RoomRenovationCompleted.vue +++ b/src/components/community/RoomRenovationCompleted.vue @@ -38,7 +38,7 @@ export default { open(row) { this.form = { rId: row.rId, - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() } this.visible = true }, diff --git a/src/components/community/RoomToExamine.vue b/src/components/community/RoomToExamine.vue index a0b95cd..1b97775 100644 --- a/src/components/community/RoomToExamine.vue +++ b/src/components/community/RoomToExamine.vue @@ -69,7 +69,7 @@ export default { roomName: row.roomName, state: '', examineRemark: '', - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() } this.visible = true }, diff --git a/src/components/mall/DeleteJunkRequirement.vue b/src/components/mall/DeleteJunkRequirement.vue index fab2cc8..741d3fe 100644 --- a/src/components/mall/DeleteJunkRequirement.vue +++ b/src/components/mall/DeleteJunkRequirement.vue @@ -39,7 +39,7 @@ export default { try { await deleteJunkRequirement({ junkRequirementId: this.junkRequirementId, - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() }) this.$message.success(this.$t('junkRequirement.delete.success')) this.$emit('success') diff --git a/src/components/mall/EditJunkRequirement.vue b/src/components/mall/EditJunkRequirement.vue index fc40f04..fb09936 100644 --- a/src/components/mall/EditJunkRequirement.vue +++ b/src/components/mall/EditJunkRequirement.vue @@ -120,7 +120,7 @@ export default { try { await updateJunkRequirement({ ...this.editJunkRequirementInfo, - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() }) this.$message.success(this.$t('junkRequirement.edit.success')) this.$emit('success') diff --git a/src/components/owner/ownerCars.vue b/src/components/owner/ownerCars.vue index 982fd27..b6296af 100644 --- a/src/components/owner/ownerCars.vue +++ b/src/components/owner/ownerCars.vue @@ -1,11 +1,5 @@