Merge remote-tracking branch 'origin/dev' into dev

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

@@ -0,0 +1,24 @@
+Ext.define('saas.model.money.FundTransfer', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'ftd_id', type: 'int' },
+        { name: 'ftd_ftid', type: 'int' },
+        { name: 'ftd_detno', type: 'int' },
+        { name: 'ftd_ym', type: 'int' },
+        { name: 'ftd_bankid', type: 'int' },
+        { name: 'ftd_bankcode', type: 'string' },
+        { name: 'ftd_bankname', type: 'string' },
+        { name: 'ftd_inbankid', type: 'int' },
+        { name: 'ftd_inbankcode', type: 'string' },
+        { name: 'ftd_inbankname', type: 'string' },
+        { name: 'ftd_nowbalance', type: 'float' },
+        { name: 'ftd_paymethod', type: 'string' },
+        { name: 'ftd_paycode', type: 'string' },
+        { name: 'ftd_remark', type: 'string' },
+        { name: 'ftd_text1', type: 'string' },
+        { name: 'ftd_text2', type: 'string' },
+        { name: 'ftd_text3', type: 'string' },
+        { name: 'ftd_text4', type: 'string' },
+        { name: 'ftd_text5', type: 'string' },
+    ]
+});

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

@@ -0,0 +1,173 @@
+Ext.define('saas.view.money.fundtransfer.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'money-fundtransfer-formpanel',
+
+    controller: 'money-fundtransfer-formpanel',
+    viewModel: 'money-fundtransfer-formpanel',
+
+    viewName: 'money-fundtransfer-formpanel',
+    caller:'FundTransfer',
+    
+     //字段属性
+     _title:'其它收入单',
+     _idField: 'id',
+     _codeField: 'ft_code',
+     _statusField: 'ft_status',
+     _statusCodeField: 'ft_statuscode',
+     _relationColumn: 'ftd_ftid',
+     _readUrl:basePath+'money/fundtransfer/read/',
+     _saveUrl:basePath+'money/fundtransfer/save',
+     _deleteUrl:basePath+'money/fundtransfer/delete/',
+     initId:0,
+
+    defaultItems: [{
+        xtype: 'hidden',
+        name: 'id',
+        fieldLabel: 'id'
+    }, {
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "ft_date", 
+        fieldLabel : "单据日期"
+    }, {
+        name : "detailGridField", 
+        xtype : "detailGridField", 
+        storeModel:'saas.model.money.FundTransfer',
+        detnoColumn:  'ftd_detno',
+        _deleteDetailUrl:basePath+'fundtransfer/deleteItem/',
+        columnWidth : 1,
+        columns : [
+            {
+                text : "id", 
+                dataIndex : "id", 
+                xtype : "numbercolumn",
+                width:0
+            }, {
+                text : "期间", 
+                dataIndex : "ftd_ym ", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                items : null
+            }, {
+                text : "转出账户ID", 
+                dataIndex : "ftd_bankid", 
+                width : 0
+            }, {
+                text : "转出账户编号", 
+                dataIndex : "ftd_bankcode", 
+                width : 0
+            }, {
+                text : "转出账户", 
+                width : 200.0, 
+                dataIndex : "ftd_bankname", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            }, {
+                text : "转入账户ID", 
+                dataIndex : "ftd_inbankid", 
+                width : 0
+            }, {
+                text : "转入账户编号", 
+                dataIndex : "ftd_inbankcode", 
+                width : 0
+            }, {
+                text : "转入账户", 
+                width : 200.0, 
+                dataIndex : "ftd_inbankname", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            }, {
+                text : "金额", 
+                dataIndex : "ftd_nowbalance", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                format:'0',
+                items : null,
+                summaryType: 'sum'
+            }, {
+                text : "结算方式号", 
+                dataIndex : "ftd_paycode", 
+                width : 0
+            }, {
+                text : "结算方式", 
+                width : 200.0, 
+                dataIndex : "ftd_paymethod", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            }, {
+                text : "备注", 
+                dataIndex : "ftd_remark",
+                width : 120.0, 
+                items : null,
+                ignore:true,
+                flex : 1.0,
+                editor : {
+                    xtype : ""
+                }
+            }
+        ]
+    },{
+        xtype : "textfield", 
+        name : "ft_remark", 
+        fieldLabel : "备注", 
+        allowBlank : true, 
+        columnWidth : 0.75
+    }, {
+        xtype : "textfield", 
+        name : "ft_recorder", 
+        fieldLabel : "录入人", 
+        readOnly:true
+    }, {
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "ft_recorddate", 
+        fieldLabel : "录入日期",
+        readOnly:true
+    }
+    ]
+});

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

@@ -0,0 +1,100 @@
+Ext.define('saas.view.money.fundtransfer.FormPanelController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.money-fundtransfer-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=ftd_bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/bankinformation/list',
+                        dbfinds:[
+                        {
+                            from:'bk_bankcode',to:'ftd_bankcode'
+                        },{
+                            from:'bk_bankname',to:'ftd_bankname'
+                        },{
+                            from:'id',to:'ftd_bankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": ""
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": ""
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": ""
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": ""
+                        }]
+                    }) ;   
+
+                }
+            },
+            'dbfindtrigger[name=ftd_inbankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/bankinformation/list',
+                        dbfinds:[
+                        {
+                            from:'bk_bankcode',to:'ftd_inbankcode'
+                        },{
+                            from:'bk_bankname',to:'ftd_inbankname'
+                        },{
+                            from:'id',to:'ftd_inbankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": ""
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": ""
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": ""
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": ""
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+    }
+});

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

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.fundtransfer.FormPanelModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.money-fundtransfer-formpanel',
+
+});

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

@@ -0,0 +1,88 @@
+Ext.define('saas.view.money.fundtransfer.QueryPanel', {
+    extend: 'saas.view.core.query.QueryPanel',
+    xtype: 'money-fundtransfer-querypanel',
+
+    controller: 'money-fundtransfer-querypanel',
+    viewModel: 'money-fundtransfer-querypanel',
+
+    viewName: 'money-fundtransfer-querypanel',
+    
+    queryFormItems: [{
+        xtype: 'hidden',
+        name: 'or_id',
+        fieldLabel: 'ID',
+        allowBlank: true,
+        columnWidth: 0
+    }, {
+        xtype : 'hidden',
+        name : 'or_custid', 
+        fieldLabel : '客户ID'
+   }, {
+        xtype: 'hidden',
+        name: 'or_custcode',
+        fieldLabel: '客户编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'or_custname',
+        fieldLabel: '客户名称'
+    }, {
+        xtype : 'hidden',
+        name : 'or_bankid', 
+        fieldLabel : '账户ID'
+     }, {
+        xtype: 'hidden',
+        name: 'or_bankcode',
+        fieldLabel: '账户编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'or_bankname',
+        fieldLabel: '账户名称'
+    }],
+    moreQueryFormItems: [],
+    queryGridConfig: {
+        idField: 'or_id',
+        codeField: 'or_code',
+        addTitle: '其它收入单',
+        addXtype: 'money-fundtransfer-formpanel',
+        defaultCondition:'',
+        baseVastUrl: basePath+'money/fundtransfer/',
+        baseColumn: [{
+            text: 'id',
+            dataIndex: 'or_id',
+            width: 0,
+            xtype: 'numbercolumn'
+        }, {
+            text: '单据编号',
+            dataIndex: 'or_code',
+            width: 120
+        }, {
+            text: '单据状态',
+            dataIndex: 'or_status',
+            width: 120
+        }, {
+            text: '录入人',
+            dataIndex: 'or_recorder',
+            width: 120
+        }, {
+            text: '单据日期',
+            dataIndex: 'or_date',
+            xtype: 'datecolumn',
+            width: 200
+        }, {
+            text: '客户名称',
+            dataIndex: 'or_custname',
+            width: 120
+        }, {
+            text: '金额',
+            dataIndex: 'or_amount',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'or_remark',
+            width: 250,
+            flex: 1
+        }],
+        relativeColumn: []
+    }
+});

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

@@ -0,0 +1,11 @@
+Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
+    extend: 'saas.view.core.query.QueryPanelController',
+    alias: 'controller.money-fundtransfer-querypanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+           
+        });
+
+    }
+});

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

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.fundtransfer.QueryPanelModel', {
+    extend: 'saas.view.core.query.QueryPanelModel',
+    alias: 'viewmodel.money-fundtransfer-querypanel'
+
+});

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

@@ -6,7 +6,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
     viewModel: 'money-othreceipts-formpanel',
 
     viewName: 'money-othreceipts-formpanel',
-    caller:'Othreceipts',
+    caller:'OthReceipts',
     
      //字段属性
      _title:'其它收入单',
@@ -14,11 +14,10 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _codeField: 'or_code',
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
-     
      _relationColumn: 'ord_orid',
      _readUrl:basePath+'money/othreceipts/read/',
      _saveUrl:basePath+'money/othreceipts/save',
-     _deleteUrl:basePath+'money/othreceipts/delete/',
+     _deleteUrl:basePath+'money/othreceipts/delete/', 
      initId:0,
 
     defaultItems: [{
@@ -54,7 +53,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
         detnoColumn:  'ord_detno',
-        _deleteDetailUrl:basePath+'money/deleteItem/',
+       _deleteDetailUrl:basePath+'othreceipts/deleteItem/',
         columnWidth : 1,
         columns : [
             {
@@ -96,8 +95,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                         }
                     },
                     addHandler:function(b){
-                        //this.ownerCmp.etc['inoutkind'],
-                        var form = this.ownerCmp.ownerCt;
+                        var form = this.ownerCmp.ownerCt.ownerCmp.ownerCt;
                         this.dialog = form.getController().getView().add({
                             xtype: 'document-kind-childwin',
                             bind: {
@@ -141,6 +139,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 items : null,
                 ignore:true,
                 flex : 1.0,
+                editor : {
+                    xtype : ""
+                }
             }
         ]
     }, {

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

@@ -45,7 +45,8 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addTitle: '其它收入单',
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'money/othreceipts/',
+       // baseVastUrl: basePath+'money/othreceipts/',
+        baseVastUrl: 'http://192.168.253.129:8940/othreceipts/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'or_id',

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

@@ -53,7 +53,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othspendings',
         detnoColumn:  'osd_detno',
-        _deleteDetailUrl:basePath+'money/othreceipts/deleteItem/',
+        _deleteDetailUrl:basePath+'money/othspendings/deleteItem/',
         columnWidth : 1,
         columns : [
             {
@@ -95,7 +95,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                         }
                     },
                     addHandler:function(b){
-                        var form = this.ownerCmp.ownerCt;
+                        var form = this.ownerCmp.ownerCt.ownerCmp.ownerCt;
                         this.dialog = form.getController().getView().add({
                             xtype: 'document-kind-childwin',
                             bind: {

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -169,6 +169,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 width : 120.0, 
                 items : null,
                 ignore:true,
+                editor : {
+                    xtype : ""
+                },
                 flex : 1.0,
             }
         ]
@@ -197,6 +200,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "datefield", 
         name : "sa_recorddate", 
         fieldLabel : "录入日期",
+        defaultValue:new Date(),
         readOnly:true
     }, {
         xtype : "textfield",