diff --git a/src/api/fee/roomOweFeeCallableApi.js b/src/api/fee/roomOweFeeCallableApi.js new file mode 100644 index 0000000..2f01911 --- /dev/null +++ b/src/api/fee/roomOweFeeCallableApi.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +/** + * 保存催缴欠费信息 + * @param {Object} data + * @returns {Promise} + */ +export function saveOweFeeCallable(data) { + return new Promise((resolve, reject) => { + request({ + url: '/oweFeeCallable.saveOweFeeCallable', + method: 'post', + data + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} + +/** + * 获取欠费列表 + * @param {Object} params + * @returns {Promise} + */ +export function listFee(params) { + return new Promise((resolve, reject) => { + request({ + url: '/fee.listFee', + method: 'get', + params + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/owner/ownerApi.js b/src/api/owner/ownerApi.js index d442110..73766f3 100644 --- a/src/api/owner/ownerApi.js +++ b/src/api/owner/ownerApi.js @@ -132,9 +132,9 @@ export function getAttrSpec(specCd) { export function getAttrValue(specCd) { return new Promise((resolve, reject) => { request({ - url: '/attrValue.listAttrValues', + url: '/attrValue/queryAttrValue', method: 'get', - params: { specCd, communityId: getCommunityId() } + params: { specCd, communityId: getCommunityId(), page: 1, row: 100 } }).then(response => { const res = response.data if (res.code == 0) { diff --git a/src/api/simplify/simplifyOwnerAccessContolApi.js b/src/api/simplify/simplifyOwnerAccessContolApi.js index 1473f69..abcbdf2 100644 --- a/src/api/simplify/simplifyOwnerAccessContolApi.js +++ b/src/api/simplify/simplifyOwnerAccessContolApi.js @@ -1,9 +1,17 @@ import request from '@/utils/request' export function listMachineTranslates(params) { - return request({ - url: '/machineTranslate.listMachineTranslates', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/machineTranslate.listMachineTranslates', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + + }).catch(error => { + reject(error) + }) }) } \ No newline at end of file diff --git a/src/api/simplify/simplifyOwnerCarApi.js b/src/api/simplify/simplifyOwnerCarApi.js index ce65881..f3c731f 100644 --- a/src/api/simplify/simplifyOwnerCarApi.js +++ b/src/api/simplify/simplifyOwnerCarApi.js @@ -1,10 +1,21 @@ import request from '@/utils/request' export function queryOwnerCars(params) { - return request({ - url: '/owner.queryOwnerCars', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/owner.queryOwnerCars', + method: 'get', + 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/api/simplify/simplifyOwnerComplaintApi.js b/src/api/simplify/simplifyOwnerComplaintApi.js index f2d2e4e..874b1ff 100644 --- a/src/api/simplify/simplifyOwnerComplaintApi.js +++ b/src/api/simplify/simplifyOwnerComplaintApi.js @@ -1,10 +1,21 @@ import request from '@/utils/request' export function listComplaints(params) { - return request({ - url: '/complaint.listComplaints', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/complaint.listComplaints', + method: 'get', + 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/api/simplify/simplifyOwnerMemberApi.js b/src/api/simplify/simplifyOwnerMemberApi.js index 32d315e..f674fae 100644 --- a/src/api/simplify/simplifyOwnerMemberApi.js +++ b/src/api/simplify/simplifyOwnerMemberApi.js @@ -1,9 +1,21 @@ import request from '@/utils/request' export function queryOwnerMembers(params) { - return request({ - url: '/owner.queryOwnerMembers', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/owner.queryOwnerMembers', + method: 'get', + params + }).then(response => { + const res = response.data + if (res.code == 0) { + resolve(res) + } else { + reject(new Error(res.msg || '查询业主成员失败')) + } + }).catch(error => { + reject(error) + }) }) + } \ No newline at end of file diff --git a/src/api/simplify/simplifyOwnerRepairApi.js b/src/api/simplify/simplifyOwnerRepairApi.js index 5614ee0..e6803da 100644 --- a/src/api/simplify/simplifyOwnerRepairApi.js +++ b/src/api/simplify/simplifyOwnerRepairApi.js @@ -1,9 +1,20 @@ import request from '@/utils/request' export function listOwnerRepairs(params) { - return request({ - url: '/ownerRepair.listOwnerRepairs', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/ownerRepair.listOwnerRepairs', + method: 'get', + params + }).then(response => { + const res = response.data + if (res.code == 0) { + resolve(res) + } else { + reject(new Error(res.msg || '查询业主维修失败')) + } + }).catch(error => { + reject(error) + }) }) } \ No newline at end of file diff --git a/src/api/simplify/simplifyOwnerTransactionCarApi.js b/src/api/simplify/simplifyOwnerTransactionCarApi.js index 7242a8b..b0754b9 100644 --- a/src/api/simplify/simplifyOwnerTransactionCarApi.js +++ b/src/api/simplify/simplifyOwnerTransactionCarApi.js @@ -1,10 +1,17 @@ import request from '@/utils/request' export function listMachineTranslates(params) { - return request({ - url: '/machineTranslate.listMachineTranslates', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/machineTranslate.listMachineTranslates', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) }) } diff --git a/src/api/simplify/simplifyShopsHireLogApi.js b/src/api/simplify/simplifyShopsHireLogApi.js index f8e0102..989ab43 100644 --- a/src/api/simplify/simplifyShopsHireLogApi.js +++ b/src/api/simplify/simplifyShopsHireLogApi.js @@ -1,9 +1,20 @@ import request from '@/utils/request' export function queryShopsHireLog(params) { - return request({ - url: '/ownerApi/queryShopsHireLog', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/ownerApi/queryShopsHireLog', + method: 'get', + params + }).then(response => { + const res = response.data + if (res.code == 0) { + resolve(res) + } else { + reject(new Error(res.msg || '查询业主租赁记录失败')) + } + }).catch(error => { + reject(error) + }) }) } \ No newline at end of file diff --git a/src/api/work/addRoomRepairApi.js b/src/api/work/addRoomRepairApi.js new file mode 100644 index 0000000..c8cc460 --- /dev/null +++ b/src/api/work/addRoomRepairApi.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' + +// 保存业主报修信息 +export function saveOwnerRepair(data) { + return new Promise((resolve, reject) => { + request({ + url: '/ownerRepair.saveOwnerRepair', + method: 'post', + data + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取报修设置列表 +export function listRepairSettings(params) { + return new Promise((resolve, reject) => { + request({ + url: '/repair.listRepairSettings', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/components/fee/printOwnFee.vue b/src/components/fee/printOwnFee.vue index c4bb4a5..f795af1 100644 --- a/src/components/fee/printOwnFee.vue +++ b/src/components/fee/printOwnFee.vue @@ -60,7 +60,7 @@ export default { this.visible = false }, _openPrintOweFeePage() { - window.open(`/#/pages/property/printOweFee?payObjId=${this.printOwnFeeInfo.payObjId + window.open(`/#/views/fee/printOweFee?payObjId=${this.printOwnFeeInfo.payObjId }&payObjType=${this.printOwnFeeInfo.payObjType }&payObjName=${encodeURIComponent(this.printOwnFeeInfo.payObjName) }&targetEndTime=${this.printOwnFeeInfo.targetEndTime}`) diff --git a/src/components/fee/simplifyCallable.vue b/src/components/fee/simplifyCallable.vue index 2cfca31..d9c4bc2 100644 --- a/src/components/fee/simplifyCallable.vue +++ b/src/components/fee/simplifyCallable.vue @@ -153,7 +153,7 @@ export default { } }, _printOwnOrder() { - window.open(`/#/pages/property/printOweFee?payObjId=${this.simplifyCallableInfo.roomId}&payObjType=3333&payObjName=${this.simplifyCallableInfo.roomName}`) + window.open(`/#/views/fee/printOweFee?payObjId=${this.simplifyCallableInfo.roomId}&payObjType=3333&payObjName=${this.simplifyCallableInfo.roomName}`) }, _openWritePrintOweFeeCallableModal() { if (!this.simplifyCallableInfo.roomId) { @@ -166,7 +166,7 @@ export default { }) }, _openAddOweFeeCallableModal() { - this.$router.push(`/fee/roomOweFeeCallable?roomId=${this.simplifyCallableInfo.roomId}`) + this.$router.push(`/views/fee/roomOweFeeCallable?roomId=${this.simplifyCallableInfo.roomId}`) }, _openDeleteOweFeeCallableModel(oweFeeCallable) { this.$refs.deleteOweFeeCallable.open(oweFeeCallable) diff --git a/src/components/fee/simplifyMeterWaterLog.vue b/src/components/fee/simplifyMeterWaterLog.vue index 516577c..0903252 100644 --- a/src/components/fee/simplifyMeterWaterLog.vue +++ b/src/components/fee/simplifyMeterWaterLog.vue @@ -9,9 +9,9 @@ - + diff --git a/src/components/owner/addOwnerMember.vue b/src/components/owner/addOwnerMember.vue index b3bc512..107ee6a 100644 --- a/src/components/owner/addOwnerMember.vue +++ b/src/components/owner/addOwnerMember.vue @@ -211,11 +211,11 @@ export default { this.addOwnerMemberInfo.attrs = [] const { data } = await getAttrSpecList({ page: 1, row: 100, tableName: 'building_owner_attr' }) for (const attr of data) { - if (attr.specType === '3344') { + attr.value = '' + if (attr.specShow == 'Y') { attr.values = await getAttrValue(attr.specCd) - attr.value = '' + this.addOwnerMemberInfo.attrs.push(attr) } - this.addOwnerMemberInfo.attrs.push(attr) } }, diff --git a/src/components/owner/ownerDetailRoomFee.vue b/src/components/owner/ownerDetailRoomFee.vue index 51e428a..29ec0b8 100644 --- a/src/components/owner/ownerDetailRoomFee.vue +++ b/src/components/owner/ownerDetailRoomFee.vue @@ -228,7 +228,7 @@ export default { this.$message.warning(this.$t('ownerDetailRoomFee.selectRoom')) return } - window.open(`/#/pages/property/printOweFee?payObjId=${_ids.join(',')}&payObjType=3333&payObjName=`) + window.open(`/#/views/fee/printOweFee?payObjId=${_ids.join(',')}&payObjType=3333&payObjName=`) }, _openRoomsCreateFeeModal() { this.$refs.roomsCreateFee.open({ diff --git a/src/components/simplify/simplifyCarFee.vue b/src/components/simplify/simplifyCarFee.vue index 513b13d..e239103 100644 --- a/src/components/simplify/simplifyCarFee.vue +++ b/src/components/simplify/simplifyCarFee.vue @@ -178,7 +178,8 @@ export default { this.listSimplifyCarFee(this.currentPage, this.pageSize) }) .catch(err => { - this.$message.error(err) + console.log(err) + //this.$message.error(err) }) }, handleNotify() { diff --git a/src/components/simplify/simplifyContract.vue b/src/components/simplify/simplifyContract.vue index b8d48c9..c1b0011 100644 --- a/src/components/simplify/simplifyContract.vue +++ b/src/components/simplify/simplifyContract.vue @@ -1,13 +1,13 @@