wuxw
2019-10-31 5553586c5c9d54492f44f0349026f90278e8f2fd
区分停车费
3个文件已修改
19 ■■■■ 已修改文件
ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
@@ -5,6 +5,7 @@
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.report.smo.fee.IListPayFeeSMO;
import com.java110.utils.constant.FeeTypeConstant;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
@@ -50,10 +51,18 @@
        int page = paramIn.getInteger("page");
        int row = paramIn.getInteger("row");
        paramIn.put("storeId", result.getStoreId());
        paramIn.put("page",(page-1)*row);
        paramIn.put("row",page*row);
        paramIn.put("page", (page - 1) * row);
        paramIn.put("row", page * row);
        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPayFee" + mapToUrlParam(paramIn);
        String apiUrl = "";
        if (!paramIn.containsKey("feeTypeCd") || FeeTypeConstant.FEE_TYPE_PROPERTY.equals(paramIn.getString("feeTypeCd"))) {
            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", "");
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
        }else{
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
        }
        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html
@@ -14,7 +14,7 @@
                    <div class="row">
                        <div class="col-sm-4">
                            <select class="custom-select" v-model="payFeeManageInfo.conditions.feeTypeCd">
                                <option selected value="">请选择费用类型</option>
                                <option value="888800010006">停车费</option>
                                <option v-for="(item,index) in payFeeManageInfo.payFeeTypes" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
                            </select>
                        </div>
ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js
@@ -15,7 +15,7 @@
                name: '',
                conditions: {
                    communityId: vc.getCurrentCommunity().communityId,
                    feeTypeCd: '',
                    feeTypeCd: '888800010001',
                    startTime: '',
                    endTime: '',
                    userCode:''