资金模块-新增资金模块报表功能

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/MoneyReportColltroller.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2018/11/9 14:21
  **/
 @RestController
-@RequestMapping("/repor")
+@RequestMapping("/report")
 public class MoneyReportColltroller {
     @Autowired
     private MoneyReportService moneyReportService;
@@ -48,4 +48,11 @@ public class MoneyReportColltroller {
         PageInfo listData = moneyReportService.acountBalance(page, req);
         return Result.success(listData);
     }
+
+    //客户对账单
+    @GetMapping("/customercheck")
+    public Result customercheck(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.customercheck(page, req);
+        return Result.success(listData);
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/AcountbalanceViewMapper.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/AcountbalanceViewMapper.java

@@ -1,6 +1,6 @@
-package com.usoftchina.saas.money.mapper.forms;
+package com.usoftchina.saas.money.mapper;
 
-import com.usoftchina.saas.money.po.forms.AcountbalanceView;
+import com.usoftchina.saas.money.po.AcountbalanceView;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/CustomerCheckViewMapper.java

@@ -0,0 +1,11 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.AcountbalanceView;
+import com.usoftchina.saas.money.po.CustomerCheckView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CustomerCheckViewMapper {
+    List<CustomerCheckView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/PaydetailViewMapper.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaydetailViewMapper.java

@@ -1,6 +1,6 @@
-package com.usoftchina.saas.money.mapper.forms;
+package com.usoftchina.saas.money.mapper;
 
-import com.usoftchina.saas.money.po.forms.PaydetailView;
+import com.usoftchina.saas.money.po.PaydetailView;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/RecdetailViewMapper.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecdetailViewMapper.java

@@ -1,7 +1,6 @@
-package com.usoftchina.saas.money.mapper.forms;
+package com.usoftchina.saas.money.mapper;
 
-import com.usoftchina.saas.money.po.forms.RecdetailView;
-import com.usoftchina.saas.money.po.forms.VendorAcountView;
+import com.usoftchina.saas.money.po.RecdetailView;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VendorAcountViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.VendorAcountView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface VendorAcountViewMapper {
+    List<VendorAcountView> selectByCondition(@Param("con")String con, @Param("companyId")Long companyId);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/VendorAcountViewMapper.java

@@ -1,10 +0,0 @@
-package com.usoftchina.saas.money.mapper.forms;
-
-import com.usoftchina.saas.money.po.forms.VendorAcountView;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface VendorAcountViewMapper {
-    List<VendorAcountView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
-}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/AcountbalanceView.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/AcountbalanceView.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.money.po.forms;
+package com.usoftchina.saas.money.po;
 
 import java.util.Date;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/CustomerCheckView.java

@@ -0,0 +1,165 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class CustomerCheckView {
+    private String pi_inoutno;
+
+    private String pi_class;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private Date pi_date;
+
+    private Integer pd_pdno;
+
+    private String pr_code;
+
+    private String pr_detail;
+
+    private String pr_spec;
+
+    private String pd_unit;
+
+    private Double qty;
+
+    private Double pd_orderprice;
+
+    private Double pd_taxrate;
+
+    private Double pd_total;
+
+    private Double pd_netprice;
+
+    private Double pd_nettotal;
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno;
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class;
+    }
+
+    public String getPi_custcode() {
+        return pi_custcode;
+    }
+
+    public void setPi_custcode(String pi_custcode) {
+        this.pi_custcode = pi_custcode;
+    }
+
+    public String getPi_custname() {
+        return pi_custname;
+    }
+
+    public void setPi_custname(String pi_custname) {
+        this.pi_custname = pi_custname;
+    }
+
+    public Date getPi_date() {
+        return pi_date;
+    }
+
+    public void setPi_date(Date pi_date) {
+        this.pi_date = pi_date;
+    }
+
+    public Integer getPd_pdno() {
+        return pd_pdno;
+    }
+
+    public void setPd_pdno(Integer pd_pdno) {
+        this.pd_pdno = pd_pdno;
+    }
+
+    public String getPr_code() {
+        return pr_code;
+    }
+
+    public void setPr_code(String pr_code) {
+        this.pr_code = pr_code;
+    }
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPd_unit() {
+        return pd_unit;
+    }
+
+    public void setPd_unit(String pd_unit) {
+        this.pd_unit = pd_unit;
+    }
+
+    public Double getQty() {
+        return qty;
+    }
+
+    public void setQty(Double qty) {
+        this.qty = qty;
+    }
+
+    public Double getPd_orderprice() {
+        return pd_orderprice;
+    }
+
+    public void setPd_orderprice(Double pd_orderprice) {
+        this.pd_orderprice = pd_orderprice;
+    }
+
+    public Double getPd_taxrate() {
+        return pd_taxrate;
+    }
+
+    public void setPd_taxrate(Double pd_taxrate) {
+        this.pd_taxrate = pd_taxrate;
+    }
+
+    public Double getPd_total() {
+        return pd_total;
+    }
+
+    public void setPd_total(Double pd_total) {
+        this.pd_total = pd_total;
+    }
+
+    public Double getPd_netprice() {
+        return pd_netprice;
+    }
+
+    public void setPd_netprice(Double pd_netprice) {
+        this.pd_netprice = pd_netprice;
+    }
+
+    public Double getPd_nettotal() {
+        return pd_nettotal;
+    }
+
+    public void setPd_nettotal(Double pd_nettotal) {
+        this.pd_nettotal = pd_nettotal;
+    }
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/PaydetailView.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/PaydetailView.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.money.po.forms;
+package com.usoftchina.saas.money.po;
 
 import java.util.Date;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/RecdetailView.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/RecdetailView.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.money.po.forms;
+package com.usoftchina.saas.money.po;
 
 import java.util.Date;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/VendorAcountView.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendorAcountView.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.money.po.forms;
+package com.usoftchina.saas.money.po;
 
 import java.util.Date;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/MoneyReportService.java

@@ -13,4 +13,5 @@ public interface MoneyReportService {
     PageInfo payDetail(PageRequest page, ListReqDTO req);
     PageInfo recDetail(PageRequest page, ListReqDTO req);
     PageInfo acountBalance(PageRequest page, ListReqDTO req);
+    PageInfo customercheck(PageRequest page, ListReqDTO req);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/MoneyReportServiceImpl.java

@@ -4,11 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
-import com.usoftchina.saas.money.mapper.forms.AcountbalanceViewMapper;
-import com.usoftchina.saas.money.mapper.forms.PaydetailViewMapper;
-import com.usoftchina.saas.money.mapper.forms.RecdetailViewMapper;
-import com.usoftchina.saas.money.mapper.forms.VendorAcountViewMapper;
-import com.usoftchina.saas.money.po.forms.AcountbalanceView;
+import com.usoftchina.saas.money.mapper.*;
 import com.usoftchina.saas.money.service.MoneyReportService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +26,8 @@ public class MoneyReportServiceImpl implements MoneyReportService {
     private RecdetailViewMapper recdetailViewMapper;
     @Autowired
     private AcountbalanceViewMapper acountbalanceViewMapper;
+    @Autowired
+    private CustomerCheckViewMapper customerCheckViewMapper;
 
     @Override
     public PageInfo vendorCheck(PageRequest page, ListReqDTO req) {
@@ -51,6 +49,11 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         return getListDATA(page, req, "acountBalance");
     }
 
+    @Override
+    public PageInfo customercheck(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "customercheck");
+    }
+
     private PageInfo getListDATA(PageRequest page, ListReqDTO req, String type) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
@@ -83,6 +86,8 @@ public class MoneyReportServiceImpl implements MoneyReportService {
             list = recdetailViewMapper.selectByCondition(con, companyId);
         }else if ("acountBalance".equals(type)){
             list = acountbalanceViewMapper.selectByCondition(con, companyId);
+        }else if ("customercheck".equals(type)){
+            list = customerCheckViewMapper.selectByCondition(con, companyId);
         }
         return list;
     }

applications/money/money-server/src/main/resources/mapper/CustomerCheckViewMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.CustomerCheckViewMapper" >
+    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.CustomerCheckView" >
+        <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+        <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
+        <result column="pi_custcode" property="pi_custcode" jdbcType="VARCHAR" />
+        <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
+        <result column="pi_date" property="pi_date" jdbcType="TIMESTAMP" />
+        <result column="pd_pdno" property="pd_pdno" jdbcType="INTEGER" />
+        <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />
+        <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
+        <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />
+        <result column="pd_unit" property="pd_unit" jdbcType="VARCHAR" />
+        <result column="qty" property="qty" jdbcType="DOUBLE" />
+        <result column="pd_orderprice" property="pd_orderprice" jdbcType="DOUBLE" />
+        <result column="pd_taxrate" property="pd_taxrate" jdbcType="DOUBLE" />
+        <result column="pd_total" property="pd_total" jdbcType="DOUBLE" />
+        <result column="pd_netprice" property="pd_netprice" jdbcType="DOUBLE" />
+        <result column="pd_nettotal" property="pd_nettotal" jdbcType="DOUBLE" />
+    </resultMap>
+
+    <select id="selectByCondition" resultMap="BaseResultMap">
+        select  *  from customer_amount_view
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId != null">
+                and  companyId = #{companyId}
+            </if>
+        </where>
+        order by pi_date desc
+    </select>
+
+</mapper>

applications/money/money-server/src/main/resources/mapper/forms/VendorAcountViewMapper.xml → applications/money/money-server/src/main/resources/mapper/VendorAcountViewMapper.xml

@@ -33,5 +33,4 @@
     </where>
     order by pi_date desc
   </select>
-
 </mapper>

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -183,7 +183,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "ft_recorddate", 
+        name : "ft_date",
         fieldLabel : "录入日期",
         readOnly:true
     }

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -0,0 +1,64 @@
+Ext.define('saas.view.money.report.AccountBalance', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-accountbalance',
+
+    controller: 'money-report-accountbalance',
+    viewModel: 'money-report-accountbalance',
+
+    viewName: 'money-report-accountbalance',
+
+    groupField: null,
+    listUrl: '/api/money/report/accountBalance',
+    // listUrl: 'http://192.168.253.35:8880/report/accountBalance',
+    defaultCondition: null,
+    reportTitle: '资金账户收支明细',
+    QueryWidth:0.1,
+    //筛选：账户、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'bankcode',
+        fieldLabel: '账户名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'date',
+        fieldLabel: '日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+         {
+            text: '账户编号',
+            dataIndex: 'bankcode',
+            width: 200
+        }, {
+            text: '账户名称',
+            dataIndex: 'bankname',
+            width: 200
+        }, {
+            text: '日期',
+            dataIndex: 'date',
+            width: 200
+        }, {
+            text: '业务类型',
+            dataIndex: 'kind'
+        },{
+            text:'收入',
+            dataIndex:'outamount'
+        },{
+            text:'支出',
+            dataIndex:'thisamount'
+        },{
+            text: '账户余额',
+            dataIndex: 'pr_code'
+        }, {
+            text: '往来单位',
+            dataIndex: 'bcode'
+        }, {
+            text: '收付款人',
+            dataIndex: 'bmanname'
+        }, {
+            text: '备注',
+            dataIndex: 'remark'
+        }]
+});

frontend/saas-web/app/view/money/report/AccountBalanceController.js

@@ -0,0 +1,74 @@
+Ext.define('saas.view.money.report.AccountBalanceController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-accountbalance',
+    init: function (form) {
+        this.control({
+            //账户资料
+            'dbfindtrigger[name=bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle:'账户资料',
+                        dbfinds:[
+                            {
+                                from:'bk_bankname',to:'bankname'
+                            }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbSearchFields:[{
+                            xtype : "textfield",
+                            name: 'name',
+                            getCondition: function(v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            emptyText : "请输入账户编号或名称",
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": ""
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "width": 150,
+                            "xtype": ""
+                        }, {
+                            "text": "账户类型",
+                            "flex": 1,
+                            "dataIndex": "bk_type",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            align:'right',
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
+                        }]
+                    }) ;
+                }
+            }
+        });
+    }
+});

frontend/saas-web/app/view/money/report/AccountBalanceModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.AccountBalanceModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-accountbalance'
+});

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -0,0 +1,94 @@
+Ext.define('saas.view.money.report.CustomerCheckCheck', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-customercheck',
+
+    controller: 'money-report-customercheck',
+    viewModel: 'money-report-customercheck',
+
+    viewName: 'money-report-customercheck',
+
+    groupField: null,
+    listUrl: '/api/money/report/customercheck',
+    // listUrl: 'http://192.168.253.35:8880/report/customercheck',
+    defaultCondition: null,
+    reportTitle: '客户对账单',
+    QueryWidth:0.1,
+    //筛选：客户、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_custname',
+        fieldLabel: '客户名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            width: 200
+        }, {
+            text: '序号',
+            dataIndex: 'pd_pdno'
+        },{
+            text:'客户编号',
+            dataIndex:'pi_vendcode',
+            hidden: true
+        },{
+            text:'客户名称',
+            dataIndex:'pi_vendname',
+            hidden: true
+        },{
+            text: '物料编号',
+            dataIndex: 'pr_code'
+        }, {
+            text: '物料名称',
+            dataIndex: 'pr_detail'
+        }, {
+            text: '物料规格',
+            dataIndex: 'pr_spec'
+        }, {
+            text: '单位',
+            dataIndex: 'pd_unit'
+        }, {
+            text: '数量',
+            dataIndex: 'qty',
+            summaryType: 'count'
+        }, {
+            text: '单价',
+            dataIndex: 'pd_orderprice'
+        }, {
+            text: '税率',
+            dataIndex: 'pd_taxrate'
+        }, {
+            text: '金额',
+            dataIndex: 'pd_total',
+            summaryType: 'count'
+        }, {
+            text: '不含税单价',
+            dataIndex: 'pd_netprice'
+        }, {
+            text: '不含税金额',
+            dataIndex: 'pd_nettotal',
+            summaryType: 'count'
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark'
+        }]
+});

frontend/saas-web/app/view/money/report/CustomerCheckController.js

@@ -0,0 +1,82 @@
+Ext.define('saas.view.money.report.CustomerCheckController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-customercheck',
+    init: function (form) {
+        this.control({
+            'dbfindtrigger[name=pi_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl: '/api/document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
+                        //赋值
+                        dbfinds:[{
+                            from: 'cu_name', to: 'pi_custname'
+                        }],
+                        //联想设置
+                        dbtpls:[{
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        defaultCondition: 'cu_statuscode="OPEN"',
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            "text": "客户ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        },{
+                            "text": "客户编号",
+                            "dataIndex": "cu_code",
+                            "width": 200,
+                        }, {
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
+                            "dataIndex": "cu_name",
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "应收款余额",
+                            "dataIndex": "cu_leftamount",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100,
+                            align:'right'
+                        }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

frontend/saas-web/app/view/money/report/CustomerCheckModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.CustomerCheckModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-customercheck'
+});

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -0,0 +1,81 @@
+Ext.define('saas.view.money.report.PayDetail', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-paydetail',
+
+    controller: 'money-report-paydetail',
+    viewModel: 'money-report-paydetail',
+
+    viewName: 'money-report-paydetail',
+
+    groupField: null,
+    listUrl: '/api/money/report/payDetail',
+    // listUrl: 'http://192.168.253.35:8880/report/payDetail',
+    defaultCondition: null,
+    reportTitle: '应付账款明细表',
+    QueryWidth:0.1,
+    //筛选：供应商、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pb_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        },{
+            text:'供应商编号',
+            dataIndex:'pi_vendcode'
+        },{
+            text:'供应商名称',
+            dataIndex:'pi_vendname'
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pb_date',
+            width: 200
+        }, {
+            text: '采购员',
+            dataIndex: 'pu_buyercode'
+        },{
+            text: '单据日期',
+            dataIndex: 'pb_date'
+        }, {
+            text: '期初应付余额',
+            dataIndex: 've_beginapamount',
+            summaryType: 'count'
+        }, {
+            text: '本期付款金额',
+            dataIndex: 'pb_pdamount',
+            summaryType: 'count'
+        }, {
+            text: '应付余额',
+            dataIndex: 'mustpay',
+            summaryType: 'count'
+        }, {
+            text: '应付日期',
+            dataIndex: 'mustdate',
+        }, {
+            text: '单据总金额',
+            dataIndex: 'pi_total',
+            summaryType: 'count'
+        }, {
+            text: '备注',
+            dataIndex: 'pi_remark'
+        }]
+});

frontend/saas-web/app/view/money/report/PayDetailController.js

@@ -0,0 +1,79 @@
+Ext.define('saas.view.money.report.PayDetailController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-paydetail',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pi_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds:[{
+                            from:'ve_name',to:'pi_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: "ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[
+                            {
+                                "text": "供应商ID",
+                                "hidden": true,
+                                "dataIndex": "id",
+                                "width": 100,
+                                "xtype": "numbercolumn"
+                            },{
+                                "text": "供应商编号",
+                                "dataIndex": "ve_code",
+                                "width": 200
+                            }, {
+                                "text": "供应商名称",
+                                "dataIndex": "ve_name",
+                                "width": 200
+                            }, {
+                                "text": "供应商类型",
+                                "dataIndex": "ve_type",
+                                "width": 180,
+                                "items": null
+                            }, {
+                                "text": "税率",
+                                "dataIndex": "ve_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "dataIndex": "ve_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "纳税人识别号",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 150
+                            }, {
+                                "text": "开户银行",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 100
+                            }, {
+                                "text": "银行账户",
+                                "dataIndex": "ve_bankcode",
+                                "width": 100
+                            }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

frontend/saas-web/app/view/money/report/PayDetailModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.PayDetailModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-paydetail'
+});

frontend/saas-web/app/view/money/report/RecDetail.js

@@ -0,0 +1,83 @@
+Ext.define('saas.view.money.report.RecDetail', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-recdetail',
+
+    controller: 'money-report-recdetail',
+    viewModel: 'money-report-recdetail',
+
+    viewName: 'money-report-recdetail',
+
+    groupField: null,
+    listUrl: '/api/money/report/recDetail',
+    // listUrl: 'http://192.168.253.35:8880/report/recDetail',
+    defaultCondition: null,
+    reportTitle: '应收账款明细',
+    QueryWidth:0.1,
+    //筛选：客户、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_custname',
+        fieldLabel: '客户名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pb_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        }, {
+            text: '客户编号',
+            dataIndex: 'pi_custcode',
+            width: 200
+        }, {
+            text: '客户名称',
+            dataIndex: 'pi_custname',
+            width: 200
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        },{
+            text: '业务员',
+            dataIndex: 'PU_BUYERNAME',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pb_date',
+            width: 200,
+        }, {
+            text: '序号',
+            dataIndex: 'pd_pdno'
+        },{
+            text:'期初应收',
+            dataIndex:'cu_beginaramount',
+            summaryType: 'count'
+        },{
+            text:'本期收款金额',
+            dataIndex:'pb_pdamount',
+            summaryType: 'count'
+        },{
+            text: '应收余额',
+            dataIndex: 'mustpay',
+            summaryType: 'count'
+        }, {
+            text: '应收日期',
+            dataIndex: 'mustdate'
+        }, {
+            text: '单据总金额',
+            dataIndex: 'pi_total'
+        }, {
+            text: '备注',
+            dataIndex: 'pd_unit'
+        }]
+});

frontend/saas-web/app/view/money/report/RecDetailController.js

@@ -0,0 +1,82 @@
+Ext.define('saas.view.money.report.RecDetailController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-recdetail',
+    init: function (form) {
+        this.control({
+            'dbfindtrigger[name=pi_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl: '/api/document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
+                        //赋值
+                        dbfinds:[{
+                            from: 'cu_name', to: 'pi_custname'
+                        }],
+                        //联想设置
+                        dbtpls:[{
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        defaultCondition: 'cu_statuscode="OPEN"',
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            "text": "客户ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        },{
+                            "text": "客户编号",
+                            "dataIndex": "cu_code",
+                            "width": 200,
+                        }, {
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
+                            "dataIndex": "cu_name",
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "应收款余额",
+                            "dataIndex": "cu_leftamount",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100,
+                            align:'right'
+                        }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

frontend/saas-web/app/view/money/report/RecDetailModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.RecDetailModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-recdetail'
+});

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -0,0 +1,91 @@
+Ext.define('saas.view.money.report.VendorCheck', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-vendorcheck',
+
+    controller: 'money-report-vendorcheck',
+    viewModel: 'money-report-vendorcheck',
+
+    viewName: 'money-report-vendorcheck',
+
+    groupField: null,
+    listUrl: '/api/money/report/vendorCheck',
+    // listUrl: 'http://192.168.253.35:8880/report/vendorCheck',
+    defaultCondition: null,
+    reportTitle: '供应商对账单',
+    QueryWidth:0.1,
+    //筛选：供应商、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            width: 200
+        }, {
+            text: '序号',
+            dataIndex: 'pd_pdno'
+        },{
+            text:'供应商编号',
+            dataIndex:'pi_vendcode'
+        },{
+            text:'供应商名称',
+            dataIndex:'pi_vendname'
+        },{
+            text: '物料编号',
+            dataIndex: 'pr_code'
+        }, {
+            text: '物料名称',
+            dataIndex: 'pr_detail'
+        }, {
+            text: '物料规格',
+            dataIndex: 'pr_spec'
+        }, {
+            text: '单位',
+            dataIndex: 'pd_unit'
+        }, {
+            text: '采购数量',
+            dataIndex: 'qty',
+            summaryType: 'count'
+        }, {
+            text: '单价',
+            dataIndex: 'pd_orderprice'
+        }, {
+            text: '税率',
+            dataIndex: 'pd_taxrate'
+        }, {
+            text: '金额',
+            dataIndex: 'pd_total',
+            summaryType: 'count'
+        }, {
+            text: '不含税单价',
+            dataIndex: 'pd_netprice'
+        }, {
+            text: '不含税金额',
+            dataIndex: 'pd_nettotal'
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark'
+        }]
+});

frontend/saas-web/app/view/money/report/VendorCheckController.js

@@ -0,0 +1,79 @@
+Ext.define('saas.view.money.report.VendorCheckController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-vendorcheck',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pi_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds:[{
+                            from:'ve_name',to:'pi_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: "ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[
+                            {
+                                "text": "供应商ID",
+                                "hidden": true,
+                                "dataIndex": "id",
+                                "width": 100,
+                                "xtype": "numbercolumn"
+                            },{
+                                "text": "供应商编号",
+                                "dataIndex": "ve_code",
+                                "width": 200
+                            }, {
+                                "text": "供应商名称",
+                                "dataIndex": "ve_name",
+                                "width": 200
+                            }, {
+                                "text": "供应商类型",
+                                "dataIndex": "ve_type",
+                                "width": 180,
+                                "items": null
+                            }, {
+                                "text": "税率",
+                                "dataIndex": "ve_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "dataIndex": "ve_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "纳税人识别号",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 150
+                            }, {
+                                "text": "开户银行",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 100
+                            }, {
+                                "text": "银行账户",
+                                "dataIndex": "ve_bankcode",
+                                "width": 100
+                            }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

frontend/saas-web/app/view/money/report/VendorCheckModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.VendorCheckModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-vendorcheck'
+});

frontend/saas-web/resources/json/navigation.json

@@ -160,15 +160,25 @@
     }, {
         "text": "报表",
         "items": [{
-            "text": "供应商对账单"
+            "text": "供应商对账单",
+            "id": "monry-report-vendorcheck",
+            "viewType":"monry-report-vendorcheck"
         }, {
-            "text": "应付账款明细表"
+            "text": "应付账款明细表",
+            "id": "monry-report-paydetail",
+            "viewType":"monry-report-paydetail"
         }, {
-            "text": "客户对账单"
+            "text": "客户对账单",
+            "id": "monry-report-customercheck",
+            "viewType":"monry-report-customercheck"
         }, {
-            "text": "应收款明细表"
+            "text": "应收款明细表",
+            "id": "monry-report-recdetail",
+            "viewType":"monry-report-recdetail"
         }, {
-            "text": "资金账户余额表"
+            "text": "资金账户余额表",
+            "id": "monry-report-accountbalance",
+            "viewType":"monry-report-accountbalance"
         }]
     }]
 }, {