文件结构调整

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

@@ -13,6 +13,7 @@ Ext.define('saas.view.core.base.BasePanel', {
     autoScroll: true,
     border: 1,
     bodyPadding: 5,
+    layout: 'fit',
     
     fieldDefaults: {
         margin: '0 5 5 0',
@@ -49,7 +50,8 @@ Ext.define('saas.view.core.base.BasePanel', {
                 }])
             }],
             items: [{
-                xtype: 'core-baseform-gridpanel',
+                layout: 'fit',
+                xtype: 'core-base-gridpanel',
                 dataUrl: gridDataUrl,
                 idField: gridIdField,
                 codeField: gridCodeField,

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

@@ -1,8 +1,9 @@
-Ext.define('saas.view.document.customer.list.FormPanel', {
+Ext.define('saas.view.document.customer.BasePanel', {
     extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-customer-list-formpanel',
-    controller: 'document-customer-list-formpanel',
-    viewModel: 'document-customer-list-formpanel',
+    xtype: 'document-customer-basepanel',
+
+    controller: 'document-customer-basepanel',
+    viewModel: 'document-customer-basepanel',
 
     searchField:[{
         xtype : "remotecombo", 
@@ -40,7 +41,7 @@ Ext.define('saas.view.document.customer.list.FormPanel', {
     }],
 
     //字段属性
-    _formXtype:'document-customer-panel-formpanel',
+    _formXtype:'document-customer-formpanel',
     _title:'客户资料',
     // _dataUrl:basePath+'ducument/customer/list',
     _batchOpenUrl:basePath+'ducument/customer/batchOpen',

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

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.vendor.list.FormPanelController', {
+Ext.define('saas.view.document.customer.BasePanelController', {
     extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-vendor-list-formpanel',
+    alias: 'controller.document-customer-basepanel',
 
     init: function (form) {
         var me = this;

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

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

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

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

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

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

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

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

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

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.customer.list.FormPanelController', {
-    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 +0,0 @@
-Ext.define('saas.view.document.customer.list.FormPanelModel', {
-    extend: 'saas.view.core.base.FormPanelModel',
-    alias: 'viewmodel.document-customer-list-formpanel'
-});

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

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

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

@@ -1,24 +1,9 @@
-Ext.define('saas.view.document.product.list.FormPanel', {
+Ext.define('saas.view.document.product.BasePanel', {
     extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-product-list-formpanel',
-    controller: 'document-product-list-formpanel',
-    viewModel: 'document-product-list-formpanel',
+    xtype: 'document-product-basepanel',
 
-    //工具类
-    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: '该字段不能为空'
-    },
+    controller: 'document-product-basepanel',
+    viewModel: 'document-product-basepanel',
 
     searchField:[{
         xtype : "remotecombo", 
@@ -56,7 +41,7 @@ Ext.define('saas.view.document.product.list.FormPanel', {
     }],
 
     //字段属性
-    _formXtype:'document-product-panel-formpanel',
+    _formXtype:'document-product-formpanel',
     _title:'物料资料',
     // _dataUrl:'http://192.168.253.31:9480/product/list',
     _batchOpenUrl:'http://192.168.253.31:9480/product/batchOpen',

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-Ext.define('saas.view.document.vendor.list.FormPanel', {
+Ext.define('saas.view.document.vendor.BasePanel', {
     extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-vendor-list-formpanel',
-    controller: 'document-vendor-list-formpanel',
-    viewModel: 'document-vendor-list-formpanel',
+    xtype: 'document-vendor-basepanel',
+    controller: 'document-vendor-basepanel',
+    viewModel: 'document-vendor-basepanel',
 
     searchField:[{
         xtype : "remotecombo", 
@@ -40,7 +40,7 @@ Ext.define('saas.view.document.vendor.list.FormPanel', {
     }],
 
     //字段属性
-    _formXtype:'document-vendor-panel-formpanel',
+    _formXtype:'document-vendor-formpanel',
     _title:'供应商资料',
     // _dataUrl:basePath+'ducument/vendor/list',
     _deleteUrl:basePath+'ducument/vendor/delete/',

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

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

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

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

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

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

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

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

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

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

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

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

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

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

frontend/saas-web/resources/json/navigation.json

@@ -167,20 +167,20 @@
         "items": [{
             "id":"vendor-list-formpanel",
             "text": "供应商资料",
-            "viewType": "vendor-list-formpanel",
-            "addType":"vendor-panel-formpanel",
+            "viewType": "document-vendor-basepanel",
+            "addType":"document-vendor-formpanel",
             "leaf": true
         }, {
             "id":"customer-list-formpanel",
             "text": "客户资料",
-            "viewType": "customer-list-formpanel",
-            "addType":"customer-panel-formpanel",
+            "viewType": "document-customer-basepanel",
+            "addType":"document-customer-formpanel",
             "leaf": true
         }, {
             "id":"product-list-formpanel",
             "text": "物料资料",
-            "viewType": "product-list-formpanel",
-            "addType":"product-panel-formpanel",
+            "viewType": "document-product-basepanel",
+            "addType":"document-product-formpanel",
             "leaf": true
         }, {
             "id":"other-storeinformation",
@@ -189,7 +189,8 @@
             "leaf": true
         }, {
             "text": "BOM资料",
-            "viewType": "document-bom-formpanel",
+            "viewType": "document-bom-basepanel",
+            "addTyep": "document-bom-formpanel",
             "leaf": true
         }, {
             "id":"other-bankinformation",