diff --git a/public/components/property/chooseFeeCombo/chooseFeeCombo.html b/public/components/property/chooseFeeCombo/chooseFeeCombo.html
index 655073094..dd1a42b2d 100644
--- a/public/components/property/chooseFeeCombo/chooseFeeCombo.html
+++ b/public/components/property/chooseFeeCombo/chooseFeeCombo.html
@@ -1,8 +1,11 @@
-
+
@@ -29,21 +37,33 @@
- |
- |
- |
-
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
- | {{feeCombo.comboId}} |
- {{feeCombo.comboName}} |
-
+ {{feeCombo.comboName}} |
+ {{feeCombo.createTime}} |
+ {{feeCombo.remark}} |
-
+
|
@@ -56,4 +76,4 @@
-
+
\ No newline at end of file
diff --git a/public/components/property/chooseFeeCombo/chooseFeeCombo.js b/public/components/property/chooseFeeCombo/chooseFeeCombo.js
index 5da9d6938..2d544268c 100644
--- a/public/components/property/chooseFeeCombo/chooseFeeCombo.js
+++ b/public/components/property/chooseFeeCombo/chooseFeeCombo.js
@@ -31,11 +31,11 @@
};
//发送get请求
- vc.http.apiGet('feeCombo.listFeeCombos',
+ vc.http.apiGet('/feeCombo.listFeeCombo',
param,
function(json){
var _feeComboInfo = JSON.parse(json);
- vc.component.chooseFeeComboInfo.feeCombos = _feeComboInfo.feeCombos;
+ vc.component.chooseFeeComboInfo.feeCombos = _feeComboInfo.data;
},function(){
console.log('请求失败处理');
}
diff --git a/public/pages/property/createFeeByCombo/createFeeByCombo.html b/public/pages/property/createFeeByCombo/createFeeByCombo.html
new file mode 100644
index 000000000..6f4b670f3
--- /dev/null
+++ b/public/pages/property/createFeeByCombo/createFeeByCombo.html
@@ -0,0 +1,72 @@
+
+
+
+
+
+
{{createFeeByComboInfo.payerObjName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/pages/property/createFeeByCombo/createFeeByCombo.js b/public/pages/property/createFeeByCombo/createFeeByCombo.js
new file mode 100644
index 000000000..3db64fc41
--- /dev/null
+++ b/public/pages/property/createFeeByCombo/createFeeByCombo.js
@@ -0,0 +1,139 @@
+(function(vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ createFeeByComboInfo: {
+ feeConfigs: [],
+ selectConfigIds: [],
+ communityId: vc.getCurrentCommunity().communityId,
+ payerObjId: '',
+ payerObjName: '',
+ payerObjType: '',
+ }
+ },
+ _initMethod: function() {
+ let _payerObjId = vc.getParam('payerObjId');
+ let _payerObjType = vc.getParam('payerObjType');
+ let _payerObjName = vc.getParam('payerObjName');
+ $that.createFeeByComboInfo.payerObjId = _payerObjId;
+ $that.createFeeByComboInfo.payerObjType = _payerObjType;
+ $that.createFeeByComboInfo.payerObjName = _payerObjName;
+ },
+ _initEvent: function() {
+ vc.on('createFeeByCombo','chooseFeeCombo',function(_feeCombo){
+ $that._listFeeComboMembers(_feeCombo);
+ })
+ },
+ methods: {
+ _chooseFeeCombo:function(){
+ vc.emit('chooseFeeCombo','openChooseFeeComboModel',{});
+ },
+
+ _listFeeComboMembers: function (_feeCombo) {
+ let param = {
+ params: {
+ page:1,
+ row:100,
+ comboId:_feeCombo.comboId
+ }
+ };
+ //发送get请求
+ vc.http.apiGet('/feeComboMember.listFeeComboMember',
+ param,
+ function (json, res) {
+ let _feeComboMemberManageInfo = JSON.parse(json);
+ _feeComboMemberManageInfo.data.forEach(config =>{
+ config.startTime='';
+ config.endTime=''
+ })
+ vc.component.createFeeByComboInfo.feeConfigs = _feeComboMemberManageInfo.data;
+ $that.$forceUpdate();
+ setTimeout(()=>{
+ _feeComboMemberManageInfo.data.forEach(config =>{
+ vc.initDate('startTime'+config.configId,function(_value){
+ config.startTime = _value;
+ })
+
+ vc.initDate('endTime'+config.configId,function(_value){
+ config.endTime = _value;
+ })
+ })
+ },1000)
+
+
+ }, function (errInfo, error) {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _doPayFee: function() {
+ let _fees = [];
+ let _printFees = [];
+ if ($that.createFeeByComboInfo.primeRate == '') {
+ vc.toast('请选择支付方式');
+ return;
+ }
+ $that.createFeeByComboInfo.selectConfigIds.forEach(function(_item) {
+ $that.createFeeByComboInfo.batchFees.forEach(function(_batchFeeItem) {
+ if (_item == _batchFeeItem.feeId) {
+ _batchFeeItem.primeRate = $that.createFeeByComboInfo.primeRate;
+ _fees.push(_batchFeeItem);
+ _printFees.push({
+ feeId: _item,
+ squarePrice: _batchFeeItem.squarePrice,
+ additionalAmount: _batchFeeItem.additionalAmount,
+ feeName: _batchFeeItem.feeName,
+ amount: _batchFeeItem.feePrice,
+ roomName: $that.createFeeByComboInfo.roomName,
+ primeRate: $that.createFeeByComboInfo.primeRate
+ });
+ }
+ })
+ })
+ if (_fees.length < 1) {
+ vc.toast('未选中要缴费的项目');
+ return;
+ }
+ let _data = {
+ communityId: vc.getCurrentCommunity().communityId,
+ fees: _fees
+ }
+ vc.http.apiPost(
+ '/fee.payBatchFee',
+ JSON.stringify(_data), {
+ emulateJSON: true
+ },
+ function(json, res) {
+ //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+ let _json = JSON.parse(json);
+ vc.toast(_json.msg);
+ if (_json.code == 0) {
+ vc.goBack();
+ return;
+ }
+ },
+ function(errInfo, error) {
+ console.log('请求失败处理');
+ vc.toast(errInfo);
+ });
+ },
+ _back: function() {
+ $('#payFeeResult').modal("hide");
+ vc.getBack();
+ },
+ checkAll: function(e) {
+ var checkObj = document.querySelectorAll('.checkItem'); // 获取所有checkbox项
+ if (e.target.checked) { // 判定全选checkbox的勾选状态
+ for (var i = 0; i < checkObj.length; i++) {
+ if (!checkObj[i].checked) { // 将未勾选的checkbox选项push到绑定数组中
+ vc.component.createFeeByComboInfo.selectConfigIds.push(checkObj[i].value);
+ }
+ }
+ } else { // 如果是去掉全选则清空checkbox选项绑定数组
+ vc.component.createFeeByComboInfo.selectConfigIds = [];
+ }
+ }
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index a2a9adf1b..fc6d4f7b8 100755
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -13,6 +13,9 @@
+
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index 42c31b92a..d97eabab9 100755
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -118,6 +118,12 @@
room: $that.listRoomCreateFeeInfo
});
},
+ _openRoomCreateFeeComboModal:function(){
+ vc.jumpToPage('/#/pages/property/createFeeByCombo?payerObjId='
+ +$that.listRoomCreateFeeInfo.roomId
+ +"&payerObjName="+$that.listRoomCreateFeeInfo.roomName
+ +"&payerObjType=3333")
+ },
_openAddMeterWaterModal: function() {
vc.emit('addMeterWater', 'openAddMeterWaterModal', {
roomId: $that.listRoomCreateFeeInfo.roomId,