文件命名结构调整

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

@@ -1,20 +1,19 @@
-Ext.define('saas.view.core.baseform.FormPanel', {
+Ext.define('saas.view.core.base.BasePanel', {
     extend: 'Ext.form.Panel',
-    xtype: 'core-baseform-formpanel',
-    controller: 'core-baseform-formpanel',
-    viewModel: 'core-baseform-formpanel',
+    xtype: 'core-base-basepanel',
+    
+    controller: 'core-base-basepanel',
+    viewModel: 'core-base-basepanel',
 
     //工具类
     FormUtil: Ext.create('saas.util.FormUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     //基础属性
-    layout: 'column',
     autoScroll: true,
     border: 1,
     bodyPadding: 5,
-    searchField:[],
-
+    
     fieldDefaults: {
         margin: '0 5 5 0',
         labelAlign: 'right',
@@ -22,10 +21,18 @@ Ext.define('saas.view.core.baseform.FormPanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
+    
+    searchField:[],
+    gridColumns: [],
 
     initComponent: function() {
 
-        var me = this;
+        var me = this,
+        gridConfig = me.gridConfig,
+        gridDataUrl = gridConfig.dataUrl,
+        gridIdField = gridConfig.idField,
+        gridCodeField = gridConfig.codeField,
+        gridColumns = gridConfig.columns;
 
         Ext.apply(me, {
             dockedItems: [{
@@ -40,8 +47,15 @@ Ext.define('saas.view.core.baseform.FormPanel', {
                     text: '查询',
                     handler: 'query'
                 }])
+            }],
+            items: [{
+                xtype: 'core-baseform-gridpanel',
+                dataUrl: gridDataUrl,
+                idField: gridIdField,
+                codeField: gridCodeField,
+                columns: gridColumns
             }]
         });
         me.callParent(arguments);
-    }
+    },
 });

frontend/saas-web/app/view/core/baseform/FormPanelController.js → frontend/saas-web/app/view/core/base/BasePanelController.js

@@ -1,13 +1,13 @@
-Ext.define('saas.view.core.baseform.FormPanelController', {
+Ext.define('saas.view.core.base.BasePanelController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.core-baseform-formpanel',
+    alias: 'controller.core-base-basepanel',
 
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     FormUtil: Ext.create('saas.util.FormUtil'),
 
     query: function() {
         var form = this.view;
-        var grid = this.view.down('[name=baseGrid]');
+        var grid = form.down('core-baseform-gridpanel');
         grid.condition = '';
         var fields = form.searchField.map(f => f.name);
         var items = [];

frontend/saas-web/app/view/core/base/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.core.base.BasePanelModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.core-base-basepanel',
+});

frontend/saas-web/app/view/core/baseform/GridPanel.js → frontend/saas-web/app/view/core/base/GridPanel.js

@@ -1,17 +1,17 @@
-Ext.define('saas.view.core.baseform.GridPanel', {
+Ext.define('saas.view.core.base.GridPanel', {
     extend: 'Ext.grid.Panel',
-    xtype: 'core-baseform-gridpanel',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    dataUrl: '',
-    dbSearchFields: [],
-    condition:'',
+    xtype: 'core-base-gridpanel',
 
     selModel: {
         checkOnly:true,
         type:'checkboxmodel',
         mode : "MULTI" ,
         ignoreRightMouseSelection : false
-	},
+    },
+    
+    dataUrl: '',
+    dbSearchFields: [],
+    condition:'',
 
     initComponent: function() {
         var me = this;

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

@@ -1,4 +0,0 @@
-Ext.define('saas.view.core.baseform.FormPanelModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-baseform-formpanel',
-});

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -0,0 +1,16 @@
+Ext.define('saas.view.document.bom.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-bom-basepanel',
+
+    controller: 'document-bom-basepanel',
+    viewModel: 'document-bom-basepanel',
+
+    //字段属性
+    _title:'BOM资料',
+    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+    _saveUrl:basePath + 'document/vendor/save',
+    _deleteUrl:basePath + 'document/vendor/delete',
+
+
+
+});

frontend/saas-web/app/view/document/bom/BasePanelController.js

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.bom.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-bom-basepanel',
+    
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/bom/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.bom.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-bom-basepanel'
+});

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

@@ -1,15 +1,8 @@
 Ext.define('saas.view.document.customer.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'customer-list-formpanel',
-    controller: 'customer-list-formpanel',
-    viewModel: 'customer-list-formpanel',
-
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-customer-list-formpanel',
+    controller: 'document-customer-list-formpanel',
+    viewModel: 'document-customer-list-formpanel',
 
     searchField:[{
         xtype : "remotecombo", 
@@ -47,66 +40,52 @@ Ext.define('saas.view.document.customer.list.FormPanel', {
     }],
 
     //字段属性
-    _formXtype:'customer-panel-formpanel',
+    _formXtype:'document-customer-panel-formpanel',
     _title:'客户资料',
-    _dataUrl:basePath+'ducument/customer/list',
+    // _dataUrl:basePath+'ducument/customer/list',
     _batchOpenUrl:basePath+'ducument/customer/batchOpen',
     _batchCloseUrl:basePath+'ducument/customer/batchClose',
     _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
 
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 'cu_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "客户id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "客户编号", 
-                    width : 200.0, 
-                    dataIndex : "cu_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "客户名称", 
-                    dataIndex : "cu_name", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "客户状态", 
-                    dataIndex : "cu_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "客户UU", 
-                    dataIndex : "cu_uu", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认客户地址", 
-                    dataIndex : "ca_address", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认客户联系人", 
-                    dataIndex : "cc_name", 
-                    flex : 1.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
+    gridConfig: {
+        idField: 'id',
+        codeField: 'cu_code',
+        dataUrl: basePath+'ducument/customer/list',
+        columns : [{
+            text : "客户id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "客户编号", 
+            width : 200.0, 
+            dataIndex : "cu_code", 
+        }, 
+        {
+            text : "客户名称", 
+            dataIndex : "cu_name", 
+            width : 120.0, 
+        }, 
+        {
+            text : "客户状态", 
+            dataIndex : "cu_status", 
+            width : 120.0, 
+        }, 
+        {
+            text : "客户UU", 
+            dataIndex : "cu_uu", 
+            width : 120.0, 
+        }, 
+        {
+            text : "默认客户地址", 
+            dataIndex : "ca_address", 
+            width : 120.0, 
+        }, 
+        {
+            text : "默认客户联系人", 
+            dataIndex : "cc_name", 
+            flex : 1.0, 
+        }]
+    },
+
 });

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

@@ -1,8 +1,7 @@
 Ext.define('saas.view.document.customer.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.customer-list-formpanel',
+    extend: 'saas.view.core.base.FormPanelController',
+    alias: 'controller.document-customer-list-formpanel',
+
     init: function (form) {
         var me = this;
         this.control({

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

@@ -1,4 +1,4 @@
 Ext.define('saas.view.document.customer.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.customer-list-formpanel'
+    extend: 'saas.view.core.base.FormPanelModel',
+    alias: 'viewmodel.document-customer-list-formpanel'
 });

frontend/saas-web/app/view/document/customer/panel/FormController.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.document.customer.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.customer-panel-formpanel',
+    alias: 'controller.document-customer-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({});

frontend/saas-web/app/view/document/customer/panel/FormModel.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.document.customer.panel.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.customer-panel-formpanel',
+    alias: 'viewmodel.document-customer-panel-formpanel',
 
     
 });

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

@@ -1,9 +1,9 @@
 Ext.define('saas.view.document.customer.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'customer-panel-formpanel',
+    xtype: 'document-customer-panel-formpanel',
 
-    controller: 'customer-panel-formpanel',
-    viewModel: 'customer-panel-formpanel',
+    controller: 'document-customer-panel-formpanel',
+    viewModel: 'document-customer-panel-formpanel',
     
     caller:'Customer',
 

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

@@ -1,8 +1,8 @@
 Ext.define('saas.view.document.product.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'product-list-formpanel',
-    controller: 'product-list-formpanel',
-    viewModel: 'product-list-formpanel',
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-product-list-formpanel',
+    controller: 'document-product-list-formpanel',
+    viewModel: 'document-product-list-formpanel',
 
     //工具类
     FormUtil: Ext.create('saas.util.FormUtil'),
@@ -56,54 +56,46 @@ Ext.define('saas.view.document.product.list.FormPanel', {
     }],
 
     //字段属性
-    _formXtype:'product-panel-formpanel',
+    _formXtype:'document-product-panel-formpanel',
     _title:'物料资料',
-    _dataUrl:basePath + 'document/product/list',
-    _batchOpenUrl:basePath + 'document/product/batchOpen',
-    _batchCloseUrl:basePath + 'document/product/batchClose',
-    _batchDeleteUrl:basePath + 'document/product/batchDelete',
+    // _dataUrl:'http://192.168.253.31:9480/product/list',
+    _batchOpenUrl:'http://192.168.253.31:9480/product/batchOpen',
+    _batchCloseUrl:'http://192.168.253.31:9480/product/batchClose',
+    _batchDeleteUrl:'http://192.168.253.31:9480/product/batchDelete',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 'pr_code',
+        dataUrl: 'http://192.168.253.31:9480/product/list',
+        columns : [{
+            text : "id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "物料编号", 
+            width : 200.0, 
+            dataIndex : "pr_code", 
+            xtype : "", 
+        }, 
+        {
+            text : "物料名称", 
+            dataIndex : "pr_detail", 
+            width : 120.0, 
+            xtype : "", 
+        }, 
+        {
+            text : "状态", 
+            dataIndex : "pr_status", 
+            width : 120.0, 
+            xtype : ""
+        }, 
+        {
+            text : "物料种类", 
+            dataIndex : "pr_type", 
+            width : 120.0, 
+            xtype : "",
+        }]
+    },
 
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 'pr_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "物料编号", 
-                    width : 200.0, 
-                    dataIndex : "pr_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "物料名称", 
-                    dataIndex : "pr_detail", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "状态", 
-                    dataIndex : "pr_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "物料种类", 
-                    dataIndex : "pr_type", 
-                    width : 120.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
 });

frontend/saas-web/app/view/document/product/list/FormPanelController.js

@@ -1,8 +1,7 @@
 Ext.define('saas.view.document.product.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.product-list-formpanel',
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-product-list-formpanel',
+
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/document/product/list/FormPanelModel.js

@@ -1,4 +1,4 @@
 Ext.define('saas.view.document.product.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.product-list-formpanel'
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-product-list-formpanel'
 });

frontend/saas-web/app/view/document/product/panel/FormController.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.document.product.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.product-panel-formpanel',
+    alias: 'controller.document-product-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/document/product/panel/FormModel.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.document.product.panel.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.product-panel-formpanel',
+    alias: 'viewmodel.document-product-panel-formpanel',
 
     
 });

frontend/saas-web/app/view/document/product/panel/FormPanel.js

@@ -1,9 +1,9 @@
 Ext.define('saas.view.document.product.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'product-panel-formpanel',
+    xtype: 'document-product-panel-formpanel',
 
-    controller: 'product-panel-formpanel',
-    viewModel: 'product-panel-formpanel',
+    controller: 'document-product-panel-formpanel',
+    viewModel: 'document-product-panel-formpanel',
     
     caller:'Product',
 

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

@@ -1,24 +1,8 @@
 Ext.define('saas.view.document.vendor.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'vendor-list-formpanel',
-    controller: 'vendor-list-formpanel',
-    viewModel: 'vendor-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',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-vendor-list-formpanel',
+    controller: 'document-vendor-list-formpanel',
+    viewModel: 'document-vendor-list-formpanel',
 
     searchField:[{
         xtype : "remotecombo", 
@@ -56,61 +40,52 @@ Ext.define('saas.view.document.vendor.list.FormPanel', {
     }],
 
     //字段属性
-    _formXtype:'vendor-panel-formpanel',
+    _formXtype:'document-vendor-panel-formpanel',
     _title:'供应商资料',
-    _dataUrl:basePath+'ducument/vendor/list',
+    // _dataUrl:basePath+'ducument/vendor/list',
     _deleteUrl:basePath+'ducument/vendor/delete/',
     _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
     _batchCloseUrl:basePath+'ducument/vendor/batchClose',
     _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
 
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 've_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "供应商id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "供应商编号", 
-                    width : 200.0, 
-                    dataIndex : "ve_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "供应商名称", 
-                    dataIndex : "ve_name", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "供应商状态", 
-                    dataIndex : "ve_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "供应商UU", 
-                    dataIndex : "ve_uu", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认供应商联系人", 
-                    dataIndex : "vc_name", 
-                    flex : 1.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
+    gridConfig: {
+        idField: 'id',
+        codeField: 've_code',
+        dataUrl: basePath+'ducument/vendor/list',
+        columns : [{
+            text : "供应商id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "供应商编号", 
+            width : 200.0, 
+            dataIndex : "ve_code", 
+            xtype : "", 
+        }, 
+        {
+            text : "供应商名称", 
+            dataIndex : "ve_name", 
+            width : 120.0, 
+            xtype : "", 
+        }, 
+        {
+            text : "供应商状态", 
+            dataIndex : "ve_status", 
+            width : 120.0, 
+            xtype : ""
+        }, 
+        {
+            text : "供应商UU", 
+            dataIndex : "ve_uu", 
+            width : 120.0, 
+            xtype : "",
+        }, 
+        {
+            text : "默认供应商联系人", 
+            dataIndex : "vc_name", 
+            flex : 1.0, 
+            xtype : "",
+        }]
+    },
 });

frontend/saas-web/app/view/document/vendor/list/FormPanelController.js

@@ -1,8 +1,7 @@
 Ext.define('saas.view.document.vendor.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.vendor-list-formpanel',
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-vendor-list-formpanel',
+
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/document/vendor/list/FormPanelModel.js

@@ -1,4 +1,4 @@
 Ext.define('saas.view.document.vendor.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.vendor-list-formpanel'
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-vendor-list-formpanel'
 });

frontend/saas-web/app/view/document/vendor/panel/FormController.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.document.vendor.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.vendor-panel-formpanel',
+    alias: 'controller.document-vendor-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({});

frontend/saas-web/app/view/document/vendor/panel/FormModel.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.document.vendor.panel.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.vendor-panel-formpanel',
+    alias: 'viewmodel.document-vendor-panel-formpanel',
 
     
 });

frontend/saas-web/app/view/document/vendor/panel/FormPanel.js

@@ -1,6 +1,6 @@
 Ext.define('saas.view.document.vendor.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'vendor-panel-formpanel',
+    xtype: 'document-vendor-panel-formpanel',
 
     controller: 'vendor-panel-formpanel',
     viewModel: 'vendor-panel-formpanel',