优化代码

This commit is contained in:
java110 2021-04-28 18:33:44 +08:00
parent d0f299a41c
commit 13bb94ec3f
5 changed files with 85 additions and 69 deletions

View File

@ -3,7 +3,8 @@
<div class="col-lg-6 padding-right-xs padding-left-xl">
</div>
<div class="col-lg-6 text-right" v-if="simplifyRoomFeeInfo.roomId">
<div class="col-lg-6 text-right" v-if="contractInfo.ownerId">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openAddContractModal()">
起草合同
</button>

View File

@ -7,8 +7,8 @@
vc.extends({
data: {
contractInfo: {
roomId: '',
roomName: '',
ownerId: '',
ownerName: '',
contracts: [],
total: 0,
records: 1,
@ -32,7 +32,7 @@
return;
}
$that.clearContractInfoInfo();
vc.copyObject(_param, $that.simplifyRoomFeeInfo);
vc.copyObject(_param, $that.contractInfo);
$that.contractInfo.conditions.objId = _param.ownerId;
$that._listContractInfo(DEFAULT_PAGE, DEFAULT_ROWS);
});
@ -83,8 +83,8 @@
},
clearContractInfoInfo: function () {
$that.contractInfo = {
roomId: '',
roomName: '',
ownerId: '',
ownerName: '',
contracts: [],
total: 0,
records: 1,

View File

@ -5,6 +5,7 @@
tempImportRoomFeeInfo: {
communityId: vc.getCurrentCommunity().communityId,
feeTypeCd: '',
objType: '',
feeTypeCds: [],
feeName: '',
objName: '',
@ -37,6 +38,7 @@
$that.clearTempImportRoomFeeInfo();
$that.tempImportRoomFeeInfo.objId = _room.roomId;
$that.tempImportRoomFeeInfo.objName = _room.roomName;
$that.tempImportRoomFeeInfo.objType = _room.objType;
$('#tempImportRoomFeeModel').modal('show');
});
@ -135,7 +137,7 @@
vc.component.tempImportRoomFeeInfo.communityId = vc.getCurrentCommunity().communityId;
vc.http.post(
'importRoomFee','importTempData',
'importRoomFee', 'importTempData',
JSON.stringify(vc.component.tempImportRoomFeeInfo),
{
emulateJSON: true
@ -148,6 +150,7 @@
$('#tempImportRoomFeeModel').modal('hide');
vc.emit('listRoomFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
vc.emit('listContractFee', 'notify', {});
}
vc.message(_json.msg);
},

View File

@ -6,86 +6,89 @@
<h5>{{listContractFeeInfo.contractName}}费用</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_openRoomCreateFeeAddModal()"
v-if="listContractFeeInfo.hireOwnerFee == '0'">
v-on:click="_openTempImportContractFeeModal()">
临时收费
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_openRoomCreateFeeAddModal()" v-if="listContractFeeInfo.hireOwnerFee == '0'">
创建费用
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_toOwnerPayFee()" v-if="listContractFeeInfo.hireOwnerFee == '0'">
v-on:click="_toOwnerPayFee()" v-if="listContractFeeInfo.hireOwnerFee == '0'">
欠费缴费
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_goBack()">
v-on:click="_goBack()">
返回
</button>
</div>
</div>
<div class="ibox-content">
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px"
data-page-size="10">
data-page-size="10">
<thead>
<tr>
<th class="text-center">费用项目</th>
<th class="text-center">费用标识</th>
<th class="text-center">费用类型</th>
<th class="text-center">应收金额</th>
<th class="text-center">建账时间</th>
<th class="text-center">计费起始时间</th>
<th class="text-center">计费结束时间</th>
<th class="text-center">说明</th>
<th class="text-center">状态</th>
<th class="text-center">操作</th>
</tr>
<tr>
<th class="text-center">费用项目</th>
<th class="text-center">费用标识</th>
<th class="text-center">费用类型</th>
<th class="text-center">应收金额</th>
<th class="text-center">建账时间</th>
<th class="text-center">计费起始时间</th>
<th class="text-center">计费结束时间</th>
<th class="text-center">说明</th>
<th class="text-center">状态</th>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="fee in listContractFeeInfo.fees">
<td class="text-center">{{fee.feeName}}</td>
<td class="text-center">{{fee.feeFlagName}}</td>
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.computingFormula == '5005'">
<div>上期度数:{{fee.preDegrees}}</div>
<div>本期度数:{{fee.curDegrees}}</div>
<div>单价:{{fee.squarePrice}}</div>
<div>附加费:{{fee.additionalAmount}}</div>
</td>
<td class="text-center" v-else-if="fee.computingFormula == '6006'">
<div>用量:{{_getAttrValue(fee.feeAttrs,'390006')}}</div>
<div>单价:{{fee.squarePrice}}</div>
<div>附加费:{{fee.additionalAmount}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
<div>算法:{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
<div>用量:{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.computingFormula == '4004'">
<div>费用根据实际情况而定</div>
</td>
<td class="text-center" v-else>
<!-- <div>面积:{{listContractFeeInfo.builtUpArea}}</div> -->
<div>单价:{{fee.squarePrice}}</div>
<div v-if="fee.feeFlag == '1003006'">附加费:{{fee.additionalAmount}}</div>
<div v-else>固定费:{{fee.additionalAmount}}</div>
</td>
<td class="text-center">{{fee.stateName}}</td>
<td class="text-center">
<button class="btn btn-link btn-xs"
<tr v-for="fee in listContractFeeInfo.fees">
<td class="text-center">{{fee.feeName}}</td>
<td class="text-center">{{fee.feeFlagName}}</td>
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.computingFormula == '5005'">
<div>上期度数:{{fee.preDegrees}}</div>
<div>本期度数:{{fee.curDegrees}}</div>
<div>单价:{{fee.squarePrice}}</div>
<div>附加费:{{fee.additionalAmount}}</div>
</td>
<td class="text-center" v-else-if="fee.computingFormula == '6006'">
<div>用量:{{_getAttrValue(fee.feeAttrs,'390006')}}</div>
<div>单价:{{fee.squarePrice}}</div>
<div>附加费:{{fee.additionalAmount}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
<div>算法:{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
<div>用量:{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.computingFormula == '4004'">
<div>费用根据实际情况而定</div>
</td>
<td class="text-center" v-else>
<!-- <div>面积:{{listContractFeeInfo.builtUpArea}}</div> -->
<div>单价:{{fee.squarePrice}}</div>
<div v-if="fee.feeFlag == '1003006'">附加费:{{fee.additionalAmount}}</div>
<div v-else>固定费:{{fee.additionalAmount}}</div>
</td>
<td class="text-center">{{fee.stateName}}</td>
<td class="text-center">
<button class="btn btn-link btn-xs"
v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')"
v-on:click="_payFee(fee)">缴费
</button>
<button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史</button>
<button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
</button>
<button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史</button>
<button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
v-on:click="_deleteFee(fee)">取消费用
</button>
<button class="btn btn-link btn-xs"
</button>
<button class="btn btn-link btn-xs"
v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
v-on:click="_editFee(fee)">费用变更
</button>
</td>
</tr>
</button>
</td>
</tr>
</tbody>
</table>
<!-- 分页 -->
@ -104,4 +107,5 @@
<vc:create path="property/deleteFee"></vc:create>
<vc:create path="property/editFee"></vc:create>
<vc:create path="property/contractCreateFeeAdd"></vc:create>
<vc:create path="property/tempImportRoomFee"></vc:create>
</div>

View File

@ -27,7 +27,7 @@
if (vc.notNull(vc.getParam('ownerId'))) {
$that.listContractFeeInfo.urlOwnerId = vc.getParam("ownerId");
}
vc.component._loadListContractFeeInfo(DEFAULT_PAGE, DEFAULT_ROWS);
},
_initEvent: function () {
@ -68,6 +68,14 @@
}
);
},
_openTempImportContractFeeModal: function () {
vc.emit('tempImportRoomFee', 'openImportRoomFeeModal', {
roomId: $that.listContractFeeInfo.contractId,
objType: '7777',
roomName: $that.listContractFeeInfo.contractName,
ownerName: $that.listContractFeeInfo.ownerName
})
},
_payFee: function (_fee) {
_fee.contractName = $that.listContractFeeInfo.contractName;
_fee.payerObjName = $that.listContractFeeInfo.contractName;
@ -151,7 +159,7 @@
return;
}
vc.copyObject(listRoomData.data[0], $that.listContractFeeInfo);
}, function (errInfo, error) {
console.log('请求失败处理');
}