Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-03 b949123acd810812781c1dc15843a44fb974073f

Merge remote-tracking branch 'origin/master'

 ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java

@@ -55,10 +55,9 @@
        paramIn.put("row", page * row);

        String apiUrl = "";
        if (!paramIn.containsKey("feeTypeCd") || FeeTypeConstant.FEE_TYPE_PROPERTY.equals(paramIn.getString("feeTypeCd"))) {
        if (!paramIn.containsKey("payObjType") || "3333".equals(paramIn.getString("payObjType"))) {
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn);
        } else if (FeeTypeConstant.FEE_TYPE_HIRE_PARKING_SPACE.equals(paramIn.getString("feeTypeCd"))) {
            paramIn.put("feeTypeCd", "");
        } else if ("6666".equals(paramIn.getString("payObjType"))) {
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
        }else{
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);

 ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html

@@ -13,9 +13,8 @@
                <div class="ibox-content">
                    <div class="row">
                        <div class="col-sm-4">
                            <select class="custom-select" v-model="payFeeManageInfo.conditions.feeTypeCd">
                                <option value="888800010006">停车费</option>
                                <option v-for="(item,index) in payFeeManageInfo.payFeeTypes" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
                            <select class="custom-select" v-model="payFeeManageInfo.conditions.payObjType">
                                <option v-for="(item,index) in payFeeManageInfo.payObjTypes" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
                            </select>
                        </div>
                        <div class="col-sm-4">
@@ -63,6 +62,7 @@
                        <thead>
                        <tr>
                            <th class="text-center">费用类型</th>
                            <th class="text-center">费用项目</th>
                            <th class="text-center">付费方</th>
                            <th class="text-center">缴费ID</th>
                            <th class="text-center">付费周期</th>
@@ -75,6 +75,7 @@
                        <tbody>
                        <tr v-for="payFee in payFeeManageInfo.payFees">
                            <td class="text-center">{{payFee.feeTypeCdName}}</td>
                            <td class="text-center">{{payFee.feeName}}</td>
                            <td class="text-center">{{payFee.payObjName}}</td>
                            <td class="text-center">{{payFee.detailId}}</td>
                            <td class="text-center">{{payFee.cycles}}个月</td>

 ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js

@@ -8,14 +8,14 @@
        data: {
            payFeeManageInfo: {
                payFees: [],
                payFeeTypes:[],
                payObjTypes:[],
                total: 0,
                records: 1,
                moreCondition: false,
                name: '',
                conditions: {
                    communityId: vc.getCurrentCommunity().communityId,
                    feeTypeCd: '888800010001',
                    payObjType: '3333',
                    startTime: '',
                    endTime: '',
                    userCode:''
@@ -25,7 +25,10 @@
        _initMethod: function () {
            vc.component._initDate();
            vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
            vc.component._listFeeType();
            //vc.component._listFeeType();
            vc.getDict('pay_fee',"payer_obj_type",function(_data){
                vc.component.payFeeManageInfo.payObjTypes = _data;
            });
        },
        _initEvent: function () {
            vc.on('pagination', 'page_event', function (_currentPage) {