1.核销明细单前端

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

@@ -3,22 +3,31 @@ package com.usoftchina.saas.money.po;
 import java.util.Date;
 
 public class AccountDetailsView {
-    private String SL_CODE;
+    private String sl_code;
 
-    private String SL_KIND;
+    private String sl_kind;
 
-    private String VE_NAME;
+    private String ve_name;
 
-    private Double SL_AMOUNT;
+    private Double sl_amount;
 
-    private Integer PB_ID;
+    private Integer pb_id;
 
-    private String PB_KIND;
+    private String pb_kind;
 
-    private String PB_CODE;
+    private String pb_code;
 
     private Double total;
     private Date date;
+    private Long companyId;
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
 
     public Date getDate() {
         return date;
@@ -28,60 +37,60 @@ public class AccountDetailsView {
         this.date = date;
     }
 
-    public String getSL_CODE() {
-        return SL_CODE;
+    public String getSl_code() {
+        return sl_code;
     }
 
-    public void setSL_CODE(String SL_CODE) {
-        this.SL_CODE = SL_CODE == null ? null : SL_CODE.trim();
+    public void setSl_code(String sl_code) {
+        this.sl_code = sl_code;
     }
 
-    public String getSL_KIND() {
-        return SL_KIND;
+    public String getSl_kind() {
+        return sl_kind;
     }
 
-    public void setSL_KIND(String SL_KIND) {
-        this.SL_KIND = SL_KIND == null ? null : SL_KIND.trim();
+    public void setSl_kind(String sl_kind) {
+        this.sl_kind = sl_kind;
     }
 
-    public String getVE_NAME() {
-        return VE_NAME;
+    public String getVe_name() {
+        return ve_name;
     }
 
-    public void setVE_NAME(String VE_NAME) {
-        this.VE_NAME = VE_NAME == null ? null : VE_NAME.trim();
+    public void setVe_name(String ve_name) {
+        this.ve_name = ve_name;
     }
 
-    public Double getSL_AMOUNT() {
-        return SL_AMOUNT;
+    public Double getSl_amount() {
+        return sl_amount;
     }
 
-    public void setSL_AMOUNT(Double SL_AMOUNT) {
-        this.SL_AMOUNT = SL_AMOUNT;
+    public void setSl_amount(Double sl_amount) {
+        this.sl_amount = sl_amount;
     }
 
-    public Integer getPB_ID() {
-        return PB_ID;
+    public Integer getPb_id() {
+        return pb_id;
     }
 
-    public void setPB_ID(Integer PB_ID) {
-        this.PB_ID = PB_ID;
+    public void setPb_id(Integer pb_id) {
+        this.pb_id = pb_id;
     }
 
-    public String getPB_KIND() {
-        return PB_KIND;
+    public String getPb_kind() {
+        return pb_kind;
     }
 
-    public void setPB_KIND(String PB_KIND) {
-        this.PB_KIND = PB_KIND == null ? null : PB_KIND.trim();
+    public void setPb_kind(String pb_kind) {
+        this.pb_kind = pb_kind;
     }
 
-    public String getPB_CODE() {
-        return PB_CODE;
+    public String getPb_code() {
+        return pb_code;
     }
 
-    public void setPB_CODE(String PB_CODE) {
-        this.PB_CODE = PB_CODE == null ? null : PB_CODE.trim();
+    public void setPb_code(String pb_code) {
+        this.pb_code = pb_code;
     }
 
     public Double getTotal() {

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

@@ -2,15 +2,16 @@
 <!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.AccountDetailsViewMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.AccountDetailsView" >
-    <result column="SL_CODE" property="SL_CODE" jdbcType="VARCHAR" />
-    <result column="SL_KIND" property="SL_KIND" jdbcType="VARCHAR" />
-    <result column="VE_NAME" property="VE_NAME" jdbcType="VARCHAR" />
-    <result column="SL_AMOUNT" property="SL_AMOUNT" jdbcType="DOUBLE" />
-    <result column="PB_ID" property="PB_ID" jdbcType="INTEGER" />
-    <result column="PB_KIND" property="PB_KIND" jdbcType="VARCHAR" />
-    <result column="PB_CODE" property="PB_CODE" jdbcType="VARCHAR" />
+    <result column="sl_code" property="sl_code" jdbcType="VARCHAR" />
+    <result column="sl_kind" property="sl_kind" jdbcType="VARCHAR" />
+    <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
+    <result column="sl_amount" property="sl_amount" jdbcType="DOUBLE" />
+    <result column="pb_id" property="pb_id" jdbcType="INTEGER" />
+    <result column="pb_kind" property="pb_kind" jdbcType="VARCHAR" />
+    <result column="pb_code" property="pb_code" jdbcType="VARCHAR" />
     <result column="total" property="total" jdbcType="DOUBLE" />
     <result column="date" property="date" jdbcType="TIMESTAMP" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
   </resultMap>
   <select id="selectByCondition" resultMap="BaseResultMap">
     select  *  from account_details_view

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

@@ -0,0 +1,91 @@
+Ext.define('saas.view.money.report.AccountDetails', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-accountdetails',
+
+    controller: 'money-report-accountdetails',
+    viewModel: 'money-report-accountdetails',
+
+    viewName: 'money-report-accountdetails',
+
+    // groupField: null,
+    listUrl: '/api/money/report/accountdetails',
+    defaultCondition: null,
+    reportTitle: '核销对账表',
+    QueryWidth:0.25,
+    //筛选：客户/供应商、日期、单据类型（必填）
+    searchItems: [ {
+        xtype: 'vendorDbfindTrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        columnWidth: 0.25,
+        // allowBlank:false
+    }, {
+        xtype: 'condatefield',
+        name: 'date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单据编号',
+            dataIndex: 'sl_code',
+            width: 150
+        }, {
+            text: '单据类型',
+            dataIndex: 'sl_kind',
+            width: 110
+        }, {
+            text: '单据日期',
+            dataIndex: 'date',
+            xtype:'datecolumn',
+            width: 110
+        },{
+            text:'客户/供应商名称',
+            dataIndex:'ve_name',
+            width: 200
+        },{
+            text:'核销单号',
+            dataIndex:'pb_code',
+            width: 200
+        },{
+            text: '本期核销金额',
+            dataIndex: 'sl_amount',
+            xtype: 'numbercolumn',
+            width: 130,
+            // renderer : function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            //     var format = '0.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+            //     var format = '0.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // }
+        },{
+            text: '总金额',
+            dataIndex: 'total',
+            xtype: 'numbercolumn',
+            width: 110,
+            // renderer : function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            //     var format = '0,000.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            //     var format = '0,000.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // }
+        }]
+});

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

@@ -0,0 +1,18 @@
+Ext.define('saas.view.money.report.AccountDetailsController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-accountdetails',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pi_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'ve_name',to:'pi_vendname'
+                        }],
+                    }) ;
+                }
+            }
+        });
+    }
+});

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

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

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

@@ -7,7 +7,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
 
     viewName: 'money-report-vendorcheck',
 
-    groupField: 'pi_vendname',
+    // groupField: null,
     listUrl: '/api/money/report/vendorCheck',
     defaultCondition: null,
     reportTitle: '供应商对账单',

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

@@ -187,7 +187,11 @@
             "text": "资金账户余额表",
             "id": "monry-report-accountbalance",
             "viewType":"monry-report-accountbalance"
-        }]
+        }, {
+                "text": "核销明细表",
+                "id": "monry-report-accountdetails",
+                "viewType":"monry-report-accountdetails"
+            }]
     }]
 }, {
     "text": "资料",