Commit f143e79f503bc2abdc8d7969d37a10beef4addde
1 parent
1e992649
v1.9 产权登记看不到图片bug
Showing
4 changed files
with
32 additions
and
29 deletions
src/api/oa/simplifyNotepadManageApi.js
src/components/oa/addNotepad.vue
| 1 | 1 | <template> |
| 2 | - <el-dialog | |
| 3 | - :title="$t('addNotepad.title')" | |
| 4 | - :visible.sync="visible" | |
| 5 | - width="70%" | |
| 6 | - @close="handleClose" | |
| 7 | - > | |
| 2 | + <el-dialog :title="$t('addNotepad.title')" :visible.sync="visible" width="70%" @close="handleClose"> | |
| 8 | 3 | <el-form :model="addNotepadInfo" ref="form" :rules="rules" label-width="120px"> |
| 9 | 4 | <el-form-item :label="$t('addNotepad.room')" prop="roomName"> |
| 10 | 5 | <el-input v-model="addNotepadInfo.roomName" disabled></el-input> |
| ... | ... | @@ -16,26 +11,14 @@ |
| 16 | 11 | <el-input v-model="addNotepadInfo.link" disabled></el-input> |
| 17 | 12 | </el-form-item> |
| 18 | 13 | <el-form-item :label="$t('addNotepad.type')" prop="noteType"> |
| 19 | - <el-select | |
| 20 | - v-model="addNotepadInfo.noteType" | |
| 21 | - style="width:100%" | |
| 22 | - :placeholder="$t('addNotepad.typePlaceholder')" | |
| 23 | - > | |
| 24 | - <el-option | |
| 25 | - v-for="item in addNotepadInfo.noteTypes" | |
| 26 | - :key="item.statusCd" | |
| 27 | - :label="item.name" | |
| 28 | - :value="item.statusCd" | |
| 29 | - /> | |
| 14 | + <el-select v-model="addNotepadInfo.noteType" style="width:100%" :placeholder="$t('addNotepad.typePlaceholder')"> | |
| 15 | + <el-option v-for="item in addNotepadInfo.noteTypes" :key="item.statusCd" :label="item.name" | |
| 16 | + :value="item.statusCd" /> | |
| 30 | 17 | </el-select> |
| 31 | 18 | </el-form-item> |
| 32 | 19 | <el-form-item :label="$t('addNotepad.content')" prop="title"> |
| 33 | - <el-input | |
| 34 | - type="textarea" | |
| 35 | - :rows="5" | |
| 36 | - v-model="addNotepadInfo.title" | |
| 37 | - :placeholder="$t('addNotepad.contentPlaceholder')" | |
| 38 | - /> | |
| 20 | + <el-input type="textarea" :rows="5" v-model="addNotepadInfo.title" | |
| 21 | + :placeholder="$t('addNotepad.contentPlaceholder')" /> | |
| 39 | 22 | </el-form-item> |
| 40 | 23 | </el-form> |
| 41 | 24 | <span slot="footer" class="dialog-footer"> |
| ... | ... | @@ -49,6 +32,7 @@ |
| 49 | 32 | import { getCommunityId } from '@/api/community/communityApi' |
| 50 | 33 | import { getDict } from '@/api/community/communityApi' |
| 51 | 34 | import { saveNotepad } from '@/api/oa/simplifyNotepadManageApi' |
| 35 | +import {queryRooms} from '@/api/room/roomApi' | |
| 52 | 36 | |
| 53 | 37 | export default { |
| 54 | 38 | name: 'AddNotepad', |
| ... | ... | @@ -98,6 +82,7 @@ export default { |
| 98 | 82 | communityId: getCommunityId() |
| 99 | 83 | } |
| 100 | 84 | this.getNoteTypes() |
| 85 | + this.listNotepadRoom() | |
| 101 | 86 | }, |
| 102 | 87 | async getNoteTypes() { |
| 103 | 88 | try { |
| ... | ... | @@ -107,10 +92,21 @@ export default { |
| 107 | 92 | console.error('Failed to get note types:', error) |
| 108 | 93 | } |
| 109 | 94 | }, |
| 95 | + async listNotepadRoom() { | |
| 96 | + const { rooms } = await queryRooms({ | |
| 97 | + communityId: this.addNotepadInfo.communityId, | |
| 98 | + page:1, | |
| 99 | + row:1, | |
| 100 | + roomId:this.addNotepadInfo.roomId | |
| 101 | + }) | |
| 102 | + Object.assign(this.addNotepadInfo,rooms[0]) | |
| 103 | + this.addNotepadInfo.objId = rooms[0].ownerId | |
| 104 | + this.addNotepadInfo.objName = rooms[0].ownerName | |
| 105 | + }, | |
| 110 | 106 | async saveNotepadInfo() { |
| 111 | 107 | this.$refs.form.validate(async valid => { |
| 112 | 108 | if (!valid) return |
| 113 | - | |
| 109 | + | |
| 114 | 110 | try { |
| 115 | 111 | await saveNotepad(this.addNotepadInfo) |
| 116 | 112 | this.$emit('success') | ... | ... |
src/views/oa/simplifyNotepadManageList.vue
| ... | ... | @@ -104,6 +104,8 @@ export default { |
| 104 | 104 | currentPage: 1, |
| 105 | 105 | pageSize: 10, |
| 106 | 106 | total: 0, |
| 107 | + roomId: '', | |
| 108 | + ownerId: '', | |
| 107 | 109 | simplifyNotepadManageInfo: { |
| 108 | 110 | notepads: [], |
| 109 | 111 | conditions: { |
| ... | ... | @@ -120,6 +122,10 @@ export default { |
| 120 | 122 | }, |
| 121 | 123 | created() { |
| 122 | 124 | this.communityId = getCommunityId() |
| 125 | + const {roomId,ownerId} = this.$route.query | |
| 126 | + this.simplifyNotepadManageInfo.roomId = roomId; | |
| 127 | + this.simplifyNotepadManageInfo.ownerId = ownerId; | |
| 128 | + this.simplifyNotepadManageInfo.conditions.objId = ownerId; | |
| 123 | 129 | this.simplifyNotepadManageInfo.conditions.communityId = this.communityId |
| 124 | 130 | this._listNotepads(this.currentPage, this.pageSize) |
| 125 | 131 | }, | ... | ... |
src/views/room/listPropertyRightRegistrationDetailList.vue
| ... | ... | @@ -153,19 +153,19 @@ export default { |
| 153 | 153 | this.listPropertyRightRegistrationDetailInfo.propertyRightRegistrationDetails = data.map(item => { |
| 154 | 154 | if (item.securities === '001' && item.idCardUrl) { |
| 155 | 155 | item.idCardUrl = item.idCardUrl.split(',') |
| 156 | - item.idCardUrlShow = item.idCardUrl.map(url => `/callComponent/download/getFile/file?fileId=${url}&communityId=-1&time=${new Date()}`) | |
| 156 | + item.idCardUrlShow = item.idCardUrl | |
| 157 | 157 | } |
| 158 | 158 | if (item.securities === '002' && item.housePurchaseUrl) { |
| 159 | 159 | item.housePurchaseUrl = item.housePurchaseUrl.split(',') |
| 160 | - item.housePurchaseUrlShow = item.housePurchaseUrl.map(url => `/callComponent/download/getFile/file?fileId=${url}&communityId=-1&time=${new Date()}`) | |
| 160 | + item.housePurchaseUrlShow = item.housePurchaseUrl | |
| 161 | 161 | } |
| 162 | 162 | if (item.securities === '003' && item.repairUrl) { |
| 163 | 163 | item.repairUrl = item.repairUrl.split(',') |
| 164 | - item.repairUrlShow = item.repairUrl.map(url => `/callComponent/download/getFile/file?fileId=${url}&communityId=-1&time=${new Date()}`) | |
| 164 | + item.repairUrlShow = item.repairUrl | |
| 165 | 165 | } |
| 166 | 166 | if (item.securities === '004' && item.deedTaxUrl) { |
| 167 | 167 | item.deedTaxUrl = item.deedTaxUrl.split(',') |
| 168 | - item.deedTaxUrlShow = item.deedTaxUrl.map(url => `/callComponent/download/getFile/file?fileId=${url}&communityId=-1&time=${new Date()}`) | |
| 168 | + item.deedTaxUrlShow = item.deedTaxUrl | |
| 169 | 169 | } |
| 170 | 170 | return item |
| 171 | 171 | }) | ... | ... |