Commit 200a3c1650c117882f997b1c2576d1b80f7ce2cd

Authored by wuxw
1 parent 84ba0155

优化业主详情

src/components/owner/ownerDetailRoomFee.vue
@@ -11,84 +11,62 @@ @@ -11,84 +11,62 @@
11 </div> 11 </div>
12 <div class="padding-lr-xs"> 12 <div class="padding-lr-xs">
13 <el-select v-model="ownerDetailRoomFeeInfo.state" @change="_changeContractConfigId()" size="small" 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 </el-select> 17 </el-select>
18 </div> 18 </div>
19 <div :span="9" class="text-right"> 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 </div> 21 </div>
44 </div> 22 </div>
45 <div class="margin-top"> 23 <div class="margin-top">
46 <el-table :data="ownerDetailRoomFeeInfo.fees" style="width: 100%"> 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 align="center"></el-table-column> 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 <template slot-scope="scope"> 33 <template slot-scope="scope">
56 {{ _getRoomEndTime(scope.row) }}~<br>{{ _getRoomDeadlineTime(scope.row) }} 34 {{ _getRoomEndTime(scope.row) }}~<br>{{ _getRoomDeadlineTime(scope.row) }}
57 </template> 35 </template>
58 </el-table-column> 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 <template slot-scope="scope"> 38 <template slot-scope="scope">
61 <div v-if="scope.row.computingFormula == '5005' || scope.row.computingFormula == '9009'"> 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 }}</span>{{ scope.row.mwPrice ? scope.row.mwPrice : scope.row.squarePrice }}</div> 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 </div> 45 </div>
68 <div v-else-if="scope.row.computingFormula == '6006'"> 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 </div> 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 </div> 51 </div>
74 <div v-else-if="scope.row.feeTypeCd == '888800010017'" width="150"> 52 <div v-else-if="scope.row.feeTypeCd == '888800010017'" width="150">
75 - <div><span>{{ $t('ownerDetailRoomFee.algorithm') 53 + <div><span>{{ $t('aOwnerDetailRoomFee.algorithm')
76 }}</span>{{ _getRoomAttrValue(scope.row.feeAttrs, '390005') }}</div> 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 </div> 56 </div>
79 </div> 57 </div>
80 <div v-else-if="scope.row.computingFormula == '4004'"> 58 <div v-else-if="scope.row.computingFormula == '4004'">
81 - <div>{{ $t('ownerDetailRoomFee.feeByActual') }}</div> 59 + <div>{{ $t('aOwnerDetailRoomFee.feeByActual') }}</div>
82 </div> 60 </div>
83 <div v-else> 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 }}</span>{{ scope.row.additionalAmount }}</div> 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 </div> 66 </div>
89 </template> 67 </template>
90 </el-table-column> 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 <el-table-column :label="$t('common.operation')" align="center" width="300"> 70 <el-table-column :label="$t('common.operation')" align="center" width="300">
93 <template slot-scope="scope"> 71 <template slot-scope="scope">
94 <el-button-group> 72 <el-button-group>
@@ -120,11 +98,11 @@ @@ -120,11 +98,11 @@
120 </el-table> 98 </el-table>
121 <el-row> 99 <el-row>
122 <el-col :span="12"> 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 </el-col> 103 </el-col>
126 <el-col :span="4"> 104 <el-col :span="4">
127 - <span>{{ $t('ownerDetailRoomFee.oweSubtotal') }}</span> 105 + <span>{{ $t('aOwnerDetailRoomFee.arrearsSubtotal') }}</span>
128 {{ ownerDetailRoomFeeInfo.totalAmount }} 106 {{ ownerDetailRoomFeeInfo.totalAmount }}
129 </el-col> 107 </el-col>
130 <el-col :span="8"> 108 <el-col :span="8">
@@ -135,25 +113,16 @@ @@ -135,25 +113,16 @@
135 </el-row> 113 </el-row>
136 </div> 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 </div> 116 </div>
142 </template> 117 </template>
143 118
144 <script> 119 <script>
145 -// import RoomsImportTempFee from '@/components/fee/roomsImportTempFee'  
146 -// import RoomsCreateFee from '@/components/fee/roomsCreateFee'  
147 -// import RoomsProxyFee from '@/components/fee/roomsProxyFee'  
148 import { listFee, listRoomsByOwner } from '@/api/owner/ownerDetailRoomFeeApi' 120 import { listFee, listRoomsByOwner } from '@/api/owner/ownerDetailRoomFeeApi'
149 import { getCommunityId } from '@/api/community/communityApi' 121 import { getCommunityId } from '@/api/community/communityApi'
150 122
151 export default { 123 export default {
152 name: 'OwnerDetailRoomFee', 124 name: 'OwnerDetailRoomFee',
153 components: { 125 components: {
154 - // RoomsImportTempFee,  
155 - // RoomsCreateFee,  
156 - // RoomsProxyFee  
157 }, 126 },
158 data() { 127 data() {
159 return { 128 return {
@@ -173,6 +142,10 @@ export default { @@ -173,6 +142,10 @@ export default {
173 } 142 }
174 }, 143 },
175 methods: { 144 methods: {
  145 + open(owner) {
  146 + this.ownerDetailRoomFeeInfo.ownerId = owner.ownerId
  147 + this._loadDetailRoomsData()
  148 + },
176 _loadOwnerDetailRoomFeeData(page, row) { 149 _loadOwnerDetailRoomFeeData(page, row) {
177 const _payerObjIds = this.ownerDetailRoomFeeInfo.payerObjIds.join(',') 150 const _payerObjIds = this.ownerDetailRoomFeeInfo.payerObjIds.join(',')
178 const params = { 151 const params = {
src/views/owner/ownerDetail.vue
@@ -163,7 +163,7 @@ import OwnerDetailComplaint from &#39;@/components/owner/ownerDetailComplaint&#39; @@ -163,7 +163,7 @@ import OwnerDetailComplaint from &#39;@/components/owner/ownerDetailComplaint&#39;
163 import OwnerDetailRepair from '@/components/owner/ownerDetailRepair' 163 import OwnerDetailRepair from '@/components/owner/ownerDetailRepair'
164 import OwnerDetailVisit from '@/components/owner/ownerDetailVisit' 164 import OwnerDetailVisit from '@/components/owner/ownerDetailVisit'
165 import OwnerDetailContract from '@/components/owner/ownerDetailContract' 165 import OwnerDetailContract from '@/components/owner/ownerDetailContract'
166 -//import OwnerDetailRoomFee from '@/components/owner/ownerDetailRoomFee' 166 +import OwnerDetailRoomFee from '@/components/owner/ownerDetailRoomFee'
167 import OwnerDetailHisFee from '@/components/owner/ownerDetailHisFee' 167 import OwnerDetailHisFee from '@/components/owner/ownerDetailHisFee'
168 import OwnerDetailReceipt from '@/components/owner/ownerDetailReceipt' 168 import OwnerDetailReceipt from '@/components/owner/ownerDetailReceipt'
169 import OwnerDetailAccountReceipt from '@/components/owner/ownerDetailAccountReceipt' 169 import OwnerDetailAccountReceipt from '@/components/owner/ownerDetailAccountReceipt'
@@ -192,7 +192,7 @@ export default { @@ -192,7 +192,7 @@ export default {
192 OwnerDetailRepair, 192 OwnerDetailRepair,
193 OwnerDetailVisit, 193 OwnerDetailVisit,
194 OwnerDetailContract, 194 OwnerDetailContract,
195 - //OwnerDetailRoomFee, 195 + OwnerDetailRoomFee,
196 OwnerDetailHisFee, 196 OwnerDetailHisFee,
197 OwnerDetailReceipt, 197 OwnerDetailReceipt,
198 OwnerDetailAccountReceipt, 198 OwnerDetailAccountReceipt,