文件结构调整

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

@@ -50,7 +50,7 @@ Ext.define('saas.view.core.base.BasePanel', {
                 frame:false,
                 xtype: 'toolbar',
                 dock: 'top',
-                // layout: 'column',
+                layout: 'column',
                 style: {
                     margin: '0 0 12px 0',
                     padding: '10px 0 14px 8px',

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

@@ -58,7 +58,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             text: '新增',
             hidden: true,
             bind: {
-                hidden: '{!id}'
+                hidden: '{!showAddBtn || !id}'
             },
             handler: 'add'
         }, {
@@ -75,7 +75,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             text: '保存',
             handler: 'onSave',
             bind: {
-                hidden: '{'+ me._statusCodeField + ' == "' + me.auditTexts.auditCode + '"}',
+                hidden: '{!showSaveBtn || '+ me._statusCodeField + ' == "' + me.auditTexts.auditCode + '"}',
                 // disabled: '{!base.valid || '+ me._statusCodeField + ' == "AUDITED" || ' + me._statusCodeField + ' == "OPEN"}'
                 disabled: '{!base.valid || '+ me._statusCodeField + ' == "' + me.auditTexts.auditCode + '"}'
             }
@@ -84,7 +84,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             xtype: 'button',
             text: '删除',
             bind: {
-                hidden: '{deleteHidden || ' + me._statusCodeField + '=="' + me.auditTexts.auditCode + '"}'
+                hidden: '{!showDeleteBtn || deleteHidden || ' + me._statusCodeField + '=="' + me.auditTexts.auditCode + '"}'
             },
             handler: 'delete'
         }, {
@@ -127,7 +127,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             target: 'main',
             handler: 'onSetting',
             bind: {
-                hidden: '{!isAdmin}'
+                hidden: '{!configurable || !isAdmin}'
             }
         }];
 

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

@@ -11,13 +11,17 @@ Ext.define('saas.view.core.form.FormPanelModel', {
             codeEditable: false, // 单据编号是否可编辑
         },
         auditBtnText: '审核', // 审核按钮默认text
+        showAddBtn: true, // 显示新增按钮
+        showSaveBtn: true, // 显示保存按钮
+        showDeleteBtn: true, // 显示删除按钮
         showCopyBtn: true, // 显示复制按钮
-        showPrintBtn: false, // 显示打印按钮
         showAuditBtn: true, // 显示审核、反审核按钮
+        showPrintBtn: false, // 显示打印按钮
+        configurable: true, // 显示界面设置按钮
+
         detailBindeFields: [], // 从表绑定列
         detailStore: null, // 从表store
 
-        configurable: true
     },
 
     formulas:{

frontend/saas-web/app/view/sale/business/Business.js → frontend/saas-web/app/view/sale/b2b/Business.js

@@ -1,13 +1,13 @@
 /**
  * 商机-公司商机
  */
-Ext.define('saas.view.sale.business.Business', {
+Ext.define('saas.view.sale.b2b.Business', {
     extend: 'saas.view.core.base.BasePanel',
-    xtype: 'sale-business-business',
+    xtype: 'sale-b2b-business',
 
-    controller: 'sale-business-business',
-    viewModel: 'sale-business-business',
-    viewName: 'sale-business-business',
+    controller: 'sale-b2b-business',
+    viewModel: 'sale-b2b-business',
+    viewName: 'sale-b2b-business',
 
 
     // dataUrl: 'http://10.1.80.23:8560/api/sale/sale/enterprise/businessChance',

frontend/saas-web/app/view/sale/business/BusinessController.js → frontend/saas-web/app/view/sale/b2b/BusinessController.js

@@ -1,6 +1,6 @@
-Ext.define('saas.view.sale.business.BusinessController', {
+Ext.define('saas.view.sale.b2b.BusinessController', {
     extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.sale-business-business',
+    alias: 'controller.sale-b2b-business',
 
     showQuoteWin: function(record) {
         var me = this,

frontend/saas-web/app/view/sale/b2b/BusinessModel.js

@@ -0,0 +1,8 @@
+Ext.define('saas.view.sale.b2b.BusinessModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.sale-b2b-business',
+
+    data: {
+        configurable: false
+    }
+});

frontend/saas-web/app/view/sale/b2b/MyBusiness.js

@@ -0,0 +1,12 @@
+/**
+ * 商机-我的商机
+ */
+Ext.define('saas.view.sale.b2b.MyBusiness', {
+    extend: 'saas.view.sale.b2b.Business',
+    xtype: 'sale-b2b-mybusiness',
+
+    viewName: 'sale-b2b-mybusiness',
+
+    // dataUrl: 'http://10.1.80.23:8560/api/sale/sale/personal/businessChance',
+    dataUrl: '/api/sale/sale/personal/businessChance',
+});

frontend/saas-web/app/view/sale/business/Product.js → frontend/saas-web/app/view/sale/b2b/Product.js

@@ -1,11 +1,11 @@
 /**
  * 产品库
  */
-Ext.define('saas.view.sale.business.Product', {
+Ext.define('saas.view.sale.b2b.Product', {
     extend: 'saas.view.core.base.BasePanel',
-    xtype: 'sale-business-product',
+    xtype: 'sale-b2b-product',
 
-    viewName: 'sale-business-Product',
+    viewName: 'sale-b2b-Product',
 
 
     // dataUrl: 'http://10.1.80.23:8560/api/document/product/prodStorage/list',
@@ -134,7 +134,8 @@ Ext.define('saas.view.sale.business.Product', {
                             };
                             grid.setLoading(true);
                             saas.util.BaseUtil.request({
-                                url: 'http://10.1.80.23:8560/api/document/product/prodStorage/saler',
+                                // url: 'http://10.1.80.23:8560/api/document/product/prodStorage/saler',
+                                url: '/api/document/product/prodStorage/saler',
                                 params: JSON.stringify(params),
                                 method: 'POST',
                             })

frontend/saas-web/app/view/sale/business/QuoteWin.js → frontend/saas-web/app/view/sale/b2b/QuoteWin.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.sale.business.QuoteWin', {
+Ext.define('saas.view.sale.b2b.QuoteWin', {
     extend: 'Ext.window.Window',
     xtype: 'quotewin',
 

frontend/saas-web/app/view/sale/business/BusinessModel.js

@@ -1,8 +0,0 @@
-Ext.define('saas.view.sale.business.BusinessModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.sale-business-business',
-
-    data: {
-        configurable: false
-    }
-});

frontend/saas-web/app/view/sale/business/MyBusiness.js

@@ -1,12 +0,0 @@
-/**
- * 商机-我的商机
- */
-Ext.define('saas.view.sale.business.MyBusiness', {
-    extend: 'saas.view.sale.business.Business',
-    xtype: 'sale-business-mybusiness',
-
-    viewName: 'sale-business-mybusiness',
-
-    // dataUrl: 'http://10.1.80.23:8560/api/sale/sale/personal/businessChance',
-    dataUrl: '/api/sale/sale/personal/businessChance',
-});

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

@@ -72,19 +72,19 @@
             "viewType": "sale-salein-querypanel"
         }, {
             "b2b":true,
-            "id": "sale-business-product",
+            "id": "sale-b2b-product",
             "text": "产品库",
-            "viewType": "sale-business-product"
+            "viewType": "sale-b2b-product"
         }, {
             "b2b":true,
-            "id": "sale-business-business",
+            "id": "sale-b2b-business",
             "text": "公司商机",
-            "viewType": "sale-business-business"
+            "viewType": "sale-b2b-business"
         }, {
             "b2b":true,
-            "id": "sale-business-mybusiness",
+            "id": "sale-b2b-mybusiness",
             "text": "我的商机",
-            "viewType": "sale-business-mybusiness"
+            "viewType": "sale-b2b-mybusiness"
         }]
     }, {
         "text": "报表",