Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/core/tab/Controller.js

@@ -5,11 +5,15 @@ Ext.define('saas.view.core.tab.Controller', {
     init: function() {
         var me = this,
         tab = me.getView(),
-        viewType = tab.viewType;
+        viewType = tab.viewType,
+        viewConfig = tab.viewConfig;
 
-        tab.add({
+        var view = {
             xtype: viewType
-        });
+        };
+        Ext.apply(view, viewConfig);
+
+        tab.add(view);
     },
 
 });

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

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchase.FormPanelController', {
+Ext.define('saas.view.money.paybalance.FormPanelController', {
     extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.money-paybalance-formpanel',
 

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

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchase.FormPanelModel', {
+Ext.define('saas.view.money.paybalance.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.money-paybalance-formpanel',
 

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

@@ -1,11 +1,11 @@
-Ext.define('saas.view.purchase.purchase.QueryPanel', {
+Ext.define('saas.view.money.paybalance.QueryPanel', {
     extend: 'saas.view.core.query.QueryPanel',
-    xtype: 'purchase-purchase-querypanel',
+    xtype: 'money-paybalance-querypanel',
 
-    controller: 'purchase-purchase-querypanel',
-    viewModel: 'purchase-purchase-querypanel',
+    controller: 'money-paybalance-querypanel',
+    viewModel: 'money-paybalance-querypanel',
 
-    viewName: 'purchase-purchase-querypanel',
+    viewName: 'money-paybalance-querypanel',
     
     queryFormItems: [{
         xtype: 'hidden',

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

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

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

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

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

@@ -17,12 +17,12 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _statusCodeField: 'pu_statuscode',
      
      _relationColumn: 'pd_puid',
-     _readUrl:'http://192.168.0.181:8560/api/purchase/purchase/read/',
-     _saveUrl:'http://192.168.0.181:8560/api/purchase/purchase/save',
-     _auditUrl:'http://192.168.0.181:8560/api/purchase/purchase/audit',
-     _deleteUrl:'http://192.168.0.181:8560/api/purchase/purchase/delete/',
-     _deleteDetailUrl:'http://192.168.0.181:8560/api/purchase/purchase/deleteItem/',
-     _turnInUrl:'http://192.168.253.228:8800/purchase/turnProdin/',
+     _readUrl:basePath+'purchase/purchase/read/',
+     _saveUrl:basePath+'purchase/purchase/save',
+     _auditUrl:basePath+'purchase/purchase/audit',
+     _deleteUrl:basePath+'purchase/purchase/delete/',
+     _deleteDetailUrl:basePath+'purchase/purchase/deleteItem/',
+     _turnInUrl:basePath+'purchase/prodinout/turnProdin/',
      initId:0,
  
      toolBtns: [{

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -66,7 +66,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }],

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

@@ -101,7 +101,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         addTitle: '采购单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
-        baseVastUrl: 'http://192.168.253.58:8800/purchase/',
+        baseVastUrl: basePath+'/purchase/purchase/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -14,13 +14,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'http://192.168.253.228:8800/prodinout/read/',
-    _saveUrl:'http://192.168.253.228:8800/prodinout/save',
-    _auditUrl:'http://192.168.253.228:8800/prodinout/audit',
-    _deleteUrl:'http://192.168.253.228:8800/prodinout/delete/',
-    _deleteDetailUrl:'http://192.168.253.228:8800/prodinout/deleteItem/',
-   _baseVastUrl:'http://192.168.253.228:8800/prodinout/',
-   _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
+    _readUrl:basePath+'purchase/prodinout/read/',
+    _saveUrl:basePath+'purchase/prodinout/save',
+    _auditUrl:basePath+'purchase/prodinout/audit',
+    _deleteUrl:basePath+'purchase/prodinout/delete/',
+    _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
+    _baseVastUrl:basePath+'purchase/prodinout/',
+    _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
     initId:0,
 
     toolBtns: [{

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -67,7 +67,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_id',to:'pd_prodid'                          
                         },{

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

@@ -105,7 +105,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         addTitle:'采购验收单',
         addXtype:'purchase-purchasein-formpanel',
         defaultCondition:' pi_class = \'采购验收单\'',
-        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseVastUrl:basePath+'purchase/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -15,11 +15,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'http://192.168.253.228:8800/prodinout/read/',
-    _saveUrl:'http://192.168.253.228:8800/prodinout/save',
-    _auditUrl:'http://192.168.253.228:8800/prodinout/audit',
-    _deleteUrl:'http://192.168.253.228:8800/prodinout/delete/',
-    _deleteDetailUrl:'http://192.168.253.228:8800/prodinout/deleteItem/',
+    _readUrl:basePath+'purchase/prodinout/read/',
+    _saveUrl:basePath+'purchase/prodinout/save',
+    _auditUrl:basePath+'purchase/prodinout/audit',
+    _deleteUrl:basePath+'purchase/prodinout/delete/',
+    _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
     initId:0,
 
     toolBtns: [],

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -66,7 +66,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_id',to:'pd_prodid'                          
                         },{

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

@@ -105,7 +105,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         addTitle:'采购验退单',
         addXtype:'purchase-purchaseout-formpanel',
         defaultCondition:' pi_class = \'采购验退单\'',
-        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseVastUrl:basePath+'purchase/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -15,13 +15,13 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _statusCodeField: 'sa_statuscode',
      
      _relationColumn: 'sd_puid',
-     _readUrl:'',
-     _saveUrl:'',
-     _auditUrl:'',
-     _deleteUrl:'',
-     _deleteDetailUrl:'',
-     _turnInUrl:'',
-     _turnOutUrl:'',
+     _readUrl:basePath+'sale/sale/read/',
+     _saveUrl:basePath+'sale/sale/save',
+     _auditUrl:basePath+'sale/sale/audit',
+     _deleteUrl:basePath+'sale/sale/delete/',
+     _deleteDetailUrl:basePath+'sale/sale/deleteItem/',
+     _turnInUrl:basePath+'sale/sale/turnProdin/',
+     _turnOutUrl:basePath+'sale/sale/turnProdOut/',
      initId:0,
  
      toolBtns: [{

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sa_custcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/customer/getCustomerByCondition',
+                        dataUrl:basePath+'document/customer/getCustomerByCondition',
                         dbfinds:[{
                             from:'cu_id',to:'sa_custid'
                         },{
@@ -68,7 +68,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'sd_prodcode'
                         }],

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

@@ -103,7 +103,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         addTitle: '销售订单',
         addXtype: 'sale-sale-formpanel',
         defaultCondition:'',
-        baseVastUrl: 'http://192.168.0.181:8560/api/sale/sale/',
+        baseVastUrl: basePath+'sale/sale/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
             'dbfindtrigger[name=sa_custcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/customer/getCustomerByCondition',
+                        dataUrl:basePath+'document/customer/getCustomerByCondition',
                         dbfinds:[{
                             from:'cu_id',to:'sa_custid'
                         },{
@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'sd_prodcode'
                         }],

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

@@ -4,7 +4,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
 
     controller: 'sale-salein-formpanel',
     viewModel: 'sale-salein-formpanel',
-    caller:'SaleIn',
+    caller:'ProdInOut!SaleReturn',
     
      //字段属性
     _title:'销售退货单',
@@ -14,13 +14,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'',
-    _saveUrl:'',
-    _auditUrl:'',
-    _deleteUrl:'',
-    _deleteDetailUrl:'',
-   _baseVastUrl:'',
-   _turnOutUrl:'',
+    _readUrl:basePath+'sale/prodinout/read/',
+    _saveUrl:basePath+'sale/prodinout/save',
+    _auditUrl:basePath+'sale/prodinout/audit',
+    _deleteUrl:basePath+'sale/prodinout/delete/',
+    _deleteDetailUrl:basePath+'sale/prodinout/deleteItem/',
+    _turnInUrl:basePath+'sale/prodinout/turnProdin/',
+    _turnOutUrl:basePath+'sale/prodinout/turnProdOut/',
     initId:0,
 
     // toolBtns: [{

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

@@ -11,62 +11,11 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/vendor/getVendorsByCondition',
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        dbColumns:[{
-                            conditionCode:'ve_id',
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            conditionCode:'ve_code',
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'ve_name',
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'ve_type',
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_id',to:'pd_prodid'                          
                         },{

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

@@ -86,7 +86,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         addTitle:'销售出货单',
         addXtype:'purchase-purchaseIn-formpanel',
         defaultCondition:' pi_class = \'销售出货单\'',
-        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseVastUrl: basePath+'sale/sale/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -7,7 +7,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
 
     viewName: 'sale-saleout-formpanel',
     
-    caller:'saleOut',
+    caller:'ProdInOut!Sale',
     
     //字段属性
     _title:'销售出货单',
@@ -17,11 +17,14 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'http://192.168.253.228:8800/prodinout/read/',
-    _saveUrl:'http://192.168.253.228:8800/prodinout/save',
-    _auditUrl:'http://192.168.253.228:8800/prodinout/audit',
-    _deleteUrl:'http://192.168.253.228:8800/prodinout/delete/',
-    _deleteDetailUrl:'http://192.168.253.228:8800/prodinout/deleteItem/',
+    _relationColumn: 'pd_piid',
+    _readUrl:basePath+'sale/prodinout/read/',
+    _saveUrl:basePath+'sale/prodinout/save',
+    _auditUrl:basePath+'sale/prodinout/audit',
+    _deleteUrl:basePath+'sale/prodinout/delete/',
+    _deleteDetailUrl:basePath+'sale/prodinout/deleteItem/',
+    _turnInUrl:basePath+'sale/prodinout/turnProdin/',
+    _turnOutUrl:basePath+'sale/prodinout/turnProdOut/',
     initId:0,
 
     toolBtns: [],

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

@@ -12,62 +12,11 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/vendor/getVendorsByCondition',
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        dbColumns:[{
-                            conditionCode:'ve_id',
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            conditionCode:'ve_code',
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'ve_name',
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'ve_type',
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -86,7 +86,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         addTitle:'销售出货单',
         addXtype:'sale-saleout-formpanel',
         defaultCondition:' pi_class = \'销售出货单\'',
-        baseVastUrl:'http://192.168.253.228:8800/prodinout/',
+        baseVastUrl: basePath+'sale/sale/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

frontend/saas-web/overrides/i18n.js

@@ -1,4 +1,4 @@
-var basePath = '';
+var basePath = 'http://192.168.0.181:8560/api/';
 
 function openTab(xtype, title, id, config) {
     var mainTab = Ext.getCmp('main-tab-panel');
@@ -7,11 +7,10 @@ function openTab(xtype, title, id, config) {
         panel = Ext.create('saas.view.core.tab.Panel', {
             id: id,
             title: title,
-            viewType: xtype
+            viewType: xtype,
+            viewConfig: config
         });
 
-        Ext.apply(panel, config);
-
         Ext.suspendLayouts();
         mainTab.setActiveTab(mainTab.add(panel));
         Ext.resumeLayouts(true);