admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 10:00:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
92895 2020-11-26 09:13:13 +08:00
commit eb1fba2d7b
6 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/components/property/chooseUnit/chooseUnit.html
View File

@ -1,4 +1,5 @@
<div id = "chooseUnitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseUnitModelLabel" aria-hidden="true" > <div id="chooseUnitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseUnitModelLabel"
aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -17,9 +18,12 @@
</div> </div>
<div class="col-sm-5"> <div class="col-sm-5">
<div class="input-group"> <div class="input-group">
<input placeholder="输入单元名称" type="text" v-model="chooseUnitInfo._currentUnitName" class="form-control form-control-sm"> <input placeholder="输入单元名称" type="text"
v-model="chooseUnitInfo._currentUnitName"
class="form-control form-control-sm">
<span class="input-group-append"> <span class="input-group-append">
<button type="button" class="btn btn-sm btn-primary" v-on:click="queryUnits()">查询</button> <button type="button" class="btn btn-sm btn-primary"
v-on:click="queryUnits()">查询</button>
</span> </span>
</div> </div>
</div> </div>
@ -42,11 +46,12 @@
<td class="text-center">{{unit.unitId}}</td> <td class="text-center">{{unit.unitId}}</td>
<td class="text-center">{{unit.unitNum}}</td> <td class="text-center">{{unit.unitNum}}</td>
<td class="text-center">{{unit.layerCount}}</td> <td class="text-center">{{unit.layerCount}}</td>
<td class="text-center">{{unit.lift}}</td> <td class="text-center">{{unit.lift == '1010'?'有':'无'}}</td>
<td class="text-center">{{unit.remark}}</td> <td class="text-center">{{unit.remark}}</td>
<td> <td>
<button class="btn btn-primary btn-xs" v-on:click="chooseUnit(unit)">选择</button> <button class="btn btn-primary btn-xs"
v-on:click="chooseUnit(unit)">选择</button>
</td> </td>
</tr> </tr>
</tbody> </tbody>

2
public/components/property/deletePayFeeConfigDiscount/deletePayFeeConfigDiscount.js
View File

@ -21,7 +21,7 @@
deletePayFeeConfigDiscount: function () { deletePayFeeConfigDiscount: function () {
vc.component.deletePayFeeConfigDiscountInfo.communityId = vc.getCurrentCommunity().communityId; vc.component.deletePayFeeConfigDiscountInfo.communityId = vc.getCurrentCommunity().communityId;
vc.http.apiPost( vc.http.apiPost(
'payFeeConfigDiscount.deletePayFeeConfigDiscount', '/payFeeConfigDiscount/deletePayFeeConfigDiscount',
JSON.stringify(vc.component.deletePayFeeConfigDiscountInfo), JSON.stringify(vc.component.deletePayFeeConfigDiscountInfo),
{ {
emulateJSON: true emulateJSON: true

2
public/components/property/viewUnitInfo/viewUnitInfo.html
View File

@ -42,7 +42,7 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label class="col-form-label">电梯：</label> <label class="col-form-label">电梯：</label>
<label class="">{{viewUnitInfo.lift}}</label> <label class="">{{viewUnitInfo.lift == '1010'?'有':'无'}}</label>
</div> </div>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">

10
public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
View File

@ -23,6 +23,7 @@
<th class="text-center">费用折扣ID</th> <th class="text-center">费用折扣ID</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>
@ -31,8 +32,13 @@
<tr v-for="payFeeConfigDiscount in payFeeConfigDiscountManageInfo.payFeeConfigDiscounts"> <tr v-for="payFeeConfigDiscount in payFeeConfigDiscountManageInfo.payFeeConfigDiscounts">
<td class="text-center">{{payFeeConfigDiscount.configDiscountId}}</td> <td class="text-center">{{payFeeConfigDiscount.configDiscountId}}</td>
<td class="text-center">{{payFeeConfigDiscountManageInfo.feeName}}</td> <td class="text-center">{{payFeeConfigDiscountManageInfo.feeName}}</td>
<td class="text-center">{{payFeeConfigDiscount.discountId}}</td> <td class="text-center">{{payFeeConfigDiscount.discountName}}</td>
<td class="text-center">{{payFeeConfigDiscount.discountType}}</td> <td class="text-center">
<div v-for="(item,index) in payFeeConfigDiscount.feeDiscountSpecs">
{{item.specName}}：{{item.specValue}}
</div>
</td>
<td class="text-center">{{payFeeConfigDiscount.discountType == '1001'?'优惠':'违约'}}</td>
<td class="text-center"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">
<button class="btn-white btn btn-xs" <button class="btn-white btn btn-xs"

17
public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.js
View File

@ -36,14 +36,17 @@
methods: { methods: {
_listPayFeeConfigDiscounts: function (_page, _rows) { _listPayFeeConfigDiscounts: function (_page, _rows) {
vc.component.payFeeConfigDiscountManageInfo.conditions.page = _page; let param = {
vc.component.payFeeConfigDiscountManageInfo.conditions.row = _rows; params: {
var param = { page:_page,
params: vc.component.payFeeConfigDiscountManageInfo.conditions row:_rows,
configId:$that.payFeeConfigDiscountManageInfo.configId,
communityId:vc.getCurrentCommunity().communityId
}
}; };
//发送get请求 //发送get请求
vc.http.apiGet('payFeeConfigDiscount.listPayFeeConfigDiscounts', vc.http.apiGet('/payFeeConfigDiscount/queryPayFeeConfigDiscount',
param, param,
function (json, res) { function (json, res) {
var _payFeeConfigDiscountManageInfo = JSON.parse(json); var _payFeeConfigDiscountManageInfo = JSON.parse(json);
@ -60,7 +63,9 @@
); );
}, },
_openAddPayFeeConfigDiscountModal: function () { _openAddPayFeeConfigDiscountModal: function () {
vc.emit('addPayFeeConfigDiscount', 'openAddPayFeeConfigDiscountModal', {}); vc.emit('addPayFeeConfigDiscount', 'openAddPayFeeConfigDiscountModal', {
configId: $that.payFeeConfigDiscountManageInfo.configId
});
}, },
_openDeletePayFeeConfigDiscountModel: function (_payFeeConfigDiscount) { _openDeletePayFeeConfigDiscountModel: function (_payFeeConfigDiscount) {
vc.emit('deletePayFeeConfigDiscount', 'openDeletePayFeeConfigDiscountModal', _payFeeConfigDiscount); vc.emit('deletePayFeeConfigDiscount', 'openDeletePayFeeConfigDiscountModal', _payFeeConfigDiscount);

4
public/pages/property/reportPrePaymentFee/reportPrePaymentFee.js
View File

@ -30,8 +30,8 @@
var param = { var param = {
params: { params: {
page: 1, page: _page,
row: 10, row: _rows,
communityId: vc.getCurrentCommunity().communityId communityId: vc.getCurrentCommunity().communityId
} }
}; };