合并报表前台

ReportComponent/src/main/java/com/java110/report/components/fee/FeeSummaryComponent.java

@@ -1,10 +1,8 @@
-package com.java110.report.components.fee;
+package com.java110.front.components.fee;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.report.smo.fee.IListFeeSummarySMO;
-import com.java110.report.smo.fee.IListPayFeeSMO;
-import com.java110.report.smo.feeType.IFeeTypeSMO;
+import com.java110.front.smo.fee.IListFeeSummarySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

ReportComponent/src/main/java/com/java110/report/components/fee/PayFeeManageComponent.java

@@ -1,9 +1,9 @@
-package com.java110.report.components.fee;
+package com.java110.front.components.fee;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.report.smo.fee.IListPayFeeSMO;
-import com.java110.report.smo.feeType.IFeeTypeSMO;
+import com.java110.front.smo.fee.IListPayFeeSMO;
+import com.java110.front.smo.feeType.IFeeTypeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -27,10 +27,11 @@ public class PayFeeManageComponent {
 
     /**
      * 查询费用类型
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> listFeeType(IPageData pd){
+    public ResponseEntity<String> listFeeType(IPageData pd) {
         return feeTypeSMOImpl.list(pd);
     }
 

ReportComponent/src/main/java/com/java110/report/components/fee/StaffFeeManageComponent.java

@@ -1,10 +1,8 @@
-package com.java110.report.components.fee;
+package com.java110.front.components.fee;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.report.smo.fee.IListPayFeeSMO;
-import com.java110.report.smo.fee.IListStaffFeeSMO;
-import com.java110.report.smo.feeType.IFeeTypeSMO;
+import com.java110.front.smo.fee.IListStaffFeeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

ReportComponent/src/main/java/com/java110/report/components/fee/TempCarInoutFeeManageComponent.java

@@ -1,10 +1,9 @@
-package com.java110.report.components.fee;
+package com.java110.front.components.fee;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.report.smo.fee.IListPayFeeSMO;
-import com.java110.report.smo.fee.IListTempCarInoutFeeSMO;
-import com.java110.report.smo.feeType.IFeeTypeSMO;
+import com.java110.front.smo.fee.IListTempCarInoutFeeSMO;
+import com.java110.front.smo.feeType.IFeeTypeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -28,10 +27,11 @@ public class TempCarInoutFeeManageComponent {
 
     /**
      * 查询费用类型
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> listFeeType(IPageData pd){
+    public ResponseEntity<String> listFeeType(IPageData pd) {
         return feeTypeSMOImpl.list(pd);
     }
 

ReportComponent/src/main/java/com/java110/report/smo/fee/IListFeeSummarySMO.java

@@ -1,4 +1,4 @@
-package com.java110.report.smo.fee;
+package com.java110.front.smo.fee;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

ReportComponent/src/main/java/com/java110/report/smo/fee/IListPayFeeSMO.java

@@ -1,4 +1,4 @@
-package com.java110.report.smo.fee;
+package com.java110.front.smo.fee;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

ReportComponent/src/main/java/com/java110/report/smo/fee/IListStaffFeeSMO.java

@@ -1,4 +1,4 @@
-package com.java110.report.smo.fee;
+package com.java110.front.smo.fee;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

ReportComponent/src/main/java/com/java110/report/smo/fee/IListTempCarInoutFeeSMO.java

@@ -1,4 +1,4 @@
-package com.java110.report.smo.fee;
+package com.java110.front.smo.fee;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

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

@@ -1,11 +1,10 @@
-package com.java110.report.smo.fee.impl;
+package com.java110.front.smo.fee.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
-import com.java110.report.smo.fee.IListFeeSummarySMO;
-import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.front.smo.fee.IListFeeSummarySMO;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.Assert;
@@ -47,12 +46,12 @@ public class ListFeeSummarySMOImpl extends AbstractComponentSMO implements IList
         paramIn.put("page", (page - 1) * row);
         paramIn.put("row", page * row);
 
-        if("1001".equals(paramIn.getString("feeSummaryType"))){//日
-            paramIn.put("formatStr","%Y-%m-%d");
-        }else if("1101".equals(paramIn.getString("feeSummaryType"))){
-            paramIn.put("formatStr","%Y-%m");
-        }else{
-            paramIn.put("formatStr","%Y");
+        if ("1001".equals(paramIn.getString("feeSummaryType"))) {//日
+            paramIn.put("formatStr", "%Y-%m-%d");
+        } else if ("1101".equals(paramIn.getString("feeSummaryType"))) {
+            paramIn.put("formatStr", "%Y-%m");
+        } else {
+            paramIn.put("formatStr", "%Y");
         }
 
         String apiUrl = "";

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

@@ -1,24 +1,20 @@
-package com.java110.report.smo.fee.impl;
+package com.java110.front.smo.fee.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
 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.front.smo.fee.IListPayFeeSMO;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Map;
-
 /**
  * 查询app服务类
  */
@@ -59,7 +55,7 @@ public class ListPayFeeSMOImpl extends AbstractComponentSMO implements IListPayF
             apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn);
         } else if ("6666".equals(paramIn.getString("payObjType"))) {
             apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
-        }else{
+        } else {
             apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
         }
 

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

@@ -1,11 +1,10 @@
-package com.java110.report.smo.fee.impl;
+package com.java110.front.smo.fee.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
-import com.java110.report.smo.fee.IListStaffFeeSMO;
-import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.front.smo.fee.IListStaffFeeSMO;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;

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

@@ -1,13 +1,10 @@
-package com.java110.report.smo.fee.impl;
+package com.java110.front.smo.fee.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
-import com.java110.report.smo.fee.IListPayFeeSMO;
-import com.java110.report.smo.fee.IListTempCarInoutFeeSMO;
-import com.java110.utils.constant.FeeTypeConstant;
-import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.front.smo.fee.IListTempCarInoutFeeSMO;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.Assert;

ReportComponent/src/main/java/com/java110/report/smo/feeType/IFeeTypeSMO.java

@@ -1,4 +1,4 @@
-package com.java110.report.smo.feeType;
+package com.java110.front.smo.feeType;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

ReportComponent/src/main/java/com/java110/report/smo/feeType/impl/FeeTypeSMOImpl.java

@@ -1,11 +1,10 @@
-package com.java110.report.smo.feeType.impl;
+package com.java110.front.smo.feeType.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.BaseComponentSMO;
 import com.java110.core.context.IPageData;
-import com.java110.report.smo.feeType.IFeeTypeSMO;
+import com.java110.front.smo.feeType.IFeeTypeSMO;
 import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,6 @@ public class FeeTypeSMOImpl extends BaseComponentSMO implements IFeeTypeSMO {
     private RestTemplate restTemplate;
 
 
-
     @Override
     public ResponseEntity<String> list(IPageData pd) {
         validate(pd);
@@ -39,8 +37,8 @@ public class FeeTypeSMOImpl extends BaseComponentSMO implements IFeeTypeSMO {
         reqParam.put("name", "pay_fee");
         reqParam.put("type", "fee_type_cd");
         //拉取数据
-        String url=ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam));
-        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",url , HttpMethod.GET);
+        String url = ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam));
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
         return responseEntity;
     }
 

ReportComponent/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>MicroCommunity</artifactId>
-    <groupId>com.java110</groupId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>ReportComponent</artifactId>
-  <packaging>jar</packaging>
-
-  <name>ReportComponent</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.java110</groupId>
-      <artifactId>java110-service</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>java110-db</artifactId>
-          <groupId>com.java110</groupId>
-        </exclusion>
-      </exclusions>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-
-</project>

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

@@ -1,103 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                v-on:click="_moreCondition()">{{payFeeManageInfo.moreCondition == true?'隐藏':'更多'}}
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <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">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control  start_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control  end_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryPayFeeMethod()">
-                                <i class="glyphicon glyphicon-search"></i>
-                            </button>
-                        </div>
-                    </div>
-                    <div class="row" v-if="payFeeManageInfo.moreCondition == true">
-                        <div class="col-sm-4">
-                            <input size="16" type="text" placeholder="请填写员工编码"  v-model="payFeeManageInfo.conditions.userCode" class="form-control">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>缴费清单</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            导出
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <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>
-                            <th class="text-center">应付金额</th>
-                            <td class="text-center">实付金额</td>
-                            <td class="text-center">操作员工</td>
-                            <td class="text-center">缴费时间</td>
-                        </tr>
-                        </thead>
-                        <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>
-                            <td class="text-center">{{payFee.receivableAmount}}</td>
-                            <td class="text-center">{{payFee.receivedAmount}}</td>
-                            <td class="text-center">{{payFee.userName}}</td>
-                            <td class="text-center">{{payFee.createTime}}</td>
-
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

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

@@ -1,129 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 30;
-    vc.extends({
-        data: {
-            payFeeManageInfo: {
-                payFees: [],
-                payObjTypes:[],
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-                conditions: {
-                    communityId: vc.getCurrentCommunity().communityId,
-                    payObjType: '3333',
-                    startTime: '',
-                    endTime: '',
-                    userCode:''
-                }
-            }
-        },
-        _initMethod: function () {
-            vc.component._initDate();
-            vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-            //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) {
-                vc.component._listpayFees(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _initDate:function(){
-                $(".start_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $(".end_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.start_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".start_time").val();
-                        vc.component.payFeeManageInfo.conditions.startTime = value ;
-                    });
-                $('.end_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".end_time").val();
-                        vc.component.payFeeManageInfo.conditions.endTime = value ;
-                    });
-            },
-            _listpayFees: function (_page, _rows) {
-
-                vc.component.payFeeManageInfo.conditions.page = _page;
-                vc.component.payFeeManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.payFeeManageInfo.conditions
-                };
-
-                //发送get请求
-                vc.http.get('payFeeManage',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _payFeeManageInfo = JSON.parse(json);
-                        vc.component.payFeeManageInfo.total = _payFeeManageInfo.total;
-                        vc.component.payFeeManageInfo.records = parseInt(_payFeeManageInfo.total/_rows +1);
-                        vc.component.payFeeManageInfo.payFees = _payFeeManageInfo.payFees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.payFeeManageInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _queryPayFeeMethod: function () {
-                vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition: function () {
-                if (vc.component.payFeeManageInfo.moreCondition) {
-                    vc.component.payFeeManageInfo.moreCondition = false;
-                } else {
-                    vc.component.payFeeManageInfo.moreCondition = true;
-                }
-            },
-            _exportExcel:function () {
-
-            },
-            _listFeeType: function () {
-                var param = {
-                    params:{
-                        "hc":"cc@cc"
-                    }
-                };
-
-                //发送get请求
-                vc.http.get('payFeeManage',
-                    'listFeeType',
-                    param,
-                    function (json, res) {
-                        var _feeTypesInfo = JSON.parse(json);
-                        vc.component.payFeeManageInfo.payFeeTypes = _feeTypesInfo;
-
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.html

@@ -1,64 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>缴费汇总表</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <div class="btn-group" role="group" aria-label="Basic example">
-                            <button type="button"
-                                    class="btn btn-light btn-sm"
-                                    v-bind:class="{'btn-primary': feeSummaryInfo.feeSummaryType == 1001}"
-                                    v-on:click="_switchFeeSummaryType(1001)"
-                            >日</button>
-                            <button type="button"
-                                    class="btn btn-light btn-sm"
-                                    v-bind:class="{'btn-primary': feeSummaryInfo.feeSummaryType == 1101}"
-                                    v-on:click="_switchFeeSummaryType(1101)"
-                            >月</button>
-                            <button type="button"
-                                    class="btn btn-light btn-sm"
-                                    v-bind:class="{'btn-primary': feeSummaryInfo.feeSummaryType == 1111}"
-                                    v-on:click="_switchFeeSummaryType(1111)"
-                            >年</button>
-                        </div>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">时间</th>
-                            <th class="text-center">费用项ID</th>
-                            <th class="text-center">费用项名称</th>
-                            <th class="text-center">应收金额</th>
-                            <th class="text-center">实收金额</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="fee in feeSummaryInfo.fees">
-                            <td class="text-center">{{fee.createTime}}</td>
-                            <td class="text-center">{{fee.configId}}</td>
-                            <td class="text-center">{{fee.feeName}}</td>
-                            <td class="text-center">{{fee.receivableAmounts}}</td>
-                            <td class="text-center">{{fee.receivedAmounts}}</td>
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.js

@@ -1,64 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 10;
-    vc.extends({
-        data: {
-            feeSummaryInfo: {
-                fees: [],
-                feeSummaryType:'1001',
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-            }
-        },
-        _initMethod: function () {
-            vc.component._listFeeSummarys(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent: function () {
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._listFeeSummarys(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _listFeeSummarys: function (_page, _rows) {
-                var param = {
-                    params: {
-                        page: _page,
-                        row:_rows,
-                        feeSummaryType:vc.component.feeSummaryInfo.feeSummaryType,
-                        communityId:vc.getCurrentCommunity().communityId
-                    }
-                };
-
-                //发送get请求
-                vc.http.get('feeSummary',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _feeSummaryInfo = JSON.parse(json);
-                        vc.component.feeSummaryInfo.total = _feeSummaryInfo.total;
-                        vc.component.feeSummaryInfo.records = parseInt(_feeSummaryInfo.total/_rows +1);
-                        vc.component.feeSummaryInfo.fees = _feeSummaryInfo.fees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.feeSummaryInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _exportExcel:function () {
-
-            },
-            _switchFeeSummaryType:function(_feeSummaryType){
-                vc.component.feeSummaryInfo.feeSummaryType = _feeSummaryType;
-                vc.component._listFeeSummarys(DEFAULT_PAGE,DEFAULT_ROWS);
-            }
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.html

@@ -1,88 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <!-- <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                 v-on:click="_moreCondition()">{{staffFeeManageInfo.moreCondition == true?'隐藏':'更多'}}
-                         </button>-->
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <input size="16" type="text" placeholder="请填写员工编码"
-                                   v-model="staffFeeManageInfo.conditions.userCode" class="form-control">
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择开始时间" readonly
-                                       class="form-control  start_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择结束时间" readonly
-                                       class="form-control  end_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_querystaffFeeMethod()">
-                                <i class="glyphicon glyphicon-search"></i>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>员工收费</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            导出
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">员工名称</th>
-                            <th class="text-center">员工编码</th>
-                            <th class="text-center">应收金额</th>
-                            <th class="text-center">实收金额</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="staffFee in staffFeeManageInfo.staffFees">
-                            <td class="text-center">{{staffFee.userName}}</td>
-                            <td class="text-center">{{staffFee.userId}}</td>
-                            <td class="text-center">{{staffFee.receivableAmount}}元</td>
-                            <td class="text-center">{{staffFee.receivedAmount}}元</td>
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.js

@@ -1,104 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 30;
-    vc.extends({
-        data: {
-            staffFeeManageInfo: {
-                staffFees: [],
-                staffFeeTypes:[],
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-                conditions: {
-                    communityId: vc.getCurrentCommunity().communityId,
-                    startTime: '',
-                    endTime: '',
-                    userCode:''
-                }
-            }
-        },
-        _initMethod: function () {
-            vc.component._initDate();
-            vc.component._liststaffFees(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent: function () {
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._liststaffFees(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _initDate:function(){
-                $(".start_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $(".end_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.start_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".start_time").val();
-                        vc.component.staffFeeManageInfo.conditions.startTime = value ;
-                    });
-                $('.end_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".end_time").val();
-                        vc.component.staffFeeManageInfo.conditions.endTime = value ;
-                    });
-            },
-            _liststaffFees: function (_page, _rows) {
-
-                vc.component.staffFeeManageInfo.conditions.page = _page;
-                vc.component.staffFeeManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.staffFeeManageInfo.conditions
-                };
-
-                //发送get请求
-                vc.http.get('staffFeeManage',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _staffFeeManageInfo = JSON.parse(json);
-                        vc.component.staffFeeManageInfo.total = _staffFeeManageInfo.total;
-                        vc.component.staffFeeManageInfo.records = parseInt(_staffFeeManageInfo.total/_rows +1);
-                        vc.component.staffFeeManageInfo.staffFees = _staffFeeManageInfo.staffFees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.staffFeeManageInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _querystaffFeeMethod: function () {
-                vc.component._liststaffFees(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition: function () {
-                if (vc.component.staffFeeManageInfo.moreCondition) {
-                    vc.component.staffFeeManageInfo.moreCondition = false;
-                } else {
-                    vc.component.staffFeeManageInfo.moreCondition = true;
-                }
-            },
-            _exportExcel:function () {
-
-            }
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.html

@@ -1,108 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <!-- <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                 v-on:click="_moreCondition()">{{tempCarInoutFeeManageInfo.moreCondition == true?'隐藏':'更多'}}
-                         </button>-->
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请填写车牌号"
-                                       v-model="tempCarInoutFeeManageInfo.conditions.carNum" class="form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择开始时间" readonly
-                                       class="form-control  start_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择结束时间" readonly
-                                       class="form-control  end_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryPayFeeMethod()">
-                                <i class="glyphicon glyphicon-search"></i>
-                            </button>
-                        </div>
-                    </div>
-                    <!--<div class="row" v-if="tempCarInoutFeeManageInfo.moreCondition == true">
-                        <div class="col-sm-4">
-                            <input size="16" type="text" placeholder="请填写员工编码"  v-model="tempCarInoutFeeManageInfo.conditions.userCode" class="form-control">
-                        </div>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>临时车缴费清单</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            导出
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">订单ID</th>
-                            <th class="text-center">缴费ID</th>
-                            <th class="text-center">进场ID</th>
-                            <th class="text-center">车牌号</th>
-                            <th class="text-center">应付金额</th>
-                            <td class="text-center">实付金额</td>
-                            <td class="text-center">开始时间</td>
-                            <td class="text-center">结束时间</td>
-<!--                            <td class="text-center">操作员工</td>-->
-                            <td class="text-center">缴费时间</td>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="payFee in tempCarInoutFeeManageInfo.payFees">
-                            <td class="text-center">{{payFee.oId}}</td>
-                            <td class="text-center">{{payFee.feeId}}</td>
-                            <td class="text-center">{{payFee.inoutId}}</td>
-                            <td class="text-center">{{payFee.carNum}}</td>
-                            <td class="text-center">{{payFee.receivableAmount}}元</td>
-                            <td class="text-center">{{payFee.receivedAmount}}元</td>
-                            <td class="text-center">{{payFee.startTime}}</td>
-                            <td class="text-center">{{payFee.endTime}}</td>
-<!--                            <td class="text-center">{{payFee.userName}}</td>-->
-                            <td class="text-center">{{payFee.payTime}}</td>
-
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.js

@@ -1,104 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 30;
-    vc.extends({
-        data: {
-            tempCarInoutFeeManageInfo: {
-                payFees: [],
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-                conditions: {
-                    communityId: vc.getCurrentCommunity().communityId,
-                    feeTypeCd: '888800010007',
-                    startTime: '',
-                    endTime: '',
-                    carNum:''
-                }
-            }
-        },
-        _initMethod: function () {
-            vc.component._initDate();
-            vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent: function () {
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._listpayFees(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _initDate:function(){
-                $(".start_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $(".end_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.start_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".start_time").val();
-                        vc.component.tempCarInoutFeeManageInfo.conditions.startTime = value ;
-                    });
-                $('.end_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".end_time").val();
-                        vc.component.tempCarInoutFeeManageInfo.conditions.endTime = value ;
-                    });
-            },
-            _listpayFees: function (_page, _rows) {
-
-                vc.component.tempCarInoutFeeManageInfo.conditions.page = _page;
-                vc.component.tempCarInoutFeeManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.tempCarInoutFeeManageInfo.conditions
-                };
-
-                //发送get请求
-                vc.http.get('tempCarInoutFeeManage',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _tempCarInoutFeeManageInfo = JSON.parse(json);
-                        vc.component.tempCarInoutFeeManageInfo.total = _tempCarInoutFeeManageInfo.total;
-                        vc.component.tempCarInoutFeeManageInfo.records = parseInt(_tempCarInoutFeeManageInfo.total/_rows +1);
-                        vc.component.tempCarInoutFeeManageInfo.payFees = _tempCarInoutFeeManageInfo.tempCarInoutFees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.tempCarInoutFeeManageInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _queryPayFeeMethod: function () {
-                vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition: function () {
-                if (vc.component.tempCarInoutFeeManageInfo.moreCondition) {
-                    vc.component.tempCarInoutFeeManageInfo.moreCondition = false;
-                } else {
-                    vc.component.tempCarInoutFeeManageInfo.moreCondition = true;
-                }
-            },
-            _exportExcel:function () {
-
-            }
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/views/feeSummaryFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>费用汇总表|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="feeSummary"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

ReportComponent/src/main/resources/views/payFeeFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>缴费清单|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="payFeeManage"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

ReportComponent/src/main/resources/views/staffFeeFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>员工收费|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="staffFeeManage"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

ReportComponent/src/main/resources/views/tempCarInoutFeeFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>临时车缴费清单|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="tempCarInoutFeeManage"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

pom.xml

@@ -35,7 +35,6 @@
         <module>JobService</module>
         <module>CommonService</module>
         <module>ReportService</module>
-        <module>ReportComponent</module>
         <module>HardwareAdapationService</module>
         <module>FrontService</module>
     </modules>