Commit 81ca23ff1b3f3333831bed2a4c0683f5f1b0e170
1 parent
dc3c5a73
装修功能测试中
Showing
4 changed files
with
138 additions
and
166 deletions
src/components/community/AddRoomRenovation.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="$t('roomRenovationManage.add')" :visible.sync="visible" width="50%" @close="resetForm"> | 2 | + <el-dialog :title="$t('roomRenovationManage.add')" :visible.sync="visible" width="40%" @close="resetForm"> |
| 3 | <el-form :model="form" ref="form" label-width="120px"> | 3 | <el-form :model="form" ref="form" label-width="120px"> |
| 4 | <el-form-item :label="$t('roomRenovationManage.room')" prop="roomName" required> | 4 | <el-form-item :label="$t('roomRenovationManage.room')" prop="roomName" required> |
| 5 | - <el-input v-model.trim="form.roomName" :placeholder="$t('roomRenovationManage.roomNumberPlaceholder')" | 5 | + <el-input v-model.trim="form.roomName" :placeholder="$t('roomRenovationManage.roomNumberPlaceholder')" |
| 6 | @blur="queryRoom" /> | 6 | @blur="queryRoom" /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | 8 | ||
| @@ -31,7 +31,8 @@ | @@ -31,7 +31,8 @@ | ||
| 31 | </el-form-item> | 31 | </el-form-item> |
| 32 | 32 | ||
| 33 | <el-form-item :label="$t('roomRenovationManage.renovationManager')" prop="personMain" required> | 33 | <el-form-item :label="$t('roomRenovationManage.renovationManager')" prop="personMain" required> |
| 34 | - <el-input v-model.trim="form.personMain" :placeholder="$t('roomRenovationManage.renovationManagerPlaceholder')" /> | 34 | + <el-input v-model.trim="form.personMain" |
| 35 | + :placeholder="$t('roomRenovationManage.renovationManagerPlaceholder')" /> | ||
| 35 | </el-form-item> | 36 | </el-form-item> |
| 36 | 37 | ||
| 37 | <el-form-item :label="$t('roomRenovationManage.managerPhone')" prop="personMainTel" required> | 38 | <el-form-item :label="$t('roomRenovationManage.managerPhone')" prop="personMainTel" required> |
| @@ -57,6 +58,8 @@ | @@ -57,6 +58,8 @@ | ||
| 57 | 58 | ||
| 58 | <script> | 59 | <script> |
| 59 | import { addRoomRenovation } from '@/api/community/roomRenovationManageApi' | 60 | import { addRoomRenovation } from '@/api/community/roomRenovationManageApi' |
| 61 | +import { queryRooms } from '@/api/room/roomApi' | ||
| 62 | +import { getCommunityId } from '@/api/community/communityApi' | ||
| 60 | 63 | ||
| 61 | export default { | 64 | export default { |
| 62 | name: 'AddRoomRenovation', | 65 | name: 'AddRoomRenovation', |
| @@ -95,14 +98,14 @@ export default { | @@ -95,14 +98,14 @@ export default { | ||
| 95 | personMainTel: '', | 98 | personMainTel: '', |
| 96 | remark: '', | 99 | remark: '', |
| 97 | isPostpone: 'N', | 100 | isPostpone: 'N', |
| 98 | - communityId: this.getCommunityId() | 101 | + communityId: getCommunityId() |
| 99 | } | 102 | } |
| 100 | this.$refs.form && this.$refs.form.resetFields() | 103 | this.$refs.form && this.$refs.form.resetFields() |
| 101 | }, | 104 | }, |
| 102 | 105 | ||
| 103 | async saveRoomRenovation() { | 106 | async saveRoomRenovation() { |
| 104 | try { | 107 | try { |
| 105 | - this.form.communityId = this.getCommunityId() | 108 | + this.form.communityId = getCommunityId() |
| 106 | await addRoomRenovation(this.form) | 109 | await addRoomRenovation(this.form) |
| 107 | this.$message.success(this.$t('common.operationSuccess')) | 110 | this.$message.success(this.$t('common.operationSuccess')) |
| 108 | this.visible = false | 111 | this.visible = false |
| @@ -118,6 +121,13 @@ export default { | @@ -118,6 +121,13 @@ export default { | ||
| 118 | 121 | ||
| 119 | try { | 122 | try { |
| 120 | // 这里需要根据实际API实现查询房屋信息 | 123 | // 这里需要根据实际API实现查询房屋信息 |
| 124 | + const {rooms} = await queryRooms({ roomName: this.form.roomName,page:1,row:10,communityId:getCommunityId() }) | ||
| 125 | + if(rooms.length > 0){ | ||
| 126 | + this.form.personName = rooms[0].ownerName | ||
| 127 | + this.form.personTel = rooms[0].link | ||
| 128 | + this.form.roomId = rooms[0].roomId | ||
| 129 | + } | ||
| 130 | + | ||
| 121 | // const roomInfo = await getRoomInfo({ roomName: this.form.roomName }) | 131 | // const roomInfo = await getRoomInfo({ roomName: this.form.roomName }) |
| 122 | // this.form.personName = roomInfo.ownerName | 132 | // this.form.personName = roomInfo.ownerName |
| 123 | // this.form.personTel = roomInfo.link | 133 | // this.form.personTel = roomInfo.link |
| @@ -127,4 +137,15 @@ export default { | @@ -127,4 +137,15 @@ export default { | ||
| 127 | } | 137 | } |
| 128 | } | 138 | } |
| 129 | } | 139 | } |
| 130 | -</script> | ||
| 131 | \ No newline at end of file | 140 | \ No newline at end of file |
| 141 | +</script> | ||
| 142 | +<style scoped> | ||
| 143 | +.el-date-editor{ | ||
| 144 | + width: 100%; | ||
| 145 | +} | ||
| 146 | +.el-date-editor.el-input{ | ||
| 147 | + width: 100%; | ||
| 148 | +} | ||
| 149 | +.el-form-item{ | ||
| 150 | + width: 95%; | ||
| 151 | +} | ||
| 152 | +</style> | ||
| 132 | \ No newline at end of file | 153 | \ No newline at end of file |
src/components/community/EditRoomRenovation.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog | ||
| 3 | - :title="$t('roomRenovationManage.modify')" | ||
| 4 | - :visible.sync="visible" | ||
| 5 | - width="50%" | ||
| 6 | - @close="resetForm" | ||
| 7 | - > | 2 | + <el-dialog :title="$t('roomRenovationManage.modify')" :visible.sync="visible" width="40%" @close="resetForm"> |
| 8 | <el-form :model="form" ref="form" label-width="120px"> | 3 | <el-form :model="form" ref="form" label-width="120px"> |
| 9 | <el-form-item :label="$t('roomRenovationManage.room')" prop="roomName"> | 4 | <el-form-item :label="$t('roomRenovationManage.room')" prop="roomName"> |
| 10 | - <el-input | ||
| 11 | - v-model.trim="form.roomName" | ||
| 12 | - disabled | ||
| 13 | - /> | 5 | + <el-input v-model.trim="form.roomName" disabled /> |
| 14 | </el-form-item> | 6 | </el-form-item> |
| 15 | - | 7 | + |
| 16 | <el-form-item :label="$t('roomRenovationManage.contactPerson')" prop="personName" required> | 8 | <el-form-item :label="$t('roomRenovationManage.contactPerson')" prop="personName" required> |
| 17 | - <el-input | ||
| 18 | - v-model.trim="form.personName" | ||
| 19 | - :placeholder="$t('roomRenovationManage.contactPersonPlaceholder')" | ||
| 20 | - /> | 9 | + <el-input v-model.trim="form.personName" :placeholder="$t('roomRenovationManage.contactPersonPlaceholder')" /> |
| 21 | </el-form-item> | 10 | </el-form-item> |
| 22 | - | 11 | + |
| 23 | <el-form-item :label="$t('roomRenovationManage.phone')" prop="personTel" required> | 12 | <el-form-item :label="$t('roomRenovationManage.phone')" prop="personTel" required> |
| 24 | - <el-input | ||
| 25 | - v-model.trim="form.personTel" | ||
| 26 | - :placeholder="$t('roomRenovationManage.phonePlaceholder')" | ||
| 27 | - /> | 13 | + <el-input v-model.trim="form.personTel" :placeholder="$t('roomRenovationManage.phonePlaceholder')" /> |
| 28 | </el-form-item> | 14 | </el-form-item> |
| 29 | - | 15 | + |
| 30 | <el-form-item :label="$t('roomRenovationManage.renovationStartTime')" prop="startTime" required> | 16 | <el-form-item :label="$t('roomRenovationManage.renovationStartTime')" prop="startTime" required> |
| 31 | - <el-date-picker | ||
| 32 | - v-model="form.startTime" | ||
| 33 | - type="date" | ||
| 34 | - :placeholder="$t('roomRenovationManage.startTimePlaceholder')" | ||
| 35 | - value-format="yyyy-MM-dd" | ||
| 36 | - /> | 17 | + <el-date-picker v-model="form.startTime" type="date" |
| 18 | + :placeholder="$t('roomRenovationManage.startTimePlaceholder')" value-format="yyyy-MM-dd" /> | ||
| 37 | </el-form-item> | 19 | </el-form-item> |
| 38 | - | 20 | + |
| 39 | <el-form-item :label="$t('roomRenovationManage.renovationEndTime')" prop="endTime" required> | 21 | <el-form-item :label="$t('roomRenovationManage.renovationEndTime')" prop="endTime" required> |
| 40 | - <el-date-picker | ||
| 41 | - v-model="form.endTime" | ||
| 42 | - type="date" | ||
| 43 | - :placeholder="$t('roomRenovationManage.endTimePlaceholder')" | ||
| 44 | - value-format="yyyy-MM-dd" | ||
| 45 | - /> | 22 | + <el-date-picker v-model="form.endTime" type="date" :placeholder="$t('roomRenovationManage.endTimePlaceholder')" |
| 23 | + value-format="yyyy-MM-dd" /> | ||
| 46 | </el-form-item> | 24 | </el-form-item> |
| 47 | - | 25 | + |
| 48 | <el-form-item :label="$t('roomRenovationManage.isPostponed')" prop="isPostpone" required> | 26 | <el-form-item :label="$t('roomRenovationManage.isPostponed')" prop="isPostpone" required> |
| 49 | <el-select v-model="form.isPostpone"> | 27 | <el-select v-model="form.isPostpone"> |
| 50 | <el-option :label="$t('roomRenovationManage.yes')" value="Y" /> | 28 | <el-option :label="$t('roomRenovationManage.yes')" value="Y" /> |
| 51 | <el-option :label="$t('roomRenovationManage.no')" value="N" /> | 29 | <el-option :label="$t('roomRenovationManage.no')" value="N" /> |
| 52 | </el-select> | 30 | </el-select> |
| 53 | </el-form-item> | 31 | </el-form-item> |
| 54 | - | ||
| 55 | - <el-form-item | ||
| 56 | - v-if="form.isPostpone === 'Y'" | ||
| 57 | - :label="$t('roomRenovationManage.postponeTime')" | ||
| 58 | - prop="postponeTime" | ||
| 59 | - > | ||
| 60 | - <el-date-picker | ||
| 61 | - v-model="form.postponeTime" | ||
| 62 | - type="date" | ||
| 63 | - :placeholder="$t('roomRenovationManage.endTimePlaceholder')" | ||
| 64 | - value-format="yyyy-MM-dd" | ||
| 65 | - /> | 32 | + |
| 33 | + <el-form-item v-if="form.isPostpone === 'Y'" :label="$t('roomRenovationManage.postponeTime')" prop="postponeTime"> | ||
| 34 | + <el-date-picker v-model="form.postponeTime" type="date" | ||
| 35 | + :placeholder="$t('roomRenovationManage.endTimePlaceholder')" value-format="yyyy-MM-dd" /> | ||
| 66 | </el-form-item> | 36 | </el-form-item> |
| 67 | - | 37 | + |
| 68 | <el-form-item :label="$t('roomRenovationManage.renovationCompany')" prop="renovationCompany" required> | 38 | <el-form-item :label="$t('roomRenovationManage.renovationCompany')" prop="renovationCompany" required> |
| 69 | - <el-input | ||
| 70 | - v-model.trim="form.renovationCompany" | ||
| 71 | - :placeholder="$t('roomRenovationManage.renovationCompanyPlaceholder')" | ||
| 72 | - /> | 39 | + <el-input v-model.trim="form.renovationCompany" |
| 40 | + :placeholder="$t('roomRenovationManage.renovationCompanyPlaceholder')" value-format="yyyy-MM-dd" /> | ||
| 73 | </el-form-item> | 41 | </el-form-item> |
| 74 | - | 42 | + |
| 75 | <el-form-item :label="$t('roomRenovationManage.renovationManager')" prop="personMain" required> | 43 | <el-form-item :label="$t('roomRenovationManage.renovationManager')" prop="personMain" required> |
| 76 | - <el-input | ||
| 77 | - v-model.trim="form.personMain" | ||
| 78 | - :placeholder="$t('roomRenovationManage.renovationManagerPlaceholder')" | ||
| 79 | - /> | 44 | + <el-input v-model.trim="form.personMain" |
| 45 | + :placeholder="$t('roomRenovationManage.renovationManagerPlaceholder')" /> | ||
| 80 | </el-form-item> | 46 | </el-form-item> |
| 81 | - | 47 | + |
| 82 | <el-form-item :label="$t('roomRenovationManage.managerPhone')" prop="personMainTel" required> | 48 | <el-form-item :label="$t('roomRenovationManage.managerPhone')" prop="personMainTel" required> |
| 83 | - <el-input | ||
| 84 | - v-model.trim="form.personMainTel" | ||
| 85 | - :placeholder="$t('roomRenovationManage.managerPhonePlaceholder')" | ||
| 86 | - /> | 49 | + <el-input v-model.trim="form.personMainTel" :placeholder="$t('roomRenovationManage.managerPhonePlaceholder')" /> |
| 87 | </el-form-item> | 50 | </el-form-item> |
| 88 | - | ||
| 89 | - <el-form-item :label="$t('roomRenovationManage.status')" prop="state" required> | 51 | + |
| 52 | + <!-- <el-form-item :label="$t('roomRenovationManage.status')" prop="state" required> | ||
| 90 | <el-select v-model="form.state"> | 53 | <el-select v-model="form.state"> |
| 91 | - <el-option | ||
| 92 | - v-for="(item, index) in states" | ||
| 93 | - :key="index" | ||
| 94 | - :label="item.name" | ||
| 95 | - :value="item.statusCd" | ||
| 96 | - /> | 54 | + <el-option v-for="(item, index) in states" :key="index" :label="item.name" :value="item.statusCd" /> |
| 97 | </el-select> | 55 | </el-select> |
| 98 | - </el-form-item> | ||
| 99 | - | 56 | + </el-form-item> --> |
| 57 | + | ||
| 100 | <el-form-item :label="$t('roomRenovationManage.isViolation')" prop="isViolation" required> | 58 | <el-form-item :label="$t('roomRenovationManage.isViolation')" prop="isViolation" required> |
| 101 | <el-select v-model="form.isViolation"> | 59 | <el-select v-model="form.isViolation"> |
| 102 | <el-option :label="$t('roomRenovationManage.yes')" value="Y" /> | 60 | <el-option :label="$t('roomRenovationManage.yes')" value="Y" /> |
| 103 | <el-option :label="$t('roomRenovationManage.no')" value="N" /> | 61 | <el-option :label="$t('roomRenovationManage.no')" value="N" /> |
| 104 | </el-select> | 62 | </el-select> |
| 105 | </el-form-item> | 63 | </el-form-item> |
| 106 | - | ||
| 107 | - <el-form-item | ||
| 108 | - v-if="form.isViolation === 'Y'" | ||
| 109 | - :label="$t('roomRenovationManage.violationDesc')" | ||
| 110 | - prop="violationDesc" | ||
| 111 | - > | ||
| 112 | - <el-input | ||
| 113 | - v-model.trim="form.violationDesc" | ||
| 114 | - type="textarea" | ||
| 115 | - :placeholder="$t('roomRenovationManage.violationDescPlaceholder')" | ||
| 116 | - /> | 64 | + |
| 65 | + <el-form-item v-if="form.isViolation === 'Y'" :label="$t('roomRenovationManage.violationDesc')" | ||
| 66 | + prop="violationDesc"> | ||
| 67 | + <el-input v-model.trim="form.violationDesc" type="textarea" | ||
| 68 | + :placeholder="$t('roomRenovationManage.violationDescPlaceholder')" /> | ||
| 117 | </el-form-item> | 69 | </el-form-item> |
| 118 | - | 70 | + |
| 119 | <el-form-item :label="$t('roomRenovationManage.remark')" prop="remark"> | 71 | <el-form-item :label="$t('roomRenovationManage.remark')" prop="remark"> |
| 120 | - <el-input | ||
| 121 | - v-model.trim="form.remark" | ||
| 122 | - type="textarea" | ||
| 123 | - :placeholder="$t('roomRenovationManage.remarkPlaceholder')" | ||
| 124 | - /> | 72 | + <el-input v-model.trim="form.remark" type="textarea" |
| 73 | + :placeholder="$t('roomRenovationManage.remarkPlaceholder')" /> | ||
| 125 | </el-form-item> | 74 | </el-form-item> |
| 126 | </el-form> | 75 | </el-form> |
| 127 | - | 76 | + |
| 128 | <div slot="footer" class="dialog-footer"> | 77 | <div slot="footer" class="dialog-footer"> |
| 129 | <el-button @click="visible = false"> | 78 | <el-button @click="visible = false"> |
| 130 | {{ $t('roomRenovationManage.cancel') }} | 79 | {{ $t('roomRenovationManage.cancel') }} |
| @@ -138,7 +87,8 @@ | @@ -138,7 +87,8 @@ | ||
| 138 | 87 | ||
| 139 | <script> | 88 | <script> |
| 140 | import { updateRoomRenovation } from '@/api/community/roomRenovationManageApi' | 89 | import { updateRoomRenovation } from '@/api/community/roomRenovationManageApi' |
| 141 | - | 90 | +import { getDict } from '@/api/community/communityApi' |
| 91 | +import { dateFormat } from '@/utils/dateUtil' | ||
| 142 | export default { | 92 | export default { |
| 143 | name: 'EditRoomRenovation', | 93 | name: 'EditRoomRenovation', |
| 144 | data() { | 94 | data() { |
| @@ -179,9 +129,12 @@ export default { | @@ -179,9 +129,12 @@ export default { | ||
| 179 | ...row, | 129 | ...row, |
| 180 | communityId: this.getCommunityId() | 130 | communityId: this.getCommunityId() |
| 181 | } | 131 | } |
| 132 | + this.form.startTime = dateFormat(this.form.startTime) | ||
| 133 | + this.form.endTime = dateFormat(this.form.endTime) | ||
| 134 | + | ||
| 182 | this.visible = true | 135 | this.visible = true |
| 183 | }, | 136 | }, |
| 184 | - | 137 | + |
| 185 | resetForm() { | 138 | resetForm() { |
| 186 | this.form = { | 139 | this.form = { |
| 187 | rId: '', | 140 | rId: '', |
| @@ -202,16 +155,16 @@ export default { | @@ -202,16 +155,16 @@ export default { | ||
| 202 | communityId: '' | 155 | communityId: '' |
| 203 | } | 156 | } |
| 204 | }, | 157 | }, |
| 205 | - | 158 | + |
| 206 | async getDictData() { | 159 | async getDictData() { |
| 207 | try { | 160 | try { |
| 208 | - const res = await this.$store.dispatch('dict/getDict', 'room_renovation') | ||
| 209 | - this.states = res.state || [] | 161 | + const res = await getDict('room_renovation','state') |
| 162 | + this.states = res || [] | ||
| 210 | } catch (error) { | 163 | } catch (error) { |
| 211 | console.error('获取字典数据失败:', error) | 164 | console.error('获取字典数据失败:', error) |
| 212 | } | 165 | } |
| 213 | }, | 166 | }, |
| 214 | - | 167 | + |
| 215 | async editRoomRenovation() { | 168 | async editRoomRenovation() { |
| 216 | try { | 169 | try { |
| 217 | await updateRoomRenovation(this.form) | 170 | await updateRoomRenovation(this.form) |
| @@ -225,4 +178,15 @@ export default { | @@ -225,4 +178,15 @@ export default { | ||
| 225 | } | 178 | } |
| 226 | } | 179 | } |
| 227 | } | 180 | } |
| 228 | -</script> | ||
| 229 | \ No newline at end of file | 181 | \ No newline at end of file |
| 182 | +</script> | ||
| 183 | +<style scoped> | ||
| 184 | +.el-date-editor{ | ||
| 185 | + width: 100%; | ||
| 186 | +} | ||
| 187 | +.el-date-editor.el-input{ | ||
| 188 | + width: 100%; | ||
| 189 | +} | ||
| 190 | +.el-form-item{ | ||
| 191 | + width: 95%; | ||
| 192 | +} | ||
| 193 | +</style> | ||
| 230 | \ No newline at end of file | 194 | \ No newline at end of file |
src/views/community/roomRenovationManageList.vue
| @@ -5,7 +5,8 @@ | @@ -5,7 +5,8 @@ | ||
| 5 | <div slot="header" class=" flex justify-between"> | 5 | <div slot="header" class=" flex justify-between"> |
| 6 | <span>{{ $t('roomRenovationManage.queryCondition') }}</span> | 6 | <span>{{ $t('roomRenovationManage.queryCondition') }}</span> |
| 7 | <el-button type="text" style="float: right; padding: 3px 0" @click="toggleMoreCondition"> | 7 | <el-button type="text" style="float: right; padding: 3px 0" @click="toggleMoreCondition"> |
| 8 | - {{ roomRenovationManageInfo.moreCondition ? $t('roomRenovationManage.hide') : $t('roomRenovationManage.more') }} | 8 | + {{ roomRenovationManageInfo.moreCondition ? $t('roomRenovationManage.hide') : $t('roomRenovationManage.more') |
| 9 | + }} | ||
| 9 | </el-button> | 10 | </el-button> |
| 10 | </div> | 11 | </div> |
| 11 | <div> | 12 | <div> |
| @@ -109,40 +110,36 @@ | @@ -109,40 +110,36 @@ | ||
| 109 | </el-table-column> | 110 | </el-table-column> |
| 110 | <el-table-column prop="violationDesc" :label="$t('roomRenovationManage.violationDesc')" align="center" /> | 111 | <el-table-column prop="violationDesc" :label="$t('roomRenovationManage.violationDesc')" align="center" /> |
| 111 | <el-table-column prop="remark" :label="$t('roomRenovationManage.remark')" align="center" /> | 112 | <el-table-column prop="remark" :label="$t('roomRenovationManage.remark')" align="center" /> |
| 112 | - <el-table-column :label="$t('roomRenovationManage.operation')" align="center" width="350"> | 113 | + <el-table-column :label="$t('roomRenovationManage.operation')" align="center" width="150"> |
| 113 | <template slot-scope="scope"> | 114 | <template slot-scope="scope"> |
| 114 | - <div v-if="scope.row.state === '1000'"> | ||
| 115 | - <el-button size="mini" @click="openRoomRenovationFee(scope.row)"> | ||
| 116 | - {{ $t('roomRenovationManage.fee') }} | ||
| 117 | - </el-button> | ||
| 118 | - </div> | ||
| 119 | - <div v-if="scope.row.state === '1000' && scope.row.isViolation === 'N'"> | ||
| 120 | - <el-button size="mini" type="primary" @click="openToExamine(scope.row)"> | ||
| 121 | - {{ $t('roomRenovationManage.review') }} | ||
| 122 | - </el-button> | ||
| 123 | - </div> | ||
| 124 | - <div v-if="scope.row.state === '3000' && scope.row.isViolation === 'N'"> | ||
| 125 | - <el-button size="mini" type="success" @click="openDecorationCompleted(scope.row)"> | ||
| 126 | - {{ $t('roomRenovationManage.completeRenovation') }} | ||
| 127 | - </el-button> | ||
| 128 | - </div> | ||
| 129 | - <div v-if="scope.row.state === '4000' && scope.row.isViolation === 'N'"> | ||
| 130 | - <el-button size="mini" type="warning" @click="openDecorationAcceptanceModel(scope.row)"> | ||
| 131 | - {{ $t('roomRenovationManage.renovationAcceptance') }} | ||
| 132 | - </el-button> | ||
| 133 | - </div> | ||
| 134 | - <div v-if="scope.row.state === '5000' || scope.row.state === '6000'"> | ||
| 135 | - <el-button size="mini" @click="openRoomRenovationDetail(scope.row)"> | ||
| 136 | - {{ $t('roomRenovationManage.acceptanceDetail') }} | ||
| 137 | - </el-button> | ||
| 138 | - </div> | ||
| 139 | - <el-button size="mini" @click="openEditRoomRenovationModel(scope.row)"> | 115 | + <el-button v-if="scope.row.state === '1000'" size="mini" type="text" |
| 116 | + @click="openRoomRenovationFee(scope.row)"> | ||
| 117 | + {{ $t('roomRenovationManage.fee') }} | ||
| 118 | + </el-button> | ||
| 119 | + <el-button size="mini" v-if="scope.row.state === '1000' && scope.row.isViolation === 'N'" type="text" | ||
| 120 | + @click="openToExamine(scope.row)"> | ||
| 121 | + {{ $t('roomRenovationManage.review') }} | ||
| 122 | + </el-button> | ||
| 123 | + | ||
| 124 | + <el-button size="mini" v-if="scope.row.state === '3000' && scope.row.isViolation === 'N'" type="text" | ||
| 125 | + @click="openDecorationCompleted(scope.row)"> | ||
| 126 | + {{ $t('roomRenovationManage.completeRenovation') }} | ||
| 127 | + </el-button> | ||
| 128 | + <el-button size="mini" v-if="scope.row.state === '4000' && scope.row.isViolation === 'N'" type="text" | ||
| 129 | + @click="openDecorationAcceptanceModel(scope.row)"> | ||
| 130 | + {{ $t('roomRenovationManage.renovationAcceptance') }} | ||
| 131 | + </el-button> | ||
| 132 | + <el-button size="mini" v-if="scope.row.state === '5000' || scope.row.state === '6000'" type="text" | ||
| 133 | + @click="openRoomRenovationDetail(scope.row)"> | ||
| 134 | + {{ $t('roomRenovationManage.acceptanceDetail') }} | ||
| 135 | + </el-button> | ||
| 136 | + <el-button size="mini" type="text" @click="openEditRoomRenovationModel(scope.row)"> | ||
| 140 | {{ $t('roomRenovationManage.modify') }} | 137 | {{ $t('roomRenovationManage.modify') }} |
| 141 | </el-button> | 138 | </el-button> |
| 142 | - <el-button size="mini" type="danger" @click="openDeleteRoomRenovationModel(scope.row)"> | 139 | + <el-button size="mini" type="text" @click="openDeleteRoomRenovationModel(scope.row)"> |
| 143 | {{ $t('roomRenovationManage.delete') }} | 140 | {{ $t('roomRenovationManage.delete') }} |
| 144 | </el-button> | 141 | </el-button> |
| 145 | - <el-button size="mini" @click="openRoomDecorationRecord(scope.row)"> | 142 | + <el-button size="mini" type="text" @click="openRoomDecorationRecord(scope.row)"> |
| 146 | {{ $t('roomRenovationManage.trackRecord') }} | 143 | {{ $t('roomRenovationManage.trackRecord') }} |
| 147 | </el-button> | 144 | </el-button> |
| 148 | </template> | 145 | </template> |
| @@ -150,9 +147,9 @@ | @@ -150,9 +147,9 @@ | ||
| 150 | </el-table> | 147 | </el-table> |
| 151 | 148 | ||
| 152 | <!-- 分页 --> | 149 | <!-- 分页 --> |
| 153 | - <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.current" | ||
| 154 | - :page-sizes="[10, 20, 50]" :page-size="page.size" layout="total, sizes, prev, pager, next, jumper" | ||
| 155 | - :total="page.total" style="margin-top: 20px;" /> | 150 | + <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" |
| 151 | + :current-page="page.current" :page-sizes="[10, 20, 50]" :page-size="page.size" | ||
| 152 | + layout="total, sizes, prev, pager, next, jumper" :total="page.total" style="margin-top: 20px;" /> | ||
| 156 | </div> | 153 | </div> |
| 157 | </el-card> | 154 | </el-card> |
| 158 | 155 | ||
| @@ -174,7 +171,7 @@ import RoomToExamine from '@/components/community/RoomToExamine' | @@ -174,7 +171,7 @@ import RoomToExamine from '@/components/community/RoomToExamine' | ||
| 174 | import EditRoomRenovation from '@/components/community/EditRoomRenovation' | 171 | import EditRoomRenovation from '@/components/community/EditRoomRenovation' |
| 175 | import DeleteRoomRenovation from '@/components/community/DeleteRoomRenovation' | 172 | import DeleteRoomRenovation from '@/components/community/DeleteRoomRenovation' |
| 176 | import RoomRenovationCompleted from '@/components/community/RoomRenovationCompleted' | 173 | import RoomRenovationCompleted from '@/components/community/RoomRenovationCompleted' |
| 177 | -import {getDict} from '@/api/community/communityApi' | 174 | +import { getDict } from '@/api/community/communityApi' |
| 178 | 175 | ||
| 179 | export default { | 176 | export default { |
| 180 | name: 'RoomRenovationManageList', | 177 | name: 'RoomRenovationManageList', |
| @@ -220,7 +217,7 @@ export default { | @@ -220,7 +217,7 @@ export default { | ||
| 220 | // 获取字典数据 | 217 | // 获取字典数据 |
| 221 | async getDictData() { | 218 | async getDictData() { |
| 222 | try { | 219 | try { |
| 223 | - const res = await getDict('room_renovation','state') | 220 | + const res = await getDict('room_renovation', 'state') |
| 224 | this.roomRenovationManageInfo.states = res || [] | 221 | this.roomRenovationManageInfo.states = res || [] |
| 225 | } catch (error) { | 222 | } catch (error) { |
| 226 | console.error('获取字典数据失败:', error) | 223 | console.error('获取字典数据失败:', error) |
| @@ -368,5 +365,14 @@ export default { | @@ -368,5 +365,14 @@ export default { | ||
| 368 | .clearfix:after { | 365 | .clearfix:after { |
| 369 | clear: both; | 366 | clear: both; |
| 370 | } | 367 | } |
| 368 | + | ||
| 369 | + .el-date-editor { | ||
| 370 | + width: 100%; | ||
| 371 | + } | ||
| 372 | + | ||
| 373 | + .el-date-editor.el-input { | ||
| 374 | + width: 100%; | ||
| 375 | + } | ||
| 376 | + | ||
| 371 | } | 377 | } |
| 372 | </style> | 378 | </style> |
| 373 | \ No newline at end of file | 379 | \ No newline at end of file |
src/views/fee/invoiceApplyList.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div> | ||
| 3 | - <el-row :gutter="20"> | ||
| 4 | - <el-col :span="4"> | ||
| 5 | - <el-card class="border-radius"> | ||
| 6 | - <div class="treeview attendance-staff"> | ||
| 7 | - <ul class="list-group text-center border-radius"> | 2 | + <div class="padding"> |
| 3 | + <el-row :gutter="10"> | ||
| 4 | + <el-col :span="3"> | ||
| 5 | + <div class="list-group-border-radius"> | ||
| 6 | + <div class=" treeview"> | ||
| 7 | + <ul class="list-group text-center "> | ||
| 8 | <li v-for="(item, index) in states" :key="index" @click="swatchState(item)" :class="{ | 8 | <li v-for="(item, index) in states" :key="index" @click="swatchState(item)" :class="{ |
| 9 | 'vc-node-selected': conditions.state === item.state | 9 | 'vc-node-selected': conditions.state === item.state |
| 10 | }" class="list-group-item node-orgTree"> | 10 | }" class="list-group-item node-orgTree"> |
| @@ -12,9 +12,9 @@ | @@ -12,9 +12,9 @@ | ||
| 12 | </li> | 12 | </li> |
| 13 | </ul> | 13 | </ul> |
| 14 | </div> | 14 | </div> |
| 15 | - </el-card> | 15 | + </div> |
| 16 | </el-col> | 16 | </el-col> |
| 17 | - <el-col :span="20"> | 17 | + <el-col :span="21"> |
| 18 | <el-row> | 18 | <el-row> |
| 19 | <el-col :span="24"> | 19 | <el-col :span="24"> |
| 20 | <el-card> | 20 | <el-card> |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | </el-card> | 51 | </el-card> |
| 52 | </el-col> | 52 | </el-col> |
| 53 | </el-row> | 53 | </el-row> |
| 54 | - <el-row> | 54 | + <el-row class="margin-top"> |
| 55 | <el-col :span="24"> | 55 | <el-col :span="24"> |
| 56 | <el-card> | 56 | <el-card> |
| 57 | <div slot="header" class="flex justify-between"> | 57 | <div slot="header" class="flex justify-between"> |
| @@ -269,25 +269,6 @@ export default { | @@ -269,25 +269,6 @@ export default { | ||
| 269 | border-radius: 4px; | 269 | border-radius: 4px; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | -.list-group { | ||
| 273 | - padding: 0; | ||
| 274 | - margin: 0; | ||
| 275 | - list-style: none; | ||
| 276 | -} | ||
| 277 | - | ||
| 278 | -.list-group-item { | ||
| 279 | - padding: 10px 15px; | ||
| 280 | - margin-bottom: -1px; | ||
| 281 | - background-color: #fff; | ||
| 282 | - border: 1px solid #ddd; | ||
| 283 | - cursor: pointer; | ||
| 284 | -} | ||
| 285 | - | ||
| 286 | -.list-group-item:hover, | ||
| 287 | -.vc-node-selected { | ||
| 288 | - background-color: #f5f7fa; | ||
| 289 | - color: #409EFF; | ||
| 290 | -} | ||
| 291 | 272 | ||
| 292 | .float-right { | 273 | .float-right { |
| 293 | float: right; | 274 | float: right; |