Commit 200a3c1650c117882f997b1c2576d1b80f7ce2cd
1 parent
84ba0155
优化业主详情
Showing
2 changed files
with
35 additions
and
62 deletions
src/components/owner/ownerDetailRoomFee.vue
| ... | ... | @@ -11,84 +11,62 @@ |
| 11 | 11 | </div> |
| 12 | 12 | <div class="padding-lr-xs"> |
| 13 | 13 | <el-select v-model="ownerDetailRoomFeeInfo.state" @change="_changeContractConfigId()" size="small" |
| 14 | - :placeholder="$t('ownerDetailRoomFee.selectStatus')"> | |
| 15 | - <el-option :label="$t('ownerDetailRoomFee.valid')" value="2008001"></el-option> | |
| 16 | - <el-option :label="$t('ownerDetailRoomFee.feeEnd')" value="2009001"></el-option> | |
| 14 | + :placeholder="$t('aOwnerDetailRoomFee.selectStatus')"> | |
| 15 | + <el-option :label="$t('aOwnerDetailRoomFee.valid')" value="2008001"></el-option> | |
| 16 | + <el-option :label="$t('aOwnerDetailRoomFee.feeEnd')" value="2009001"></el-option> | |
| 17 | 17 | </el-select> |
| 18 | 18 | </div> |
| 19 | 19 | <div :span="9" class="text-right"> |
| 20 | - <el-button type="primary" size="small" style="margin-left:10px" v-if="hasPrivilege('502020082314267912')" | |
| 21 | - @click="_openBatchPayRoomFeeModal()"> | |
| 22 | - {{ $t('ownerDetailRoomFee.batchPay') }} | |
| 23 | - </el-button> | |
| 24 | - <el-button type="primary" size="small" style="margin-left:10px" v-if="hasPrivilege('502022073007100003')" | |
| 25 | - @click="_openTempImportRoomFeeModal()"> | |
| 26 | - {{ $t('ownerDetailRoomFee.tempFee') }} | |
| 27 | - </el-button> | |
| 28 | - <el-button type="primary" size="small" style="margin-left:10px" v-if="hasPrivilege('502022073049300004')" | |
| 29 | - @click="_openProxyFeeModal()"> | |
| 30 | - {{ $t('ownerDetailRoomFee.quantityPay') }} | |
| 31 | - </el-button> | |
| 32 | - <el-button type="primary" size="small" style="margin-left:10px" v-if="hasPrivilege('502022073096990007')" | |
| 33 | - @click="_openRoomsCreateFeeModal()"> | |
| 34 | - {{ $t('ownerDetailRoomFee.createFee') }} | |
| 35 | - </el-button> | |
| 36 | - <el-button type="primary" size="small" style="margin-left:10px" v-if="hasPrivilege('502020080570210194')" | |
| 37 | - @click="_toRoomOwePayFee()"> | |
| 38 | - {{ $t('ownerDetailRoomFee.owePay') }} | |
| 39 | - </el-button> | |
| 40 | - <el-button type="default" size="small" style="margin-left:10px" @click="_printOwnOrder()"> | |
| 41 | - {{ $t('ownerDetailRoomFee.reminder') }} | |
| 42 | - </el-button> | |
| 20 | + | |
| 43 | 21 | </div> |
| 44 | 22 | </div> |
| 45 | 23 | <div class="margin-top"> |
| 46 | 24 | <el-table :data="ownerDetailRoomFeeInfo.fees" style="width: 100%"> |
| 47 | - <el-table-column prop="payerObjName" :label="$t('ownerDetailRoomFee.room')" align="center"></el-table-column> | |
| 48 | - <el-table-column prop="feeName" :label="$t('ownerDetailRoomFee.feeItem')" align="center"></el-table-column> | |
| 49 | - <el-table-column prop="feeFlagName" :label="$t('ownerDetailRoomFee.feeFlag')" align="center"></el-table-column> | |
| 50 | - <el-table-column prop="feeTypeCdName" :label="$t('ownerDetailRoomFee.feeType')" | |
| 25 | + <el-table-column prop="payerObjName" :label="$t('aOwnerDetailRoomFee.room')" align="center"></el-table-column> | |
| 26 | + <el-table-column prop="feeName" :label="$t('aOwnerDetailRoomFee.feeItem')" align="center"></el-table-column> | |
| 27 | + <el-table-column prop="feeFlagName" :label="$t('aOwnerDetailRoomFee.feeFlag')" align="center"></el-table-column> | |
| 28 | + <el-table-column prop="feeTypeCdName" :label="$t('aOwnerDetailRoomFee.feeType')" | |
| 51 | 29 | align="center"></el-table-column> |
| 52 | - <el-table-column prop="amountOwed" :label="$t('ownerDetailRoomFee.amount')" align="center"></el-table-column> | |
| 53 | - <el-table-column prop="startTime" :label="$t('ownerDetailRoomFee.createTime')" align="center"></el-table-column> | |
| 54 | - <el-table-column :label="$t('ownerDetailRoomFee.timeRange')" align="center"> | |
| 30 | + <el-table-column prop="amountOwed" :label="$t('aOwnerDetailRoomFee.amountReceivable')" align="center"></el-table-column> | |
| 31 | + <el-table-column prop="startTime" :label="$t('aOwnerDetailRoomFee.accountTime')" align="center"></el-table-column> | |
| 32 | + <el-table-column :label="$t('aOwnerDetailRoomFee.receivablePeriod')" align="center"> | |
| 55 | 33 | <template slot-scope="scope"> |
| 56 | 34 | {{ _getRoomEndTime(scope.row) }}~<br>{{ _getRoomDeadlineTime(scope.row) }} |
| 57 | 35 | </template> |
| 58 | 36 | </el-table-column> |
| 59 | - <el-table-column :label="$t('ownerDetailRoomFee.remark')" align="center" width="150"> | |
| 37 | + <el-table-column :label="$t('aOwnerDetailRoomFee.description')" align="center" width="150"> | |
| 60 | 38 | <template slot-scope="scope"> |
| 61 | 39 | <div v-if="scope.row.computingFormula == '5005' || scope.row.computingFormula == '9009'"> |
| 62 | - <div><span>{{ $t('ownerDetailRoomFee.lastDegree') }}</span>{{ scope.row.preDegrees }}</div> | |
| 63 | - <div><span>{{ $t('ownerDetailRoomFee.currentDegree') }}</span>{{ scope.row.curDegrees }}</div> | |
| 64 | - <div><span>{{ $t('ownerDetailRoomFee.unitPrice') | |
| 40 | + <div><span>{{ $t('aOwnerDetailRoomFee.lastDegree') }}</span>{{ scope.row.preDegrees }}</div> | |
| 41 | + <div><span>{{ $t('aOwnerDetailRoomFee.currentDegree') }}</span>{{ scope.row.curDegrees }}</div> | |
| 42 | + <div><span>{{ $t('aOwnerDetailRoomFee.unitPrice') | |
| 65 | 43 | }}</span>{{ scope.row.mwPrice ? scope.row.mwPrice : scope.row.squarePrice }}</div> |
| 66 | - <div><span>{{ $t('ownerDetailRoomFee.additionalFee') }}</span>{{ scope.row.additionalAmount }}</div> | |
| 44 | + <div><span>{{ $t('aOwnerDetailRoomFee.additionalFee') }}</span>{{ scope.row.additionalAmount }}</div> | |
| 67 | 45 | </div> |
| 68 | 46 | <div v-else-if="scope.row.computingFormula == '6006'"> |
| 69 | - <div><span>{{ $t('ownerDetailRoomFee.usage') }}</span>{{ _getRoomAttrValue(scope.row.feeAttrs, '390006') }} | |
| 47 | + <div><span>{{ $t('aOwnerDetailRoomFee.usage') }}</span>{{ _getRoomAttrValue(scope.row.feeAttrs, '390006') }} | |
| 70 | 48 | </div> |
| 71 | - <div><span>{{ $t('ownerDetailRoomFee.unitPrice') }}</span>{{ scope.row.squarePrice }}</div> | |
| 72 | - <div><span>{{ $t('ownerDetailRoomFee.additionalFee') }}</span>{{ scope.row.additionalAmount }}</div> | |
| 49 | + <div><span>{{ $t('aOwnerDetailRoomFee.unitPrice') }}</span>{{ scope.row.squarePrice }}</div> | |
| 50 | + <div><span>{{ $t('aOwnerDetailRoomFee.additionalFee') }}</span>{{ scope.row.additionalAmount }}</div> | |
| 73 | 51 | </div> |
| 74 | 52 | <div v-else-if="scope.row.feeTypeCd == '888800010017'" width="150"> |
| 75 | - <div><span>{{ $t('ownerDetailRoomFee.algorithm') | |
| 53 | + <div><span>{{ $t('aOwnerDetailRoomFee.algorithm') | |
| 76 | 54 | }}</span>{{ _getRoomAttrValue(scope.row.feeAttrs, '390005') }}</div> |
| 77 | - <div><span>{{ $t('ownerDetailRoomFee.usage') }}</span>{{ _getRoomAttrValue(scope.row.feeAttrs, '390003') }} | |
| 55 | + <div><span>{{ $t('aOwnerDetailRoomFee.usage') }}</span>{{ _getRoomAttrValue(scope.row.feeAttrs, '390003') }} | |
| 78 | 56 | </div> |
| 79 | 57 | </div> |
| 80 | 58 | <div v-else-if="scope.row.computingFormula == '4004'"> |
| 81 | - <div>{{ $t('ownerDetailRoomFee.feeByActual') }}</div> | |
| 59 | + <div>{{ $t('aOwnerDetailRoomFee.feeByActual') }}</div> | |
| 82 | 60 | </div> |
| 83 | 61 | <div v-else> |
| 84 | - <div><span>{{ $t('ownerDetailRoomFee.unitPrice') }}</span>{{ scope.row.squarePrice }}</div> | |
| 85 | - <div v-if="scope.row.feeFlag == '1003006'"><span>{{ $t('ownerDetailRoomFee.additionalFee') | |
| 62 | + <div><span>{{ $t('aOwnerDetailRoomFee.unitPrice') }}</span>{{ scope.row.squarePrice }}</div> | |
| 63 | + <div v-if="scope.row.feeFlag == '1003006'"><span>{{ $t('aOwnerDetailRoomFee.additionalFee') | |
| 86 | 64 | }}</span>{{ scope.row.additionalAmount }}</div> |
| 87 | - <div v-else><span>{{ $t('ownerDetailRoomFee.fixedFee') }}</span>{{ scope.row.additionalAmount }}</div> | |
| 65 | + <div v-else><span>{{ $t('aOwnerDetailRoomFee.fixedFee') }}</span>{{ scope.row.additionalAmount }}</div> | |
| 88 | 66 | </div> |
| 89 | 67 | </template> |
| 90 | 68 | </el-table-column> |
| 91 | - <el-table-column prop="stateName" :label="$t('ownerDetailRoomFee.status')" align="center"></el-table-column> | |
| 69 | + <el-table-column prop="stateName" :label="$t('aOwnerDetailRoomFee.status')" align="center"></el-table-column> | |
| 92 | 70 | <el-table-column :label="$t('common.operation')" align="center" width="300"> |
| 93 | 71 | <template slot-scope="scope"> |
| 94 | 72 | <el-button-group> |
| ... | ... | @@ -120,11 +98,11 @@ |
| 120 | 98 | </el-table> |
| 121 | 99 | <el-row> |
| 122 | 100 | <el-col :span="12"> |
| 123 | - <div>{{ $t('ownerDetailRoomFee.note1') }}</div> | |
| 124 | - <div>{{ $t('ownerDetailRoomFee.note2') }}</div> | |
| 101 | + <div>{{ $t('aOwnerDetailRoomFee.note1') }}</div> | |
| 102 | + <div>{{ $t('aOwnerDetailRoomFee.note2') }}</div> | |
| 125 | 103 | </el-col> |
| 126 | 104 | <el-col :span="4"> |
| 127 | - <span>{{ $t('ownerDetailRoomFee.oweSubtotal') }}</span> | |
| 105 | + <span>{{ $t('aOwnerDetailRoomFee.arrearsSubtotal') }}</span> | |
| 128 | 106 | {{ ownerDetailRoomFeeInfo.totalAmount }} |
| 129 | 107 | </el-col> |
| 130 | 108 | <el-col :span="8"> |
| ... | ... | @@ -135,25 +113,16 @@ |
| 135 | 113 | </el-row> |
| 136 | 114 | </div> |
| 137 | 115 | |
| 138 | - <!-- <rooms-import-temp-fee ref="roomsImportTempFee"></rooms-import-temp-fee> --> | |
| 139 | - <!-- <rooms-create-fee ref="roomsCreateFee"></rooms-create-fee> --> | |
| 140 | - <!-- <rooms-proxy-fee ref="roomsProxyFee"></rooms-proxy-fee> --> | |
| 141 | 116 | </div> |
| 142 | 117 | </template> |
| 143 | 118 | |
| 144 | 119 | <script> |
| 145 | -// import RoomsImportTempFee from '@/components/fee/roomsImportTempFee' | |
| 146 | -// import RoomsCreateFee from '@/components/fee/roomsCreateFee' | |
| 147 | -// import RoomsProxyFee from '@/components/fee/roomsProxyFee' | |
| 148 | 120 | import { listFee, listRoomsByOwner } from '@/api/owner/ownerDetailRoomFeeApi' |
| 149 | 121 | import { getCommunityId } from '@/api/community/communityApi' |
| 150 | 122 | |
| 151 | 123 | export default { |
| 152 | 124 | name: 'OwnerDetailRoomFee', |
| 153 | 125 | components: { |
| 154 | - // RoomsImportTempFee, | |
| 155 | - // RoomsCreateFee, | |
| 156 | - // RoomsProxyFee | |
| 157 | 126 | }, |
| 158 | 127 | data() { |
| 159 | 128 | return { |
| ... | ... | @@ -173,6 +142,10 @@ export default { |
| 173 | 142 | } |
| 174 | 143 | }, |
| 175 | 144 | methods: { |
| 145 | + open(owner) { | |
| 146 | + this.ownerDetailRoomFeeInfo.ownerId = owner.ownerId | |
| 147 | + this._loadDetailRoomsData() | |
| 148 | + }, | |
| 176 | 149 | _loadOwnerDetailRoomFeeData(page, row) { |
| 177 | 150 | const _payerObjIds = this.ownerDetailRoomFeeInfo.payerObjIds.join(',') |
| 178 | 151 | const params = { | ... | ... |
src/views/owner/ownerDetail.vue
| ... | ... | @@ -163,7 +163,7 @@ import OwnerDetailComplaint from '@/components/owner/ownerDetailComplaint' |
| 163 | 163 | import OwnerDetailRepair from '@/components/owner/ownerDetailRepair' |
| 164 | 164 | import OwnerDetailVisit from '@/components/owner/ownerDetailVisit' |
| 165 | 165 | import OwnerDetailContract from '@/components/owner/ownerDetailContract' |
| 166 | -//import OwnerDetailRoomFee from '@/components/owner/ownerDetailRoomFee' | |
| 166 | +import OwnerDetailRoomFee from '@/components/owner/ownerDetailRoomFee' | |
| 167 | 167 | import OwnerDetailHisFee from '@/components/owner/ownerDetailHisFee' |
| 168 | 168 | import OwnerDetailReceipt from '@/components/owner/ownerDetailReceipt' |
| 169 | 169 | import OwnerDetailAccountReceipt from '@/components/owner/ownerDetailAccountReceipt' |
| ... | ... | @@ -192,7 +192,7 @@ export default { |
| 192 | 192 | OwnerDetailRepair, |
| 193 | 193 | OwnerDetailVisit, |
| 194 | 194 | OwnerDetailContract, |
| 195 | - //OwnerDetailRoomFee, | |
| 195 | + OwnerDetailRoomFee, | |
| 196 | 196 | OwnerDetailHisFee, |
| 197 | 197 | OwnerDetailReceipt, |
| 198 | 198 | OwnerDetailAccountReceipt, | ... | ... |