1.核销明细单前端

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

@@ -8,6 +8,7 @@ public class AccountDetailsView {
     private String sl_kind;
 
     private String ve_name;
+    private String cu_name;
 
     private Double sl_amount;
 
@@ -21,6 +22,14 @@ public class AccountDetailsView {
     private Date date;
     private Long companyId;
 
+    public String getCu_name() {
+        return cu_name;
+    }
+
+    public void setCu_name(String cu_name) {
+        this.cu_name = cu_name;
+    }
+
     public Long getCompanyId() {
         return companyId;
     }

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

@@ -5,6 +5,7 @@
     <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="cu_name" property="cu_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" />

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

@@ -15,11 +15,17 @@ Ext.define('saas.view.money.report.AccountDetails', {
     //筛选：客户/供应商、日期、单据类型（必填）
     searchItems: [ {
         xtype: 'vendorDbfindTrigger',
-        name: 'pi_vendname',
+        name: 've_name',
         fieldLabel: '供应商名称',
         columnWidth: 0.25,
         // allowBlank:false
     }, {
+        xtype: 'customerDbfindTrigger',
+        name: 'cu_name',
+        fieldLabel: '用户名称',
+        columnWidth: 0.25,
+        // allowBlank:false
+    },{
         xtype: 'condatefield',
         name: 'date',
         fieldLabel: '单据日期',
@@ -44,9 +50,13 @@ Ext.define('saas.view.money.report.AccountDetails', {
             xtype:'datecolumn',
             width: 110
         },{
-            text:'客户/供应商名称',
+            text:'供应商名称',
             dataIndex:'ve_name',
             width: 200
+        },{
+            text:'客户名称',
+            dataIndex:'cu_name',
+            width: 200
         },{
             text:'核销单号',
             dataIndex:'pb_code',

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

@@ -4,11 +4,21 @@ Ext.define('saas.view.money.report.AccountDetailsController', {
     init: function (form) {
         this.control({
             // 供应商编号
-            'dbfindtrigger[name=pi_vendname]':{
+            'dbfindtrigger[name=ve_name]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'ve_name',to:'pi_vendname'
+                            from:'ve_name',to:'ve_name'
+                        }],
+                    }) ;
+                }
+            },
+            // 客户编号
+            'dbfindtrigger[name=cu_name]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'cu_name',to:'cu_name'
                         }],
                     }) ;
                 }

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

@@ -17,7 +17,8 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        allowBlank:false
     }, {
         xtype: 'condatefield',
         name: 'pi_date',