付款单界面配置

frontend/saas-web/app/model/money/PayBalance1.js

@@ -0,0 +1,25 @@
+Ext.define('saas.model.money.PayBalance1', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'id', type: 'int' },
+        { name: 'pd_id', type: 'int' },
+        { name: 'pd_rbid', type: 'int' },
+        { name: 'pd_detno', type: 'int' },
+        { name: 'pd_ym', type: 'int' },
+        { name: 'pd_bankid', type: 'int' },
+        { name: 'pd_bankcode', type: 'string' },
+        { name: 'pd_bankname', type: 'string' },
+        { name: 'pd_amount', type: 'float' },
+        { name: 'pd_paymethod', type: 'string' },
+        { name: 'pd_paycode', type: 'string' },
+        { name: 'pd_remark', type: 'string' },
+        { name: 'companyid', type: 'int' },
+        { name: 'updaterId', type: 'int' },
+        { name: 'updatedate', type: 'date' },
+        { name: 'pd_text1', type: 'string' },
+        { name: 'pd_text2', type: 'string' },
+        { name: 'pd_text3', type: 'string' },
+        { name: 'pd_text4', type: 'string' },
+        { name: 'pd_text5', type: 'string' }
+    ]
+});

frontend/saas-web/app/model/money/PayBalance2.js

@@ -0,0 +1,25 @@
+Ext.define('saas.model.money.PayBalance2', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'id', type: 'int' },
+        { name: 'pbd_id', type: 'int' },
+        { name: 'pbd_pbid', type: 'int' },
+        { name: 'pbd_detno', type: 'int' },
+        { name: 'pbd_ym', type: 'int' },
+        { name: 'pbd_slid', type: 'int' },
+        { name: 'pbd_slcode', type: 'string' },
+        { name: 'pbd_slkind', type: 'string' },
+        { name: 'pbd_sldate', type: 'date' },
+        { name: 'pbd_amount', type: 'float' },
+        { name: 'pbd_nowbalance', type: 'float' },
+        { name: 'pbd_remark', type: 'string' },
+        { name: 'companyid', type: 'int' },
+        { name: 'updaterId', type: 'int' },
+        { name: 'updatedate', type: 'date' },
+        { name: 'pd_text1', type: 'string' },
+        { name: 'pd_text2', type: 'string' },
+        { name: 'pd_text3', type: 'string' },
+        { name: 'pd_text4', type: 'string' },
+        { name: 'pd_text5', type: 'string' }
+    ]
+});

frontend/saas-web/app/view/core/baseform/FormPanel.js

@@ -12,6 +12,7 @@ Ext.define('saas.view.core.baseform.FormPanel', {
     layout: 'column',
     autoScroll: true,
     border: 1,
+    bodyPadding: 5,
     searchField:[],
 
     fieldDefaults: {

frontend/saas-web/app/view/document/customer/list/FormPanel.js

@@ -4,15 +4,6 @@ Ext.define('saas.view.document.customer.list.FormPanel', {
     controller: 'customer-list-formpanel',
     viewModel: 'customer-list-formpanel',
 
-    //工具类
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-
-    //基础属性
-    layout: 'fit',
-    autoScroll: true,
-    border: 1,
-
     fieldDefaults: {
         margin: '0 5 5 0',
         labelAlign: 'right',

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

@@ -11,16 +11,23 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     //字段属性
     _title: '付款单',
     _idField: 'id',
-    _codeField: 'pd_code',
-    _statusField: 'pd_status',
-    _statusCodeField: 'pd_statuscode',
+    _codeField: 'pb_code',
+    _statusField: 'pb_status',
+    _statusCodeField: 'pb_statuscode',
+    
+    // _readUrl: basePath + 'money/paybalance/read/',
+    // _saveUrl: basePath + 'money/paybalance/save/',
+    // _auditUrl: basePath + 'money/paybalance/audit/',
+    // _deleteUrl: basePath + 'money/paybalance/delete/',
+    // _deleteDetailUrl: basePath + 'money/paybalance/deleteItem/',
+
+    _readUrl: 'http://192.168.253.129:8940/money/paybalance/read/',
+    _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
+    _auditUrl: 'http://192.168.253.129:8940/money/paybalance/audit/',
+    _unAuditUrl: 'http://192.168.253.129:8940/money/paybalance/unAudit/',
+    _deleteUrl: 'http://192.168.253.129:8940/money/paybalance/delete/',
+    _deleteDetailUrl: 'http://192.168.253.129:8940/money/paybalance/deleteItem/',
     
-    _readUrl: basePath + 'money/paybalance/read/',
-    _saveUrl: basePath + 'money/paybalance/save',
-    _auditUrl: basePath + 'money/paybalance/audit',
-    _deleteUrl: basePath + 'money/paybalance/delete/',
-    _deleteDetailUrl: basePath + 'money/paybalance/deleteItem/',
-    _turnInUrl: basePath + 'money/paybalance/turnProdin/',
     initId: 0,
 
     toolBtns: [],
@@ -81,33 +88,56 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         fieldLabel: '已核销金额'
     }, {
         xtype: "detailGridField",
-        storeModel: 'saas.model.purchase.purchasedetail',
-        detnoColumn: 'pd_detno',
+        storeModel: 'saas.model.money.PayBalance1',
+        detnoColumn: 'pb_detno',
         columns: [{
-            text: '资金账户',
-            dataIndex: 'pd_bankname'
+            text: 'ID',
+            dataIndex: 'id',
+            hidden: true
+        }, {
+            text: '期间',
+            dataIndex: 'pb_ym'
+        }, {
+            text: '结算账户ID',
+            dataIndex: 'pb_bankid'
+        }, {
+            text: '结算账户编号',
+            dataIndex: 'paybalancedet'
+        }, {
+            text: '结算账户',
+            dataIndex: 'pb_bankname'
         }, {
             text: "付款金额",
-            dataIndex: "pd_amount",
+            dataIndex: "pb_amount",
         }, {
             text: "结算方式",
-            dataIndex: "pd_paymethod"
+            dataIndex: "pb_paymethod"
         }, {
             text: "结算号",
-            dataIndex: "pd_paycode"
+            dataIndex: "pb_paycode"
         }, {
             text: "备注",
-            dataIndex: "pd_remark"
+            dataIndex: "pb_remark"
         }]
     }, {
         xtype: "detailGridField",
-        storeModel: 'saas.model.purchase.purchasedetail',
+        storeModel: 'saas.model.money.PayBalance2',
         detnoColumn: 'pbd_detno',
         columns: [{
-            text: '来源单号',
+            text: 'ID',
+            dataIndex: 'id',
+            hidden: true
+        }, {
+            text: '期间',
+            dataIndex: 'pbd_ym'
+        }, {
+            text: '来源ID',
+            dataIndex: 'pbd_slid'
+        }, {
+            text: '源单编号',
             dataIndex: 'pbd_slcode'
         }, {
-            text: "业务类型",
+            text: "单据类型",
             dataIndex: "pbd_slkind",
         }, {
             text: "单据日期",
@@ -116,14 +146,17 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: "单据金额",
             dataIndex: "pbd_amount"
         }, {
-            text: "已核销金额",
-            dataIndex: "pd_remark"
-        }, {
-            text: "未核销金额",
-            dataIndex: "pd_remark"
-        }, {
+        //     text: "已核销金额",
+        //     dataIndex: "pb_remark"
+        // }, {
+        //     text: "未核销金额",
+        //     dataIndex: "pb_remark"
+        // }, {
             text: "本次核销金额",
             dataIndex: "pbd_nowbalance"
+        }, {
+            text: '备注',
+            dataIndex: 'pbd_remark'
         }]
     }, {
         xtype: 'textareafield',
@@ -162,7 +195,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "hidden",
         readOnly: true,
         editable: false,
-        name: "pd_statuscode",
+        name: "pb_statuscode",
         fieldLabel: "单据状态码"
     }, {
         xtype: 'textfield',

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -5,56 +5,54 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
-                beforerender:function(f){
-                    f.addHandler=me.addCombo;
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendcode]':{
+            'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/list',
+                        //数据接口
+                        dataUrl: 'http://192.168.253.31:9480/customer/list',
+                        //赋值 
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+                            from: 'id', to: 'rb_custid'
+                        }, {
+                            from:'cu_code', to:'rb_custcode'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'cu_name', to:'rb_custname'
                         }],
+                        //联想设置
                         dbtpls:[{
-                            field:'ve_code',width:100
+                            field:'cu_code',width:100
                         },{
-                            field:'ve_name',width:100
+                            field:'cu_name',width:100
+                        }],
+                        //联想查询条件
+                        dbCondition:"CONCAT(cu_code, cu_name) like '{0}%'",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "cu_name", 
+                            conditionExpression:"cu_name like '{0}%'",//传入后台条件  替换占位符
+                            fieldLabel : "客户名称", 
+                            columnWidth : 0.25
                         }],
+                        //放大镜窗口列表
                         dbColumns:[{
-                            conditionCode:'ve_id',
-                            "text": "供应商ID",
+                            "text": "ID",
                             "flex": 0,
-                            "dataIndex": "ve_id",
+                            "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
-                            "dataIndex": "ve_code",
+                            "dataIndex": "cu_code",
                             "width": 100,
                             "xtype": "",
                             "items": null
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'ve_type',
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
+                            "dataIndex": "cu_name",
                             "xtype": "",
                             "items": null
                         }]
@@ -62,52 +60,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            }
         });
 
     },

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -8,181 +8,69 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
     viewName: 'money-paybalance-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'pu_id',
-        bind: '{pu_id}',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'pu_id=' + value;
-        }
-    }, {
         xtype: 'textfield',
-        name: 'pu_code',
-        bind: '{pu_code}',
+        name: 'pb_code',
         fieldLabel: '单据编号'
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_date',
-        bind: '{pu_date}',
-        fieldLabel: '采购日期',
-        columnWidth: 0.5,
-        operation: 'between'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'pu_vendcode',
-        bind: '{pu_vendcode}',
-        fieldLabel: '供应商编号'
-    }, {
-        xtype: 'textfield',
-        name: 'pu_vendname',
-        bind: '{pu_vendname}',
-        fieldLabel: '供应商名称'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
-        fieldLabel: '物料编号',
-        showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pr_detail',
-        bind: '{pr_detail}',
-        fieldLabel: '物料名称',
-        showDetail: true
-    }, {
-        xtype: 'combobox',
-        name: 'pu_statuscode',
-       // bind: '{pu_statuscode}',
-        fieldLabel: '审核状态',
-        queryMode: 'local',
-        displayField: 'pu_status',
-        valueField: 'pu_statuscode',
-        editable:false,
-        store: Ext.create('Ext.data.ArrayStore', {
-        fields: ['pu_statuscode', 'pu_status'],
-        data: [
-            ["$ALL", "全部"],
-            ["AUDITED", "已审核"],
-            ["UNAUDITED", "未审核"]
-        ]
-        })
-    }, {
-        xtype: 'multicombo',
-        name: 'pu_acceptstatuscode',
-        bind: '{pu_acceptstatuscode}',
-        fieldLabel: '入库状态',
-        datas: [
-            ["TURNIN", "已入库"],
-            ["UNTURNIN", "未入库"],
-            ["PARTIN", "部分入库"]
-        ]
-    }],
-    moreQueryFormItems: [{
-        xtype: 'textfield',
-        name: 'pu_buyername',
-        bind: '{pu_buyername}',
-        fieldLabel: '采购员'
-    }, {
-        xtype: 'textfield',
-        name: 'pu_total',
-        bind: '{pu_total}',
-        fieldLabel: '金额'
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_delivery',
-        bind: '{pu_delivery}',
-        fieldLabel: '交货日期',
-        columnWidth: 1
     }],
+    moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'pu_id',
-        codeField: 'pu_code',
-        addTitle: '采购单',
-        addXtype: 'purchase-purchase-formpanel',
+        idField: 'id',
+        codeField: 'pb_code',
+        addTitle: '付款单',
+        addXtype: 'money-paybalance-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath + 'purchase/',
+        // baseVastUrl: basePath + 'money/paybalance/',
+        baseVastUrl: 'http://192.168.253.129:8940/money/paybalance/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'pu_code',
-            width: 120
-        }, {
-            text: '单据状态',
-            dataIndex: 'pu_status',
-            width: 120
-        }, {
-            text: '下单日期',
-            dataIndex: 'pu_indate',
-            xtype: 'datecolumn',
-            width: 200
-        }, {
-            text: '供应商名称',
-            dataIndex: 'pu_vendname',
-            width: 120
-        }, {
-            text: '含税金额',
-            dataIndex: 'pu_taxtotal',
-            xtype: 'numbercolumn',
+            dataIndex: 'pb_code',
             width: 120
         }, {
-            text: '金额',
-            dataIndex: 'pu_total',
-            xtype: 'numbercolumn',
-            width: 120,
-            flex: 1
-        }],
-        relativeColumn: [{
-            text: 'id',
-            dataIndex: 'pu_id',
-            width: 100,
-            xtype: 'numbercolumn'
-        }, {
-            text: '单据编号',
-            dataIndex: 'pu_code',
+            text: '状态',
+            dataIndex: 'pb_status',
             width: 120
         }, {
-            text: '单据状态',
-            dataIndex: 'pu_status',
+            text: '日期',
+            dataIndex: 'pb_date',
             width: 120
         }, {
-            text: '下单日期',
-            dataIndex: 'pu_indate',
-            xtype: 'datecolumn',
+            text: '供应商编号',
+            dataIndex: 'pb_vendcode',
             width: 200
         }, {
             text: '供应商名称',
-            dataIndex: 'pu_vendname',
+            dataIndex: 'pb_vendname',
             width: 120
         }, {
-            text: '采购序号',
-            dataIndex: 'pd_detno',
-            xtype: 'numbercolumn',
+            text: '收款人',
+            dataIndex: 'pb_manname',
             width: 120
         }, {
-            text: '物料编号',
-            dataIndex: 'pd_prodcode',
+            text: '付款金额',
+            dataIndex: 'pb_pdamount',
             width: 120
         }, {
-            text: '数量',
-            dataIndex: 'pd_qty',
-            xtype: 'numbercolumn',
-            width: 120
+            text: '本次核销金额',
+            dataIndex: 'pb_pbdamount',
+            width: 120,
         }, {
-            text: '单价',
-            dataIndex: 'pd_price',
-            xtype: 'numbercolumn',
-            width: 120
+            text: '本次预付款',
+            dataIndex: 'pb_preamount',
+            width: 120,
         }, {
-            text: '已转数',
-            dataIndex: 'pd_ytqy',
-            xtype: 'numbercolumn',
+            text: '整单折扣',
+            dataIndex: 'pb_discounts',
             width: 120,
-            flex: 1
-        }]
+        }, {
+            text: '已核销金额',
+            dataIndex: 'pb_havebalance',
+            width: 120,
+        }],
+        relativeColumn: []
     }
 });