mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-06-12 18:11:00 +08:00
Merge remote-tracking branch 'origin/master' into xinghong-dev
This commit is contained in:
xiaogang
commit
ec4a7333cc
@ -0,0 +1,72 @@
|
||||
<div>
|
||||
<div class="row margin-top-lg">
|
||||
<div class="col-lg-2 padding-right-xs padding-left-xl">
|
||||
<select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.objType"
|
||||
@change="_changeSimplifyFeeReceiptFeeTypeCd(simplifyFeeReceiptInfo.objType)">
|
||||
<option disabled value="">请选择收费类型</option>
|
||||
<option selected value="3333">房屋费</option>
|
||||
<option value="6666">车位费</option>
|
||||
</select>
|
||||
|
||||
</div>
|
||||
<div class="col-lg-2 padding-right-xs padding-left-xl">
|
||||
<select class="custom-select" v-model="simplifyCarFeeInfo.carId" @change="changeSimplifyFeeReceiptCar()"
|
||||
v-if="simplifyFeeReceiptInfo.objType == '6666'">
|
||||
<option disabled value="">请选择车辆</option>
|
||||
<option v-for="(item,index) in simplifyFeeReceiptInfo.ownerCars" :value="item.carId">{{item.carNum}}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-lg-8 text-right padding-right-lg">
|
||||
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
|
||||
v-on:click="_printFeeReceipt()">
|
||||
打印
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="margin-top">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny margin-top" data-page-size="15">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">
|
||||
<input type="checkbox" class="i-checks" v-bind:checked="simplifyFeeReceiptInfo.quan == true"
|
||||
@click="checkAllReceipt($event)">
|
||||
</th>
|
||||
<th class="text-center">费用类型</th>
|
||||
<th class="text-center">{{simplifyFeeReceiptInfo.objType == '3333'?'房屋':'车位'}}</th>
|
||||
<th class="text-center">总金额</th>
|
||||
<th class="text-center">缴费时间</th>
|
||||
<th class="text-center">收据ID</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="feeReceipt in simplifyFeeReceiptInfo.feeReceipts">
|
||||
<td class="text-center">
|
||||
<input type="checkbox" class="i-checks checReceiptItem" v-bind:value="feeReceipt.receiptId"
|
||||
v-model="simplifyFeeReceiptInfo.selectReceipts">
|
||||
</td>
|
||||
<td class="text-center">{{feeReceipt.objType == '3333'? '房屋费':'车位费'}}</td>
|
||||
<td class="text-center">{{feeReceipt.objName}}</td>
|
||||
<td class="text-center">{{feeReceipt.amount}}</td>
|
||||
<td class="text-center">{{feeReceipt.createTime}}</td>
|
||||
<td class="text-center">{{feeReceipt.receiptId}}</td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="7">
|
||||
<ul class="pagination float-right"></ul>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<div class="row">
|
||||
<div class="col-sm-12 float-right">
|
||||
<vc:create namespace="simplifyFeeReceipt" path="frame/paginationPlus"></vc:create>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
@ -0,0 +1,186 @@
|
||||
/**
|
||||
入驻小区
|
||||
**/
|
||||
(function (vc) {
|
||||
var DEFAULT_PAGE = 1;
|
||||
var DEFAULT_ROWS = 10;
|
||||
vc.extends({
|
||||
data: {
|
||||
simplifyFeeReceiptInfo: {
|
||||
feeReceipts: [],
|
||||
objType: '3333',
|
||||
objId: '',
|
||||
roomId: '',
|
||||
carId: '',
|
||||
total: '',
|
||||
records: '',
|
||||
ownerId: '',
|
||||
ownerCars: [],
|
||||
selectReceipts: [],
|
||||
quan: false
|
||||
}
|
||||
},
|
||||
watch: { // 监视双向绑定的数据数组
|
||||
simplifyFeeReceiptInfo: {
|
||||
handler() { // 数据数组有变化将触发此函数
|
||||
if ($that.simplifyFeeReceiptInfo.selectReceipts.length == $that.simplifyFeeReceiptInfo.feeReceipts.length) {
|
||||
$that.simplifyFeeReceiptInfo.quan = true;
|
||||
} else {
|
||||
$that.simplifyFeeReceiptInfo.quan = false;
|
||||
}
|
||||
},
|
||||
deep: true // 深度监视
|
||||
}
|
||||
},
|
||||
_initMethod: function () {
|
||||
|
||||
},
|
||||
_initEvent: function () {
|
||||
//切换 至费用页面
|
||||
vc.on('simplifyFeeReceipt', 'switch', function (_param) {
|
||||
if (_param.roomId == '') {
|
||||
return;
|
||||
}
|
||||
$that.clearSimplifyFeeReceiptInfo();
|
||||
vc.copyObject(_param, $that.simplifyFeeReceiptInfo);
|
||||
$that.simplifyFeeReceiptInfo.objId = _param.roomId;
|
||||
$that._listSimplifyFeeReceipt(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
});
|
||||
|
||||
vc.on('simplifyFeeReceipt', 'notify', function () {
|
||||
$that._listSimplifyFeeReceipt(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
});
|
||||
|
||||
|
||||
vc.on('simplifyFeeReceipt', 'paginationPlus', 'page_event',
|
||||
function (_currentPage) {
|
||||
|
||||
vc.component._listSimplifyFeeReceipt(_currentPage, DEFAULT_ROWS);
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
_listSimplifyFeeReceipt: function (_page, _rows) {
|
||||
$that.simplifyFeeReceiptInfo.selectReceipts = [];
|
||||
$that.simplifyFeeReceiptInfo.quan = false;
|
||||
let _objId = $that.simplifyFeeReceiptInfo.objType == '3333'
|
||||
? $that.simplifyFeeReceiptInfo.roomId
|
||||
: $that.simplifyFeeReceiptInfo.carId;
|
||||
var param = {
|
||||
params: {
|
||||
page: _page,
|
||||
row: _rows,
|
||||
objType: $that.simplifyFeeReceiptInfo.objType,
|
||||
objId: _objId,
|
||||
communityId: vc.getCurrentCommunity().communityId
|
||||
}
|
||||
};
|
||||
//发送get请求
|
||||
vc.http.apiGet('/feeReceipt/queryFeeReceipt',
|
||||
param,
|
||||
function (json, res) {
|
||||
var _feeReceiptManageInfo = JSON.parse(json);
|
||||
vc.component.simplifyFeeReceiptInfo.total = _feeReceiptManageInfo.total;
|
||||
vc.component.simplifyFeeReceiptInfo.records = _feeReceiptManageInfo.records;
|
||||
vc.component.simplifyFeeReceiptInfo.feeReceipts = _feeReceiptManageInfo.data;
|
||||
vc.emit('simplifyFeeReceipt', 'paginationPlus', 'init', {
|
||||
total: vc.component.simplifyFeeReceiptInfo.records,
|
||||
currentPage: _page
|
||||
});
|
||||
}, function (errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
}
|
||||
);
|
||||
},
|
||||
_queryFeeReceiptMethod: function () {
|
||||
vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
},
|
||||
_printFeeReceipt: function (_receipt) {
|
||||
if ($that.simplifyFeeReceiptInfo.selectReceipts.length < 1) {
|
||||
vc.toast('请选择打印收据');
|
||||
return;
|
||||
}
|
||||
let receiptids = '';
|
||||
$that.simplifyFeeReceiptInfo.selectReceipts.forEach(item => {
|
||||
receiptids += (item + ',');
|
||||
})
|
||||
if (receiptids.endsWith(',')) {
|
||||
receiptids = receiptids.substring(0, receiptids.length - 1);
|
||||
}
|
||||
window.open("/print.html#/pages/property/printPayFee?receiptIds=" + receiptids);
|
||||
},
|
||||
clearSimplifyFeeReceiptInfo: function () {
|
||||
$that.simplifyFeeReceiptInfo = {
|
||||
feeReceipts: [],
|
||||
objType: '3333',
|
||||
objId: '',
|
||||
roomId: '',
|
||||
carId: '',
|
||||
total: '',
|
||||
records: '',
|
||||
ownerId: '',
|
||||
ownerCars: [],
|
||||
selectReceipts: [],
|
||||
quan: false
|
||||
}
|
||||
},
|
||||
_changeSimplifyFeeReceiptFeeTypeCd: function (_feeTypeCd) {
|
||||
|
||||
if ($that.simplifyFeeReceiptInfo.objType == '3333') {
|
||||
vc.emit('simplifyFeeReceipt', 'notify', {});
|
||||
return;
|
||||
}
|
||||
$that._listSimplifyFeeReceiptOwnerCar()
|
||||
.then((data) => {
|
||||
vc.emit('simplifyFeeReceipt', 'notify', {});
|
||||
}, (err) => {
|
||||
//vc.toast(err);
|
||||
})
|
||||
},
|
||||
changeSimplifyFeeReceiptCar: function () {
|
||||
$that._changeSimplifyFeeReceiptFeeTypeCd();
|
||||
},
|
||||
_listSimplifyFeeReceiptOwnerCar: function () {
|
||||
return new Promise((resolve, reject) => {
|
||||
let param = {
|
||||
params: {
|
||||
page: 1,
|
||||
row: 50,
|
||||
ownerId: $that.simplifyFeeReceiptInfo.ownerId,
|
||||
communityId: vc.getCurrentCommunity().communityId
|
||||
}
|
||||
}
|
||||
//发送get请求
|
||||
vc.http.apiGet('owner.queryOwnerCars',
|
||||
param,
|
||||
function (json, res) {
|
||||
let _json = JSON.parse(json);
|
||||
$that.simplifyFeeReceiptInfo.ownerCars = _json.data;
|
||||
if (_json.data.length > 0) {
|
||||
$that.simplifyFeeReceiptInfo.carId = _json.data[0].carId;
|
||||
resolve(_json.data);
|
||||
return;
|
||||
}
|
||||
reject("没有车位");
|
||||
}, function (errInfo, error) {
|
||||
reject(errInfo);
|
||||
}
|
||||
);
|
||||
|
||||
})
|
||||
|
||||
},
|
||||
checkAllReceipt: function (e) {
|
||||
let checkObj = document.querySelectorAll('.checReceiptItem'); // 获取所有checkbox项
|
||||
if (e.target.checked) { // 判定全选checkbox的勾选状态
|
||||
for (var i = 0; i < checkObj.length; i++) {
|
||||
if (!checkObj[i].checked) { // 将未勾选的checkbox选项push到绑定数组中
|
||||
vc.component.simplifyFeeReceiptInfo.selectReceipts.push(checkObj[i].value);
|
||||
}
|
||||
}
|
||||
} else { // 如果是去掉全选则清空checkbox选项绑定数组
|
||||
vc.component.simplifyFeeReceiptInfo.selectReceipts = [];
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
})(window.vc);
|
||||
@ -33,7 +33,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="row">
|
||||
<div class="col-sm-7 float-right">
|
||||
<div class="col-sm-12 float-right">
|
||||
<vc:create namespace="simplifyOwnerRepair" path="frame/paginationPlus"></vc:create>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -15,9 +15,6 @@
|
||||
<script src="/js/popper.min.js"></script>
|
||||
<script src="/js/bootstrap/bootstrap.min.js"></script>
|
||||
<script src="/js/bootstrap/bootstrap-datetimepicker.js"></script>
|
||||
|
||||
|
||||
|
||||
<script src="/js/toastr.min.js"></script>
|
||||
|
||||
</head>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-3">
|
||||
<select class="custom-select" v-model="feeReceiptManageInfo.conditions.objType">
|
||||
<option selected value="">请选择预存类型</option>
|
||||
<option selected value="">请选择收费类型</option>
|
||||
<option value="3333">房屋费</option>
|
||||
<option value="6666">车位费</option>
|
||||
</select>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<div>
|
||||
<div class=" text-center">
|
||||
<div style="color:#000;font-size:36px">{{printPayFeeInfo.communityName}} 收据单</div>
|
||||
<span style="color:#000;font-size:20px">单号：{{printPayFeeInfo.receiptId}}</span>
|
||||
<span style="color:#000;font-size:20px">单号：{{printPayFeeInfo.receiptNum}}</span>
|
||||
</div>
|
||||
<div class="row " style="color:#000;font-size:20px">
|
||||
<div class="col-sm-4">
|
||||
@ -15,7 +15,7 @@
|
||||
</div>
|
||||
<table class="table vc-table-border" style="color:#000;font-size:20px">
|
||||
<thead>
|
||||
<tr >
|
||||
<tr>
|
||||
<th scope="col" class="text-center" width="80px">编号</th>
|
||||
<th scope="col" class="text-center">收费项目</th>
|
||||
<th scope="col" class="text-center">收费范围</th>
|
||||
@ -40,7 +40,7 @@
|
||||
<td class="text-center">{{item.amount}}</td>
|
||||
<td class="text-center" width="200px">{{item.remark}}</td>
|
||||
</tr>
|
||||
<tr >
|
||||
<tr>
|
||||
<td colspan="2" class="text-center ">大写人民币（元）</td>
|
||||
<td colspan="4" class="text-center ">{{vc.changeNumMoneyToChinese(printPayFeeInfo.amount)}}
|
||||
</td>
|
||||
@ -50,7 +50,7 @@
|
||||
<td colspan="5">
|
||||
<p style="max-width: 600px;">
|
||||
<!-- {{printPayFeeInfo.content}} -->
|
||||
<div v-html="printPayFeeInfo.content"></div>
|
||||
<div v-html="printPayFeeInfo.content"></div>
|
||||
</p>
|
||||
</td>
|
||||
<td colspan="4">
|
||||
@ -65,7 +65,8 @@
|
||||
<button class="btn btn-primary float-right" type="button" v-on:click="_printPurchaseApplyDiv()">
|
||||
<i class="fa fa-check"></i> 打印
|
||||
</button>
|
||||
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;" v-on:click="_closePage()">取消
|
||||
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
|
||||
v-on:click="_closePage()">取消
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -4,14 +4,15 @@
|
||||
data: {
|
||||
printPayFeeInfo: {
|
||||
communityName: '',
|
||||
receiptId:'',
|
||||
receiptId: '',
|
||||
receiptIds: '',
|
||||
roomName: '',
|
||||
amount: 0.00,
|
||||
fees: [],
|
||||
feeTime: '',
|
||||
wechatName:'',
|
||||
content:'',
|
||||
qrImg:''
|
||||
wechatName: '',
|
||||
content: '',
|
||||
qrImg: ''
|
||||
},
|
||||
printFlag: '0'
|
||||
},
|
||||
@ -19,6 +20,7 @@
|
||||
//vc.component._initPrintPurchaseApplyDateInfo();
|
||||
|
||||
$that.printPayFeeInfo.receiptId = vc.getParam('receiptId');
|
||||
$that.printPayFeeInfo.receiptIds = vc.getParam('receiptIds');
|
||||
//$that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date());
|
||||
|
||||
$that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name;
|
||||
@ -35,14 +37,15 @@
|
||||
_initPayFee: function () {
|
||||
|
||||
},
|
||||
_loadReceipt:function(){
|
||||
_loadReceipt: function () {
|
||||
|
||||
var param = {
|
||||
params: {
|
||||
page:1,
|
||||
row:1,
|
||||
receiptId:$that.printPayFeeInfo.receiptId,
|
||||
communityId:vc.getCurrentCommunity().communityId
|
||||
page: 1,
|
||||
row: 30,
|
||||
receiptId: $that.printPayFeeInfo.receiptId,
|
||||
receiptIds: $that.printPayFeeInfo.receiptIds,
|
||||
communityId: vc.getCurrentCommunity().communityId
|
||||
}
|
||||
};
|
||||
|
||||
@ -51,26 +54,33 @@
|
||||
param,
|
||||
function (json, res) {
|
||||
var _feeReceiptManageInfo = JSON.parse(json);
|
||||
let _feeReceipt = _feeReceiptManageInfo.data[0];
|
||||
let _feeReceipt = _feeReceiptManageInfo.data;
|
||||
let _amount = 0;
|
||||
_feeReceipt.forEach(item => {
|
||||
_amount += parseFloat(item.amount)
|
||||
});
|
||||
|
||||
$that.printPayFeeInfo.amount = _amount;
|
||||
$that.printPayFeeInfo.roomName = _feeReceipt[0].objName;
|
||||
$that.printPayFeeInfo.feeTime = _feeReceipt[0].createTime;
|
||||
$that.printPayFeeInfo.receiptNum = _feeReceipt[0].receiptId;
|
||||
|
||||
$that.printPayFeeInfo.amount = _feeReceipt.amount;
|
||||
$that.printPayFeeInfo.roomName = _feeReceipt.objName;
|
||||
$that.printPayFeeInfo.feeTime = _feeReceipt.createTime;
|
||||
$that._loadReceiptDetail();
|
||||
|
||||
|
||||
}, function (errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
}
|
||||
);
|
||||
},
|
||||
_loadReceiptDetail:function(){
|
||||
_loadReceiptDetail: function () {
|
||||
|
||||
var param = {
|
||||
params: {
|
||||
page:1,
|
||||
row:100,
|
||||
receiptId:$that.printPayFeeInfo.receiptId,
|
||||
communityId:vc.getCurrentCommunity().communityId
|
||||
page: 1,
|
||||
row: 100,
|
||||
receiptId: $that.printPayFeeInfo.receiptId,
|
||||
receiptIds: $that.printPayFeeInfo.receiptIds,
|
||||
communityId: vc.getCurrentCommunity().communityId
|
||||
}
|
||||
};
|
||||
|
||||
@ -79,7 +89,7 @@
|
||||
param,
|
||||
function (json, res) {
|
||||
var _feeReceiptManageInfo = JSON.parse(json);
|
||||
let _feeReceiptDetails = _feeReceiptManageInfo.data;
|
||||
let _feeReceiptDetails = _feeReceiptManageInfo.data;
|
||||
$that.printPayFeeInfo.fees = _feeReceiptDetails;
|
||||
}, function (errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
|
||||
@ -160,6 +160,10 @@
|
||||
<a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 'simplifyOwnerTransactionCar'}"
|
||||
v-on:click="changeTab('simplifyOwnerTransactionCar')">道闸同步</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 'simplifyFeeReceipt'}"
|
||||
v-on:click="changeTab('simplifyFeeReceipt')">补打收据</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -187,6 +191,10 @@
|
||||
<div v-if="simplifyAcceptanceInfo._currentTab == 'simplifyOwnerTransactionCar'">
|
||||
<vc:create path="property/simplifyOwnerTransactionCar"></vc:create>
|
||||
</div>
|
||||
<div v-if="simplifyAcceptanceInfo._currentTab == 'simplifyFeeReceipt'">
|
||||
<vc:create path="property/simplifyFeeReceipt"></vc:create>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user