文件命名调整

frontend/saas-web/app/view/main/Navigation.js

@@ -325,7 +325,8 @@ Ext.define('saas.view.main.Navigation', {
     },
 
     showNavMenu: function (view, record, item, index, e, eOpts) {
-        var recData = record.data,
+        var me = this,
+            recData = record.data,
             menuItems = recData.items || [],
             itemBox = item.getBoundingClientRect(),
             pos = [itemBox.left + itemBox.width, itemBox.top],
@@ -395,15 +396,15 @@ Ext.define('saas.view.main.Navigation', {
                             Ext.Array.each(menuItemText, function (item) {
                                 item.addEventListener('click', function (e) {
                                     var target = e.target,
-                                    dataset = target.dataset,
-                                    viewType = dataset.viewtype,
-                                    type = dataset.type,
-                                    text = dataset.text,
-                                    id = dataset.id;
+                                        dataset = target.dataset,
+                                        viewType = dataset.viewtype,
+                                        type = dataset.type,
+                                        text = dataset.text,
+                                        id = dataset.id;
 
                                     var tabTitle = text + (type == 'form' ? '' : '查询'),
-                                    tabId = 'maintab-' + type + '-' + id;
-        
+                                        tabId = 'maintab-' + type + '-' + id;
+
                                     openTab(viewType, tabTitle, tabId);
                                     menu.hide();
                                 });
@@ -411,15 +412,15 @@ Ext.define('saas.view.main.Navigation', {
                             Ext.Array.each(menuItemIcon, function (item) {
                                 item.addEventListener('click', function (e) {
                                     var target = e.target,
-                                    dataset = target.dataset,
-                                    viewType = dataset.viewtype,
-                                    type = dataset.type,
-                                    text = dataset.text,
-                                    id = dataset.id;
+                                        dataset = target.dataset,
+                                        viewType = dataset.viewtype,
+                                        type = dataset.type,
+                                        text = dataset.text,
+                                        id = dataset.id;
 
                                     var tabTitle = text + (type == 'form' ? '' : '查询'),
-                                    tabId = 'maintab-' + type + '-' + id;
-        
+                                        tabId = 'maintab-' + type + '-' + id;
+
                                     openTab(viewType, tabTitle, tabId);
                                     menu.hide();
                                 });

frontend/saas-web/app/view/purchase/list/GridPanel.js

@@ -1,9 +0,0 @@
-Ext.define('saas.view.purchase.list.GridPanel', {
-    extend: 'saas.view.core.grid.GridPanel',
-    xtype: 'purchase-list-gridpanel',
-
-    controller: 'purchase-list-listcontroller',
-    
-    configUrl: 'resources/json/gridColumns1.json',
-    dataUrl: 'resources/json/gridData1.json'
-});

frontend/saas-web/app/view/purchase/list/GridPanel1.js

@@ -1,9 +0,0 @@
-Ext.define('saas.view.purchase.list.GridPanel1', {
-    extend: 'saas.view.core.grid.GridPanel',
-    xtype: 'purchase-list-gridpanel1',
-
-    controller: 'purchase-list-listcontroller1',
-    
-    configUrl: 'resources/json/gridColumns1.json',
-    dataUrl: 'resources/json/gridData1.json'
-});

frontend/saas-web/app/view/purchase/list/GridPanel2.js

@@ -1,9 +0,0 @@
-Ext.define('saas.view.purchase.list.GridPanel2', {
-    extend: 'saas.view.core.grid.GridPanel',
-    xtype: 'purchase-list-gridpanel2',
-
-    controller: 'purchase-list-listcontroller2',
-    
-    configUrl: 'resources/json/gridColumns2.json',
-    dataUrl: 'resources/json/gridData2.json'
-});

frontend/saas-web/app/view/purchase/list/ListController.js

@@ -1,26 +0,0 @@
-Ext.define('saas.view.purchase.list.ListController', {
-    extend: 'saas.view.core.grid.GridPanelController',
-    alias: 'controller.purchase-list-listcontroller',
-
-    control: {
-        'grid': {
-            itemClick: function(view,record) {
-                console.log('grid1: click.....');
-                var id = record.get('id');
-                var mainTab = Ext.getCmp('main-tab-panel');
-                var title = '采购单明细',
-                existingItem = mainTab.down('[id=' + id + ']');
-
-                lastView = mainTab.getActiveTab();
-
-                if (!existingItem) {
-                    var form = Ext.create('saas.view.purchase.panel.FormPanel', {
-                        id,
-                        title
-                    });
-                    mainTab.setActiveTab(mainTab.add(form));
-                }
-            }
-        }
-    }
-});

frontend/saas-web/app/view/purchase/list/ListController1.js

@@ -1,12 +0,0 @@
-Ext.define('saas.view.purchase.list.ListController1', {
-    extend: 'saas.view.core.grid.GridPanelController',
-    alias: 'controller.purchase-list-listcontroller1',
-
-    control: {
-        'grid': {
-            itemClick: function() {
-                console.log('grid1: click.....');
-            }
-        }
-    },
-});

frontend/saas-web/app/view/purchase/list/ListController2.js

@@ -1,12 +0,0 @@
-Ext.define('saas.view.purchase.list.ListController2', {
-    extend: 'saas.view.core.grid.GridPanelController',
-    alias: 'controller.purchase-list-listcontroller2',
-
-    control: {
-        'grid': {
-            itemClick: function() {
-                console.log('grid2: click.....');
-            }
-        }
-    },
-});

frontend/saas-web/app/view/purchase/order/FormController.js

@@ -1,6 +0,0 @@
-Ext.define('saas.view.purchase.order.FormController', {
-    extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.purchase-order-formcontroller',
-
-
-});

frontend/saas-web/app/view/purchase/order/FormModel.js

@@ -1,15 +0,0 @@
-Ext.define('saas.view.purchase.order.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.purchase-order-formmodel',
-
-    data: {
-        num1:2,
-        id: 'TC-1032301'
-    },
-
-    formulas: {
-        sum: function(get) {
-            return get('num1') + get('num2');
-        }
-    }
-});

frontend/saas-web/app/view/purchase/order/FormPanel.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.purchase.order.FormPanel', {
-    extend: 'saas.view.core.form.FormPanel',
-    xtype: 'purchase-order-formpanel',
-
-    controller: 'purchase-order-formcontroller',
-    viewModel: 'purchase-order-formmodel',
-
-    configUrl: 'resources/json/formItems.json',
-
-});

frontend/saas-web/app/view/purchase/panel/FormPanel.js

@@ -1,22 +0,0 @@
-Ext.define('saas.view.purchase.panel.FormPanel', {
-    extend: 'saas.view.core.form.FormPanel',
-    xtype: 'purchase-panel-FormPanel',
-    controller: 'purchase-panel-FormPanelController',
-
-    frame: true,
-    resizable: true,
-    width: 610,
-    minWidth: 610,
-    minHeight: 300,
-
-    layout: 'column',
-
-    defaults: {
-        columnWidth:0.25,
-        xtype: 'textfield',
-        margin:'5'
-    },
-
-    configUrl: 'resources/json/purchase/formItems.json',
-
-});

frontend/saas-web/app/view/purchase/panel/FormPanelController.js

@@ -1,25 +0,0 @@
-Ext.define('saas.view.purchase.panel.FormPanelController', {
-    extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.purchase-panel-FormPanelController',
-
-    control: {
-        //放大镜赋值关系 以及 tpl模板
-        'dbfindtrigger[name=pu_vendorcode]':{
-            beforerender:function(f){
-                Ext.apply(f,{
-                    dbfinds:[{
-                        from:'pu_vendorcode',to:'pu_vendorcode'
-                    },{
-                        from:'pu_vendorname',to:'pu_vendorname'
-                    }],
-                    dbtpls:[{
-                        field:'pu_vendorcode',width:100
-                    },{
-                        field:'pu_vendorname',width:120
-                    }]
-                }) ;   
-
-            }
-        }
-    },
-});

frontend/saas-web/app/view/purchase/panel/GridPanel.js

@@ -1,11 +0,0 @@
-Ext.define('saas.view.purchase.grid.GridPanel', {
-    extend: 'saas.view.core.grid.GridPanel',
-    xtype: 'purchase-panel-GridPanel',
-
-    configUrl: 'resources/json/gridColumns1.json',
-    dataUrl: 'resources/json/gridData1.json',
-
-    frame:true,
-
-    margin:'3'
-});

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -5,7 +5,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     controller: 'purchase-purchase-querypanel',
     viewModel: 'purchase-purchase-querypanel',
 
-    viewName: 'purchase-purchase-formpanel',
+    viewName: 'purchase-purchase-querypanel',
     
     queryFormItems: [{
         xtype: 'hidden',

frontend/saas-web/app/view/purchase/purchaseIn/FormController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchasein.FormController', {
+Ext.define('saas.view.purchase.purchaseIn.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.purchase-purchasein-formcontroller',
     init: function (form) {

frontend/saas-web/app/view/purchase/purchaseIn/FormModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchasein.FormModel', {
+Ext.define('saas.view.purchase.purchaseIn.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.purchase-purchasein-formmodel',
     data: {

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchasein.FormPanel', {
+Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
     xtype: 'purchase-purchasein-formpanel',
 

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -1,12 +1,12 @@
-Ext.define('saas.view.purchase.purchasein.QueryPanel', {
+Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     extend: 'saas.view.core.query.QueryPanel',
     xtype: 'purchase-purchasein-querypanel',
 
     controller: 'purchase-purchasein-queryformcontroller',
     viewModel: 'purchase-purchasein-queryformmodel',
-    _baseVastUrl:'http://192.168.253.58:8800/purchase/',
-    _idField:'id',
-    _codeField:'pi_inoutno',
+
+    viewName: 'purchase-purchasein-querypanel',
+
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
@@ -100,13 +100,13 @@ Ext.define('saas.view.purchase.purchasein.QueryPanel', {
         columnWidth: 1
     }],
     queryGridConfig: {
-        _idField:'id',
-        _codeField:'pi_inoutno',
-        _title:'采购验收单',
-        _defaultCondition:' pi_class = \'采购验收单\'',
-        _addXtype:'purchase-purchasein-formpanel',
-        _baseVastUrl:'http://192.168.253.228:8800/prodinout/',
-        _baseColumn: [{
+        idField:'id',
+        codeField:'pi_inoutno',
+        addTitle:'采购验收单',
+        addXtype:'purchase-purchasein-formpanel',
+        defaultCondition:' pi_class = \'采购验收单\'',
+        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
@@ -152,7 +152,7 @@ Ext.define('saas.view.purchase.purchasein.QueryPanel', {
             width: 120,
             flex: 1
         }],
-        _relativeColumn: [{
+        relativeColumn: [{
             text : "序号", 
             dataIndex : "pd_pdno", 
             width : 100, 

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchasein.QueryPanelController', {
+Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
     extend: 'saas.view.core.query.QueryPanelController',
     alias: 'controller.purchase-purchasein-queryformcontroller',
     init: function (form) {

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchasein.QueryPanelModel', {
+Ext.define('saas.view.purchase.purchaseIn.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
     alias: 'viewmodel.purchase-purchasein-queryformmodel'
 

frontend/saas-web/app/view/purchase/purchaseOut/FormController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchaseout.FormController', {
+Ext.define('saas.view.purchase.purchaseOut.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.purchase-purchaseout-formcontroller',
     init: function (form) {

frontend/saas-web/app/view/purchase/purchaseOut/FormModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchaseout.FormModel', {
+Ext.define('saas.view.purchase.purchaseOut.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.purchase-purchaseout-formmodel',
     data: {

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchaseout.FormPanel', {
+Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
     xtype: 'purchase-purchaseout-formpanel',
 

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -1,12 +1,12 @@
-Ext.define('saas.view.purchase.purchaseout.QueryPanel', {
+Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     extend: 'saas.view.core.query.QueryPanel',
     xtype: 'purchase-purchaseout-querypanel',
 
     controller: 'purchase-purchaseout-queryformcontroller',
     viewModel: 'purchase-purchaseout-queryformmodel',
-    _baseVastUrl:'http://192.168.253.58:8800/purchase/',
-    _idField:'id',
-    _codeField:'pi_inoutno',
+
+    viewName: 'purchase-purchaseout-querypanel',
+
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
@@ -100,13 +100,13 @@ Ext.define('saas.view.purchase.purchaseout.QueryPanel', {
         columnWidth: 1
     }],
     queryGridConfig: {
-        _idField:'id',
-        _codeField:'pi_inoutno',
-        _title:'采购验退单',
-        _defaultCondition:' pi_class = \'采购验退单\'',
-        _addXtype:'purchase-purchaseout-formpanel',
-        _baseVastUrl:'http://192.168.253.228:8800/prodinout/',
-        _baseColumn: [{
+        idField:'id',
+        codeField:'pi_inoutno',
+        addTitle:'采购验退单',
+        addXtype:'purchase-purchaseout-formpanel',
+        defaultCondition:' pi_class = \'采购验退单\'',
+        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
@@ -152,7 +152,7 @@ Ext.define('saas.view.purchase.purchaseout.QueryPanel', {
             width: 120,
             flex: 1
         }],
-        _relativeColumn: [{
+        relativeColumn: [{
             text : "序号", 
             dataIndex : "pd_pdno", 
             width : 100, 

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchaseout.QueryPanelController', {
+Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
     extend: 'saas.view.core.query.QueryPanelController',
     alias: 'controller.purchase-purchaseout-queryformcontroller',
     init: function (form) {

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchaseout.QueryPanelModel', {
+Ext.define('saas.view.purchase.purchaseOut.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
     alias: 'viewmodel.purchase-purchaseout-queryformmodel'
 });

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

@@ -4,9 +4,9 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
 
     controller: 'sale-sale-querypanel',
     viewModel: 'sale-sale-querypanel',
-    viewName: 'sale-sale-formpanel',
-    _idField: 'sa_id',
-    _codeField: 'sa_code',
+
+    viewName: 'sale-sale-querypanel',
+    
     queryFormItems: [{
         xtype: 'hidden',
         name: 'sa_id',
@@ -98,13 +98,13 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         allowBlank: true
     }],
     queryGridConfig: {
-        _idField: 'sa_id',
-        _codeField: 'sa_code',
-        _title: '销售订单',
-        _defaultCondition:'',
-        _addXtype: 'sale-sale-formpanel',
-        _baseVastUrl: 'http://192.168.0.181:8560/api/sale/sale/',
-        _baseColumn: [{
+        idField: 'sa_id',
+        codeField: 'sa_code',
+        addTitle: '销售订单',
+        addXtype: 'sale-sale-formpanel',
+        defaultCondition:'',
+        baseVastUrl: 'http://192.168.0.181:8560/api/sale/sale/',
+        baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
@@ -136,7 +136,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             xtype: 'numbercolumn',
             width: 120
         }],
-        _relativeColumn: [{
+        relativeColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'

frontend/saas-web/app/view/sale/saleIn/FormController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.sale.salein.FormController', {
+Ext.define('saas.view.sale.saleIn.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.sale-salein-formcontroller',
     init: function (form) {

frontend/saas-web/app/view/sale/saleIn/FormModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.sale.salein.FormModel', {
+Ext.define('saas.view.sale.saleIn.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.sale-salein-formmodel',
     data: {

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

@@ -1,4 +1,4 @@
-Ext.define('saas.view.sale.salein.FormPanel', {
+Ext.define('saas.view.sale.saleIn.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
     xtype: 'sale-salein-formpanel',
 

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -1,12 +1,12 @@
-Ext.define('saas.view.sale.salein.QueryPanel', {
+Ext.define('saas.view.sale.saleIn.QueryPanel', {
     extend: 'saas.view.core.query.QueryPanel',
     xtype: 'sale-salein-querypanel',
 
     controller: 'sale-salein-queryformcontroller',
     viewModel: 'sale-salein-queryformmodel',
-    _baseVastUrl:'http://192.168.253.58:8800/salein/',
-    _idField:'id',
-    _codeField:'pi_inoutno',
+
+    viewName: 'sale-salein-querypanel',
+
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
@@ -81,13 +81,13 @@ Ext.define('saas.view.sale.salein.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        _idField:'id',
-        _codeField:'pi_inoutno',
-        _title:'销售出货单',
-        _defaultCondition:' pi_class = \'销售出货单\'',
-        _addXtype:'purchase-purchaseIn-formpanel',
-        _baseVastUrl:'http://192.168.253.228:8800/prodinout/',
-        _baseColumn: [{
+        idField:'id',
+        codeField:'pi_inoutno',
+        addTitle:'销售出货单',
+        addXtype:'purchase-purchaseIn-formpanel',
+        defaultCondition:' pi_class = \'销售出货单\'',
+        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
@@ -133,7 +133,7 @@ Ext.define('saas.view.sale.salein.QueryPanel', {
             width: 120,
             flex: 1
         }],
-        _relativeColumn: [{
+        relativeColumn: [{
             text : "序号", 
             dataIndex : "pd_pdno", 
             width : 100, 

frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.sale.salein.QueryPanelController', {
+Ext.define('saas.view.sale.saleIn.QueryPanelController', {
     extend: 'saas.view.core.query.QueryPanelController',
     alias: 'controller.sale-salein-queryformcontroller',
     init: function (form) {

frontend/saas-web/app/view/sale/saleIn/QueryPanelModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.sale.salein.QueryPanelModel', {
+Ext.define('saas.view.sale.saleIn.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
     alias: 'viewmodel.sale-salein-queryformmodel'
 

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

@@ -4,6 +4,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
 
     controller: 'sale-saleout-formcontroller',
     viewModel: 'sale-saleout-formmodel',
+
+    viewName: 'sale-saleout-formpanel',
     
     caller:'saleOut',
     

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -4,9 +4,9 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
 
     controller: 'sale-saleout-queryformcontroller',
     viewModel: 'sale-saleout-queryformmodel',
-    _baseVastUrl:'http://192.168.253.58:8800/sale/',
-    _idField:'id',
-    _codeField:'pi_inoutno',
+    
+    viewName: 'sale-saleout-querypanel',
+
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
@@ -81,13 +81,13 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        _idField:'id',
-        _codeField:'pi_inoutno',
-        _title:'销售出货单',
-        _defaultCondition:' pi_class = \'销售出货单\'',
-        _addXtype:'sale-saleout-formpanel',
-        _baseVastUrl:'http://192.168.253.228:8800/prodinout/',
-        _baseColumn: [{
+        idField:'id',
+        codeField:'pi_inoutno',
+        addTitle:'销售出货单',
+        addXtype:'sale-saleout-formpanel',
+        defaultCondition:' pi_class = \'销售出货单\'',
+        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
@@ -133,7 +133,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 120,
             flex: 1
         }],
-        _relativeColumn: [{
+        relativeColumn: [{
             text : "序号", 
             dataIndex : "pd_pdno", 
             width : 100, 

frontend/saas-web/app/view/sale/salelist/FormController.js

@@ -1,5 +0,0 @@
-Ext.define('saas.view.sale.salelist.FormController', {
-    extend: 'saas.view.core.grid.GridPanelController',
-    alias: 'controller.saledetail',
-
-});

frontend/saas-web/app/view/sale/salelist/FormModel.js

@@ -1,12 +0,0 @@
-Ext.define('saas.view.sale.salelist.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.saledetail',
-
-    formulas: {
-        sum: {
-            get: function(get) {
-                return get('num1') + get('num2');
-            }
-        }
-    }
-});

frontend/saas-web/app/view/sale/salelist/GridController1.js

@@ -1,30 +0,0 @@
-Ext.define('saas.view.sale.salelist.GridController1', {
-    extend: 'saas.view.core.grid.GridPanelController',
-    alias: 'controller.salelist1',
-
-    control: {
-        'grid': {
-            itemClick: function() {
-                console.log('grid1: click.....');
-            }
-        }
-    },
-
-    onDecline: function() {
-        var me = this,
-            grid = me.getView();
-            tab = grid.tabComponent;
-        
-        var win = Ext.create('Ext.window.Window', {
-            title: 'Hello',
-            html: '1111111111111',
-            height: 200,
-            width: 400,
-            layout: 'fit',
-            renderTo: tab.getEl()
-        });
-
-        win.show();
-    },
-
-});

frontend/saas-web/app/view/sale/salelist/GridController2.js

@@ -1,14 +0,0 @@
-Ext.define('saas.view.sale.salelist.GridController2', {
-    extend: 'saas.view.core.grid.GridPanelController',
-    alias: 'controller.salelist2',
-
-    listen: {
-        component: {
-            'grid': {
-                itemClick: function() {
-                    console.log('grid2: click.....');
-                }
-            }
-        }
-    }
-});

frontend/saas-web/app/view/storage/prodInOutOtherIn/FormController.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.storage.prodInOutOtherIn.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.storage-prodInOutOtherIn-formcontroller',
+    alias: 'controller.storage-prodinoutotherin-formcontroller',
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/storage/prodInOutOtherIn/FormModel.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.storage.prodInOutOtherIn.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.storage-prodInOutOtherIn-formmodel',
+    alias: 'viewmodel.storage-prodinoutotherin-formmodel',
 
 });

frontend/saas-web/app/view/storage/prodInOutOtherIn/FormPanel.js

@@ -1,9 +1,9 @@
 Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'storage-prodInOutOtherIn-formpanel',
+    xtype: 'storage-prodinoutotherin-formpanel',
 
-    controller: 'storage-prodInOutOtherIn-formcontroller',
-    viewModel: 'storage-prodInOutOtherIn-formmodel',
+    controller: 'storage-prodinoutotherin-formcontroller',
+    viewModel: 'storage-prodinoutotherin-formmodel',
     
      //字段属性
      _title:'采购单',

frontend/saas-web/app/view/storage/prodInOutOtherIn/QueryPanel.js

@@ -2,12 +2,11 @@ Ext.define('saas.view.storage.prodInOutOtherIn.QueryPanel', {
     extend: 'saas.view.core.query.QueryPanel',
     xtype: 'storage-prodInOutOtherIn-querypanel',
 
-    controller: 'storage-prodInOutOtherIn-querypanel',
-    viewModel: 'storage-prodInOutOtherIn-querypanel',
-    viewName: 'storage-prodInOutOtherIn-formpanel',
-    _baseVastUrl: 'http://192.168.253.58:8800/purchase/',
-    _idField: 'pu_id',
-    _codeField: 'pu_code',
+    controller: 'storage-prodinoutotherin-querypanel',
+    viewModel: 'storage-prodinoutotherin-querypanel',
+
+    viewName: 'storage-prodinoutotherin-querypanel',
+
     queryFormItems: [{
         xtype: 'hidden',
         name: 'pu_id',
@@ -113,13 +112,13 @@ Ext.define('saas.view.storage.prodInOutOtherIn.QueryPanel', {
         columnWidth: 1
     }],
     queryGridConfig: {
-        _idField: 'pu_id',
-        _codeField: 'pu_code',
-        _title: '采购单',
-        _defaultCondition:'',
-        _addXtype: 'purchase-purchase-formpanel',
-        _baseVastUrl: 'http://localhost:8800/purchase/',
-        _baseColumn: [{
+        idField: 'pu_id',
+        codeField: 'pu_code',
+        addTitle: '采购单',
+        addXtype: 'purchase-purchase-formpanel',
+        defaultCondition:'',
+        baseVastUrl: 'http://localhost:8800/purchase/',
+        baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
@@ -157,7 +156,7 @@ Ext.define('saas.view.storage.prodInOutOtherIn.QueryPanel', {
             width: 120,
             flex: 1
         }],
-        _relativeColumn: [{
+        relativeColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'

frontend/saas-web/app/view/storage/prodInOutOtherIn/QueryPanelController.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.storage.prodInOutOtherIn.QueryPanelController', {
     extend: 'saas.view.core.query.QueryPanelController',
-    alias: 'controller.storage-prodInOutOtherIn-querypanel',
+    alias: 'controller.storage-prodinoutotherin-querypanel',
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/storage/prodInOutOtherIn/QueryPanelModel.js

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