admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化房屋收费功能

Browse Source
This commit is contained in:
wuxw 2024-06-12 11:35:05 +08:00
parent 0d6bd27f42
commit 03ec056bf3
10 changed files with 77 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/components/car/carDetailOwner/carDetailOwner.html
View File

@ -70,39 +70,25 @@
{{owner.address || '-'}}
</td>
<td class="text-center">
<a href="javascript:void(0)" @click="_viewOwnerRooms(owner)">
{{owner.roomCount || 0}}
</a>
</td>
<td class="text-center">
<a href="javascript:void(0)" @click="_viewOwnerMembers(owner)">
{{owner.memberCount || 0}}
</a>
{{owner.memberCount || 0}}
</td>
<td class="text-center">
<a href="javascript:void(0)" @click="_viewOwnerCars(owner)">
{{owner.carCount || 0}}
</a>
</td>
<td class="text-center">
<a href="javascript:void(0)" @click="_viewComplaints(owner)">
{{owner.complaintCount || 0}}
</a>
</td>
<td class="text-center">
<a href="javascript:void(0)" @click="_viewRepairs(owner)">
{{owner.repairCount || 0}}
</a>
</td>
<td class="text-center">
<a href="javascript:void(0)" @click="_viewOweFees(owner)">
{{owner.oweFee || '0.00'}}
</a>
</td>
<td class="text-center">
<a href="javascript:void(0)" @click="_viewRoomContracts(owner)">
{{owner.contractCount || 0}}
</a>
</td>
<td class="text-center">
<div class="btn-group">
@ -125,12 +111,6 @@
</div>
</div>
</div>
<vc:create path="owner/ownerRooms"></vc:create>
<vc:create path="owner/ownerMembers"></vc:create>
<vc:create path="owner/ownerCars"></vc:create>
<vc:create path="owner/ownerComplaints"></vc:create>
<vc:create path="owner/ownerRepairs"></vc:create>
<vc:create path="owner/ownerOweFees"></vc:create>
<vc:create path="room/roomContracts"></vc:create>
<vc:create path="common/viewImage"></vc:create>
</div>

24
public/components/car/carDetailOwner/carDetailOwner.js
View File

@ -61,28 +61,8 @@
_qureyCarDetailOwner: function () {
$that._loadCarDetailOwnerData(DEFAULT_PAGE, DEFAULT_ROWS);
},
_viewOwnerRooms: function (_owner) {
vc.emit('ownerRooms', 'openOwnerRoomModel', _owner);
},
_viewOwnerMembers: function (_owner) {
vc.emit('ownerMembers', 'openOwnerMemberModel', _owner);
},
_viewOwnerCars: function (_owner) {
vc.emit('ownerCars', 'openOwnerCarModel', _owner);
},
_viewComplaints: function (_owner) {
vc.emit('ownerComplaints', 'openOwnerComplaintModel', _owner);
},
_viewRepairs: function (_owner) {
vc.emit('ownerRepairs', 'openOwnerRepairModel', _owner);
},
_viewOweFees: function (_owner) {
vc.emit('ownerOweFees', 'openOwnerOweFeeModel', _owner);
},
_viewRoomContracts: function (_owner) {
vc.emit('roomContracts', 'openRoomContractModel', _owner);
},
_viewOwnerFace: function (_url) {
vc.emit('viewImage', 'showImage', {
url: _url

3
public/components/fee/feeDetailFeeRule/feeDetailFeeRule.js
View File

@ -9,12 +9,14 @@
feeDetailFeeRuleInfo: {
rules: [],
feeId: '',
roomId:'',
}
},
_initMethod: function() {},
_initEvent: function() {
vc.on('feeDetailFeeRule', 'switch', function(_data) {
$that.feeDetailFeeRuleInfo.feeId = _data.feeId;
$that.feeDetailFeeRuleInfo.roomId = _data.roomId;
$that._loadFeeDetailFeeRuleData(DEFAULT_PAGE, DEFAULT_ROWS);
});
vc.on('feeDetailFeeRule', 'notify',
@ -32,6 +34,7 @@
params: {
communityId: vc.getCurrentCommunity().communityId,
feeId: $that.feeDetailFeeRuleInfo.feeId,
payerObjId: $that.feeDetailFeeRuleInfo.roomId,
detailId: '-1',
page: _page,
row: _row

4
public/components/fee/feeDetailRuleBill/feeDetailRuleBill.js
View File

@ -9,12 +9,15 @@
feeDetailRuleBillInfo: {
bills: [],
feeId: '',
roomId:''
}
},
_initMethod: function() {},
_initEvent: function() {
vc.on('feeDetailRuleBill', 'switch', function(_data) {
$that.feeDetailRuleBillInfo.feeId = _data.feeId;
$that.feeDetailRuleBillInfo.roomId = _data.roomId;
$that._loadFeeDetailRuleBillData(DEFAULT_PAGE, DEFAULT_ROWS);
});
vc.on('feeDetailRuleBill', 'notify',
@ -32,6 +35,7 @@
params: {
communityId: vc.getCurrentCommunity().communityId,
feeId: $that.feeDetailRuleBillInfo.feeId,
payerObjId: $that.feeDetailRuleBillInfo.roomId,
page: _page,
row: _row
}

10
public/components/fee/feeDetailSub/feeDetailSub.html
View File

@ -1,6 +1,12 @@
<div>
<div class="margin-top">
<div >
<div class="col-lg-12 text-right">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-if="vc.hasPrivilege('502020090427190001') && feeDetailSubInfo.fee.state == '2008001'" v-on:click="_splitPayFee()">
<vc:i18n name="拆分" namespace="simplifyRoomFee"></vc:i18n>
</button>
</div>
<table class="footable table table-stripped toggle-arrow-tiny margin-top" data-page-size="15">
<thead>
<tr>
@ -57,5 +63,7 @@
</div>
<vc:create path="fee/mergeFee"></vc:create>
<vc:create path="fee/splitFee"></vc:create>
</div>

29
public/components/fee/feeDetailSub/feeDetailSub.js
View File

@ -11,6 +11,7 @@
feeId: '',
total: '',
records: '',
fee:{}
}
},
_initMethod: function() {},
@ -22,9 +23,12 @@
}
vc.copyObject(_param, $that.feeDetailSubInfo);
$that._listFeeDetailSub(DEFAULT_PAGE, DEFAULT_ROWS);
$that._loadFeeDetailSubFeeInfo();
});
vc.on('feeDetailSub', 'loadSub', function() {
$that._listFeeDetailSub(DEFAULT_PAGE, DEFAULT_ROWS);
$that._loadFeeDetailSubFeeInfo();
});
vc.on('feeDetailSub', 'paginationPlus', 'page_event',
function(_currentPage) {
@ -60,8 +64,33 @@
}
);
},
_loadFeeDetailSubFeeInfo: function () {
let param = {
params: {
page: 1,
row: 1,
feeId: $that.feeDetailSubInfo.feeId,
communityId: vc.getCurrentCommunity().communityId
}
};
//发送get请求
vc.http.apiGet('/fee.listFee',
param,
function (json) {
let _feeInfo = JSON.parse(json);
// 员工列表 和 岗位列表匹配
$that.feeDetailSubInfo.fee = _feeInfo.fees[0];
},
function () {
console.log('请求失败处理');
}
);
},
_mergeFee:function(_fee){
vc.emit('mergeFee', 'openMergeFeeModal',_fee);
},
_splitPayFee: function (_fee) {
vc.emit('splitFee', 'openSplitFeeModal', $that.feeDetailSubInfo.fee);
}
}
});

9
public/components/fee/splitFee/splitFee.js
View File

@ -10,9 +10,7 @@
}
},
_initMethod: function () {
vc.initDate('splitFeeTime', function (_value) {
$that.splitFeeInfo.splitTime = _value;
});
},
_initEvent: function () {
vc.on('splitFee', 'openSplitFeeModal',
@ -23,6 +21,9 @@
$that.splitFeeInfo.splitTime = '';
$that.splitFeeInfo.remark = '';
$('#splitFeeModel').modal('show');
vc.initDate('splitFeeTime', function (_value) {
$that.splitFeeInfo.splitTime = _value;
});
});
},
methods: {
@ -47,7 +48,7 @@
if (_json.code == 0) {
//关闭model
$('#splitFeeModel').modal('hide');
vc.emit('roomCreateFee', 'notify', {});
vc.emit('feeDetailSub', 'loadSub', {});
vc.emit('listParkingSpaceFee', 'notify', {});
vc.toast("操作成功");

2
public/pages/fee/feeDetail/feeDetail.html
View File

@ -188,7 +188,7 @@
<vc:i18n name="补打收据" namespace="feeDetail"></vc:i18n>
</a>
</li>
<li class="nav-item">
<li class="nav-item" v-if="feeDetailInfo.feeFlag != '2006012'">
<a class="nav-link" v-bind:class="{active:feeDetailInfo._currentTab == 'feeDetailSub'}" v-on:click="changeTab('feeDetailSub')">
<vc:i18n name="费用拆分" namespace="feeDetail"></vc:i18n>
</a>

1
public/pages/fee/feeDetail/feeDetail.js
View File

@ -77,6 +77,7 @@
feeId: $that.feeDetailInfo.feeId,
payerObjId: $that.feeDetailInfo.payerObjId,
configId:$that.feeDetailInfo.configId,
state:$that.feeDetailInfo.state,
ownerId:_ownerId
});
},

22
public/pages/property/roomCreateFee/roomCreateFee.html
View File

@ -142,6 +142,20 @@
<vc:i18n name="押金" namespace="simplifyAcceptance"></vc:i18n>
</a>
</li>
<li class="nav-item">
<a class="nav-link"
v-bind:class="{active:roomCreateFeeInfo._currentTab == 'feeDetailFeeRule'}"
v-on:click="changeTab('feeDetailFeeRule')">
<vc:i18n name="账单规则" namespace="feeDetail"></vc:i18n>
</a>
</li>
<li class="nav-item">
<a class="nav-link"
v-bind:class="{active:roomCreateFeeInfo._currentTab == 'feeDetailRuleBill'}"
v-on:click="changeTab('feeDetailRuleBill')">
<vc:i18n name="费用账单" namespace="feeDetail"></vc:i18n>
</a>
</li>
</ul>
</div>
<div v-if="roomCreateFeeInfo._currentTab == 'simplifyRoomFee'">
@ -175,6 +189,13 @@
<vc:create path="fee/simplifyRefundDeposit"></vc:create>
</div>
<div v-if="roomCreateFeeInfo._currentTab == 'feeDetailFeeRule'">
<vc:create path="fee/feeDetailFeeRule"></vc:create>
</div>
<div v-if="roomCreateFeeInfo._currentTab == 'feeDetailRuleBill'">
<vc:create path="fee/feeDetailRuleBill"></vc:create>
</div>
</div>
</div>
</div>
@ -182,7 +203,6 @@
</div>
<vc:create path="property/deleteFee"></vc:create>
<vc:create path="property/editFee"></vc:create>
<vc:create path="fee/splitFee"></vc:create>
<vc:create path="property/roomCreateFeeAdd"></vc:create>
<vc:create path="property/addMeterWater" callBackListener="" callBackFunction=""></vc:create>
<vc:create path="property/addProxyFee" callBackListener="" callBackFunction=""></vc:create>