Merge branch 'master' of https://github.com/java110/MicroCommunity

shiyj

2019-07-07 348c483d9e8cf81c485289a44c717fe1c23f4065

 WebService/src/main/resources/components/property-fee/propertyFee.js

@@ -24,6 +24,11 @@
                  vc.component.listFeeDetail(DEFAULT_PAGE,DEFAULT_ROW);
            });

            vc.on('propertyFee','listParkingSpaceData',function(_param){
                  vc.component.feeDetailInfo.feeId = _param.feeId;
                  vc.component.listFeeDetail(DEFAULT_PAGE,DEFAULT_ROW);
            });

            vc.on('pagination','page_event',function(_currentPage){
                vc.component.listRoom(_currentPage,DEFAULT_ROW);
            });
@@ -35,12 +40,12 @@
                $('.start_time').datetimepicker()
                          .on('changeDate', function (ev) {
                            var value = $(".start_time").val();
                            vc.component.feeDetailInfo.startTime = (value + " 00:00:00");
                            vc.component.feeDetailInfo.startTime = value ;
                          });
                $('.end_time').datetimepicker()
                              .on('changeDate', function (ev) {
                                var value = $(".end_time").val();
                                vc.component.feeDetailInfo.endTime = (value + " 00:00:00");
                                vc.component.feeDetailInfo.endTime = value ;
                              });
            },
            listFeeDetail:function(_page,_row){