diff --git a/package.json b/package.json index 6de49a7..7968da4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "物业管理系统", + "name": "property_web", "version": "1.0.0", "private": true, "scripts": { diff --git a/src/components/car/searchOwner.vue b/src/components/car/searchOwner.vue deleted file mode 100644 index b9e542b..0000000 --- a/src/components/car/searchOwner.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - \ No newline at end of file diff --git a/src/components/car/searchOwnerLang.js b/src/components/car/searchOwnerLang.js index de06633..1737496 100644 --- a/src/components/car/searchOwnerLang.js +++ b/src/components/car/searchOwnerLang.js @@ -1,28 +1,6 @@ export default { en: { - searchOwner: { - title: 'Select Owner', - placeholderRoom: 'Enter room number (building-unit-room)', - placeholderOwner: 'Enter owner name', - memberId: 'Owner ID', - name: 'Name', - personType: 'Person Type', - personRole: 'Person Role', - idCard: 'ID Card', - link: 'Contact' - } }, zh: { - searchOwner: { - title: '选择业主', - placeholderRoom: '输入房屋编号楼栋-单元-房屋', - placeholderOwner: '输入业主名称', - memberId: '业主编号', - name: '名称', - personType: '人员类型', - personRole: '人员角色', - idCard: '证件号', - link: '联系方式' - } } } \ No newline at end of file diff --git a/src/components/contract/searchOwner.vue b/src/components/contract/searchOwner.vue deleted file mode 100644 index 012286c..0000000 --- a/src/components/contract/searchOwner.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/owner/SearchOwner.vue b/src/components/owner/SearchOwner.vue index 332b7d0..4654687 100644 --- a/src/components/owner/SearchOwner.vue +++ b/src/components/owner/SearchOwner.vue @@ -4,7 +4,7 @@ :visible.sync="visible" width="80%" > - + - + diff --git a/src/components/owner/ownerExitRoom.vue b/src/components/owner/ownerExitRoom.vue index 941bfb9..aeb1711 100644 --- a/src/components/owner/ownerExitRoom.vue +++ b/src/components/owner/ownerExitRoom.vue @@ -1,77 +1,72 @@ - - - - \ No newline at end of file +} + + + \ No newline at end of file diff --git a/src/components/owner/showOwnerRoom.vue b/src/components/owner/showOwnerRoom.vue index 24fd53f..e76f004 100644 --- a/src/components/owner/showOwnerRoom.vue +++ b/src/components/owner/showOwnerRoom.vue @@ -107,7 +107,7 @@ - + - + \ No newline at end of file diff --git a/src/components/room/searchOwner.vue b/src/components/room/searchOwner.vue deleted file mode 100644 index 6b992a7..0000000 --- a/src/components/room/searchOwner.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js index f92ba3f..fe09ced 100644 --- a/src/i18n/commonLang.js +++ b/src/i18n/commonLang.js @@ -16,6 +16,7 @@ export const messages = { warning: 'Warning', deleteConfirm: 'Are you sure to delete this record?', confirmDelete: 'confirm delete', + confirmExit: 'confirm exit', deleteSuccess: 'Delete successfully', selectBtn: 'Select', select: 'Select', @@ -73,6 +74,7 @@ export const messages = { warning: '警告', deleteConfirm: '确定要删除这条记录吗？', confirmDelete: '确定删除', + confirmExit: '确定退出', deleteSuccess: '删除成功', selectBtn: '选择', select: '选择', diff --git a/src/utils/request.js b/src/utils/request.js index 152e042..e8011f9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -62,11 +62,11 @@ service.interceptors.response.use( // 跳转到登录页面 window.location.href = '/#/views/user/login' - Message({ - message: '登录已过期，请重新登录', - type: 'error', - duration: 5 * 1000 - }) + // Message({ + // message: '登录已过期，请重新登录', + // type: 'error', + // duration: 5 * 1000 + // }) } return Promise.reject(error) diff --git a/src/views/car/hireParkingSpaceLang.js b/src/views/car/hireParkingSpaceLang.js index 486974b..dfb2c90 100644 --- a/src/views/car/hireParkingSpaceLang.js +++ b/src/views/car/hireParkingSpaceLang.js @@ -37,18 +37,6 @@ export const messages = { saveSuccess: 'Vehicle information saved successfully!', saveError: 'Failed to save vehicle information' }, - searchOwner: { - title: 'Select Owner', - roomPlaceholder: 'Enter room number (Building-Unit-Room)', - namePlaceholder: 'Enter owner name', - memberId: 'Owner ID', - name: 'Name', - personType: 'Person Type', - personRole: 'Person Role', - idCard: 'ID Card', - contact: 'Contact', - loadError: 'Failed to load owner information' - }, searchParkingSpace: { title: 'Select Parking Space', parkingAreaPlaceholder: 'Select parking area', @@ -102,18 +90,6 @@ export const messages = { saveSuccess: '车辆信息保存成功！', saveError: '车辆信息保存失败' }, - searchOwner: { - title: '选择业主', - roomPlaceholder: '输入房屋编号楼栋-单元-房屋', - namePlaceholder: '输入业主名称', - memberId: '业主编号', - name: '名称', - personType: '人员类型', - personRole: '人员角色', - idCard: '证件号', - contact: '联系方式', - loadError: '加载业主信息失败' - }, searchParkingSpace: { title: '选择停车位', parkingAreaPlaceholder: '请选择停车场', diff --git a/src/views/owner/deleteOwnerRoomLang.js b/src/views/owner/deleteOwnerRoomLang.js index 525dba5..ca38242 100644 --- a/src/views/owner/deleteOwnerRoomLang.js +++ b/src/views/owner/deleteOwnerRoomLang.js @@ -13,18 +13,6 @@ export const messages = { chooseOwner: 'Select Owner', loadError: 'Failed to load owner information' }, - searchOwner: { - title: 'Select Owner', - ownerId: 'Owner ID', - name: 'Name', - personType: 'Person Type', - personRole: 'Person Role', - idCard: 'ID Card', - link: 'Contact', - roomPlaceholder: 'Enter room number (building-unit-room)', - ownerPlaceholder: 'Enter owner name', - loadError: 'Failed to load owner list' - }, showOwnerRoom: { info: 'Room Information', propertyFee: 'Property Fee', @@ -62,18 +50,6 @@ export const messages = { chooseOwner: '选择业主', loadError: '加载业主信息失败' }, - searchOwner: { - title: '选择业主', - ownerId: '业主编号', - name: '名称', - personType: '人员类型', - personRole: '人员角色', - idCard: '证件号', - link: '联系方式', - roomPlaceholder: '输入房屋编号(楼栋-单元-房屋)', - ownerPlaceholder: '输入业主名称', - loadError: '加载业主列表失败' - }, showOwnerRoom: { info: '房屋信息', propertyFee: '物业费', diff --git a/src/views/owner/roomBindOwnerLang.js b/src/views/owner/roomBindOwnerLang.js index 931a1ff..59f20b0 100644 --- a/src/views/owner/roomBindOwnerLang.js +++ b/src/views/owner/roomBindOwnerLang.js @@ -19,6 +19,7 @@ export const messages = { fetchRoomError: 'Failed to get room information' }, searchOwner: { + ownerId: 'Owner ID', title: 'Select Owner', roomPlaceholder: 'Enter room number (building-unit-room)', ownerPlaceholder: 'Enter owner name', @@ -50,6 +51,7 @@ export const messages = { fetchRoomError: '获取房屋信息失败' }, searchOwner: { + ownerId: '业主编号', title: '选择业主', roomPlaceholder: '输入房屋编号(楼栋-单元-房屋)', ownerPlaceholder: '输入业主名称', diff --git a/src/views/room/addRoomViewLang.js b/src/views/room/addRoomViewLang.js index 8c48a43..b3ee5ed 100644 --- a/src/views/room/addRoomViewLang.js +++ b/src/views/room/addRoomViewLang.js @@ -47,18 +47,6 @@ export const messages = { remarkMaxLength: 'Remark cannot exceed 200 characters' } }, - searchOwner: { - title: 'Select Owner', - ownerId: 'Owner ID', - name: 'Name', - personType: 'Person Type', - personRole: 'Person Role', - idCard: 'ID Card', - contact: 'Contact', - operation: 'Operation', - roomPlaceholder: 'Enter room number (Building-Unit-Room)', - ownerPlaceholder: 'Enter owner name' - } }, zh: { addRoomView: { @@ -108,17 +96,5 @@ export const messages = { remarkMaxLength: '备注内容不能超过200' } }, - searchOwner: { - title: '选择业主', - ownerId: '业主编号', - name: '名称', - personType: '人员类型', - personRole: '人员角色', - idCard: '证件号', - contact: '联系方式', - operation: '操作', - roomPlaceholder: '输入房屋编号楼栋-单元-房屋', - ownerPlaceholder: '输入业主名称' - } } } \ No newline at end of file diff --git a/src/views/room/handoverLang.js b/src/views/room/handoverLang.js index c76bc4c..3b0ca88 100644 --- a/src/views/room/handoverLang.js +++ b/src/views/room/handoverLang.js @@ -37,18 +37,6 @@ export const messages = { houseNotUnsold: 'The house is not unsold, please return it first', fetchRoomError: 'Failed to get room information' }, - searchOwner: { - title: 'Select Owner', - roomPlaceholder: 'Enter house number building-unit-house', - namePlaceholder: 'Enter owner name', - memberId: 'Owner ID', - name: 'Name', - personType: 'Person Type', - personRole: 'Person Role', - idCard: 'ID Card', - phone: 'Phone', - fetchError: 'Failed to get owner list' - }, selectFeeConfig: { title: 'Create Fee', feeType: 'Fee Type', @@ -106,18 +94,6 @@ export const messages = { houseNotUnsold: '房屋不是未销售状态，请先退房', fetchRoomError: '获取房屋信息失败' }, - searchOwner: { - title: '选择业主', - roomPlaceholder: '输入房屋编号楼栋-单元-房屋', - namePlaceholder: '输入业主名称', - memberId: '业主编号', - name: '名称', - personType: '人员类型', - personRole: '人员角色', - idCard: '证件号', - phone: '联系方式', - fetchError: '获取业主列表失败' - }, selectFeeConfig: { title: '创建费用', feeType: '费用类型', diff --git a/src/views/room/ownerExitRoomLang.js b/src/views/room/ownerExitRoomLang.js index 8668c61..02feae2 100644 --- a/src/views/room/ownerExitRoomLang.js +++ b/src/views/room/ownerExitRoomLang.js @@ -21,17 +21,6 @@ export const messages = { unpaidFee: 'There are unpaid fees, please handle them first' } }, - searchOwner: { - title: 'Select Owner', - roomPlaceholder: 'Enter room number (Building-Unit-Room)', - namePlaceholder: 'Enter owner name', - memberId: 'Owner ID', - name: 'Name', - personType: 'Person Type', - personRole: 'Person Role', - idCard: 'ID Card', - contact: 'Contact' - }, selectFeeConfig: { title: 'Create Fee', feeType: 'Fee Type', @@ -72,17 +61,6 @@ export const messages = { unpaidFee: '房屋还存在费用，请先在业务受理处理费用' } }, - searchOwner: { - title: '选择业主', - roomPlaceholder: '输入房屋编号(楼栋-单元-房屋)', - namePlaceholder: '输入业主名称', - memberId: '业主编号', - name: '名称', - personType: '人员类型', - personRole: '人员角色', - idCard: '证件号', - contact: '联系方式' - }, selectFeeConfig: { title: '创建费用', feeType: '费用类型', diff --git a/src/views/room/roomList.vue b/src/views/room/roomList.vue index 1051250..8a79096 100644 --- a/src/views/room/roomList.vue +++ b/src/views/room/roomList.vue @@ -250,13 +250,13 @@ - +
{{ $t('roomList.roomStatusDesc1') }}
{{ $t('roomList.roomStatusDesc2') }}
{{ $t('roomList.roomStatusDesc3') }}
{{ $t('roomList.rentDesc') }}
 - + @@ -769,4 +769,9 @@ export default { .el-button-group .el-button:last-child { margin-right: 0; } +.room-detail-desc { + text-align: left; + font-size: 13px; + color: #606266; +} \ No newline at end of file