代码提交

frontend/saas-web/app/util/FormUtil.js

@@ -52,6 +52,9 @@ Ext.define('saas.util.FormUtil', {
                                 return c.dataIndex
                             });
 
+                            //默认绑定序号
+                            cnames.push(item.detnoColumn);
+
                             formModel.set('detail' + index + '.detailBindFields', cnames);
                             item.bind = {
                                 store: '{detail' + index + '.detailStore}'

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

@@ -22,7 +22,7 @@ Ext.define('saas.view.document.customer.list.FormPanel', {
 
     searchField:[{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.31:9480/customerkind/getCombo",
+        storeUrl:basePath+'ducument/customerkind/getCombo',
         name : "cu_type", 
         emptyText : "请选择客户类型", 
         allowBlank : true, 
@@ -34,8 +34,8 @@ Ext.define('saas.view.document.customer.list.FormPanel', {
             customerkind:{
                 keyField:'id',
                 dataField:'ck_name',
-                reqUrl:'http://192.168.253.31:9480/customerkind/save',
-                delUrl:'http://192.168.253.31:9480/customerkind/delete'
+                reqUrl:basePath+'ducument/customerkind/save',
+                delUrl:basePath+'ducument/customerkind/delete'
             }
         },
         addHandler:function(b){
@@ -58,10 +58,10 @@ Ext.define('saas.view.document.customer.list.FormPanel', {
     //字段属性
     _formXtype:'customer-panel-formpanel',
     _title:'客户资料',
-    _dataUrl:'http://192.168.253.228:9480/customer/list',
-    _batchOpenUrl:'http://192.168.253.228:9480/customer/batchOpen',
-    _batchCloseUrl:'http://192.168.253.228:9480/customer/batchClose',
-    _batchDeleteUrl:'http://192.168.253.228:9480/customer/batchDelete',
+    _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;

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

@@ -3,205 +3,10 @@ Ext.define('saas.view.document.customer.panel.FormController', {
     alias: 'controller.customer-panel-formpanel',
     init: function (form) {
         var me = this;
-        this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
-                beforerender:function(f){
-                    f.addHandler=me.addCombo;
-
-                }
-            },
-            //主表单选放大镜模板
-            'dbfindtrigger[name=pu_vendcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'http://192.168.253.41:9480/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
-                        }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(ve_code, ve_name) like '{0}%'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            xtype : "textfield", 
-                            name : "ve_name", 
-                            conditionExpression:"ve_name like '{0}%'",//传入后台条件  替换占位符
-                            fieldLabel : "供应商名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            },
-            //从表单选放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        },{
-                            from:'pr_unit',to:'pd_unit'
-                        }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            },
-            //从表多选放大镜赋值关系 以及 tpl模板
-            'multidbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        },{
-                            from:'pr_unit',to:'pd_unit'
-                        }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            }
-        });
-
+        this.control({});
     },
 
     auditBtnClick: function() {
-        debugger
         var me = this,
         form = me.getView(),
         statusCodeField = form._statusCodeField,

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

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
     _codeField: 'cu_code',
     _statusField: 'cu_status',
     _statusCodeField: 'cu_statuscode',
-    _readUrl:'http://192.168.253.228:9480/customer/read/',
-    _saveUrl:'http://192.168.253.228:9480/customer/save',
-    _openUrl:'http://192.168.253.228:9480/customer/open',
-    _closeUrl:'http://192.168.253.228:9480/customer/close',
-    _deleteUrl:'http://192.168.253.228:9480/customer/delete/',
+    _readUrl:basePath+'ducument/customer/read/',
+    _saveUrl:basePath+'ducument/customer/save',
+    _openUrl:basePath+'ducument/customer/open',
+    _closeUrl:basePath+'ducument/customer/close',
+    _deleteUrl:basePath+'ducument/customer/delete/',
     initId:0,
 
     defaultItems: [{
@@ -52,7 +52,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.31:9480/customerkind/getCombo",
+        storeUrl:basePath+'ducument/customerkind/getCombo',
         name : "cu_type", 
         fieldLabel : "客户类型", 
         allowBlank : true, 
@@ -64,8 +64,8 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
             customerkind:{
                 keyField:'id',
                 dataField:'ck_name',
-                reqUrl:'http://192.168.253.31:9480/customerkind/save',
-                delUrl:'http://192.168.253.31:9480/customerkind/delete'
+                reqUrl:basePath+'ducument/customerkind/save',
+                delUrl:basePath+'ducument/customerkind/delete'
             }
         },
         addHandler:function(b){
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
-        _deleteDetailUrl:'http://192.168.253.228:9480/customer/deletecontact/',
+        _deleteDetailUrl:basePath+'ducument/customer/deletecontact/',
         columns : [
             {
                 text : "ID", 
@@ -240,7 +240,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
-        _deleteDetailUrl:'http://192.168.253.228:9480/customer/deleteaddress/',
+        _deleteDetailUrl:basePath+'ducument/customer/deleteaddress/',
         columns : [
             {
                 text : "ID", 

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -107,6 +107,22 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 allowBlank:false,
                 fieldLabel:'类型'
             }]
+        },
+        storeinformation:{
+            items:[{
+                xtype:'textfield',
+                fieldLabel: '仓库编号',
+                name: 'wh_code'
+            },{
+                xtype:'textfield',
+                fieldLabel: '仓库名称',
+                name: 'wh_description'
+            },{
+                readOnly:true,
+                xtype:'textfield',
+                fieldLabel: '仓库状态',
+                name: 'wh_status'
+            }]
         }
     },
     setFormItems:function() {

frontend/saas-web/app/view/document/kind/Kind.js

@@ -128,8 +128,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl: 'http://192.168.253.129:9480/bankinformation/save',
-            delUrl: 'http://192.168.253.129:9480/bankinformation/delete'
+            reqUrl: basePath + 'document/bankinformation/save',
+            delUrl: basePath + 'document/bankinformation/delete'
         },
         inoutkind:{
             columns: [{
@@ -138,8 +138,26 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl: 'http://192.168.253.31:9480/fundinouttype/save',
-            delUrl: 'http://192.168.253.31:9480/fundinouttype/delete'
+            reqUrl: basePath + 'document/fundinouttype/save',
+            delUrl: basePath + 'document/fundinouttype/delete'
+        },
+        storeinformation:{
+            columns: [{
+                text: '仓库编号',
+                dataIndex: 'wh_code',
+                width: 200
+            },{
+                text: '仓库名称',
+                dataIndex: 'wh_description',
+                width: 200
+            },{
+                text: '仓库状态',
+                dataIndex: 'wh_status',
+                width: 100
+            }],
+            keyField:'id',
+            reqUrl: basePath + 'document/warehouse/save',
+            delUrl: basePath + 'document/warehouse/delete'
         }
     }
 })

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/customerkind/getAll',
+                url: basePath + 'document/customerkind/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -34,7 +34,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/vendorkind/getAll',
+                url: basePath + 'document/vendorkind/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -53,7 +53,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/producttype/getAll',
+                url: basePath + 'document/producttype/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -72,7 +72,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/productbrand/getAll',
+                url: basePath + 'document/productbrand/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -96,7 +96,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: 'http://192.168.253.129:9480/bankinformation/getAll',
+                url: basePath + 'document/bankinformation/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -116,7 +116,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {  
                 type: 'ajax',
-                url: 'http://192.168.253.31:9480/fundinouttype/getAll',
+                url: basePath + 'document/fundinouttype/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -137,7 +137,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/customerkind/getAll',
+                url: basePath + 'document/warehouse/list',
                 actionMethods: {
                     read: 'GET'
                 },

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

@@ -22,7 +22,7 @@ Ext.define('saas.view.document.product.list.FormPanel', {
 
     searchField:[{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.31:9480/producttype/getCombo",
+        storeUrl: basePath + 'document/producttype/getCombo',
         name : "pr_type", 
         emptyText : "请选择物料类型", 
         allowBlank : true, 
@@ -34,8 +34,8 @@ Ext.define('saas.view.document.product.list.FormPanel', {
             producttype:{
                 keyField:'id',
                 dataField:'pr_name',
-                reqUrl:'http://192.168.253.31:9480/producttype/save',
-                delUrl:'http://192.168.253.31:9480/producttype/delete'
+                reqUrl:basePath + 'document/producttype/save',
+                delUrl:basePath + 'document/producttype/delete'
             }
         },
         addHandler:function(b){
@@ -58,10 +58,10 @@ Ext.define('saas.view.document.product.list.FormPanel', {
     //字段属性
     _formXtype:'product-panel-formpanel',
     _title:'物料资料',
-    _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',
+    _dataUrl:basePath + 'document/product/list',
+    _batchOpenUrl:basePath + 'document/product/batchOpen',
+    _batchCloseUrl:basePath + 'document/product/batchClose',
+    _batchDeleteUrl:basePath + 'document/product/batchDelete',
 
     initComponent: function () {
         var me = this;
@@ -86,7 +86,7 @@ Ext.define('saas.view.document.product.list.FormPanel', {
                 }, 
                 {
                     text : "物料名称", 
-                    dataIndex : "pr_name", 
+                    dataIndex : "pr_detail", 
                     width : 120.0, 
                     xtype : "", 
                 }, 

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

@@ -4,24 +4,17 @@ Ext.define('saas.view.document.product.panel.FormController', {
     init: function (form) {
         var me = this;
         this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
-                beforerender:function(f){
-                    f.addHandler=me.addCombo;
-
-                }
-            },
             //主表单选放大镜模板
-            'dbfindtrigger[name=pu_vendcode]':{
+            'dbfindtrigger[name=pr_vendcode]':{
                 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'
+                            from:'ve_code',to:'pr_vendcode'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name',to:'pr_vendname'
                         }],
                         //联想设置
                         dbtpls:[{
@@ -46,151 +39,75 @@ Ext.define('saas.view.document.product.panel.FormController', {
                             "dataIndex": "ve_id",
                             "width": 0,
                             "xtype": "",
-                            "items": null
                         },{
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
                             "width": 100,
                             "xtype": "",
-                            "items": null
                         }, {
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
                             "xtype": "",
-                            "items": null
                         }, {
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
                             "xtype": "",
-                            "items": null
                         }]
                     }) ;   
 
                 }
             },
             //从表单选放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        },{
-                            from:'pr_unit',to:'pd_unit'
-                        }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            },
-            //从表多选放大镜赋值关系 以及 tpl模板
-            'multidbfindtrigger[name=pd_prodcode]':{
+            'dbfindtrigger[name=pr_whcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getWareHouseByCondition',
                         //放大镜赋值设置
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
+                            from:'wh_code',to:'pr_whcode'
                         },{
-                            from:'pr_unit',to:'pd_unit'
+                            from:'wh_description',to:'pr_whname'
                         }],
                         //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
+                        dbCondition:"CONCAT(wh_code, wh_description) like '{0}%'",
                         //联想设置
                         dbtpls:[{
-                            field:'pr_code',width:100
+                            field:'wh_code',width:100
                         },{
-                            field:'pr_detail',width:100
+                            field:'wh_description',width:100
                         }],
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入仓库编号或仓库名称',
                             xtype : "textfield", 
                             name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
+                            conditionExpression:"CONCAT(wh_code, wh_description) like '{0}%'",
                             allowBlank : true, 
                             columnWidth : 0.25
                         }],
                         //窗口列设置
                         dbColumns:[{
-                            "text": "物料ID",
+                            "text": "ID",
                             "flex": 0,
-                            "dataIndex": "pr_id",
+                            "dataIndex": "wh_id",
                             "width": 0,
                             "xtype": "",
-                            "items": null
                         },{
-                            "text": "物料编号",
+                            "text": "仓库编号",
                             "flex": 1,
-                            "dataIndex": "pr_code",
+                            "dataIndex": "wh_code",
                             "width": 100,
                             "xtype": "",
-                            "items": null
                         }, {
-                            "text": "物料名称",
+                            "text": "仓库名称",
                             "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
+                            "dataIndex": "wh_description",
                             "xtype": "",
-                            "items": null
                         }]
                     }) ;   
 

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

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.product.panel.FormPanel', {
     _codeField: 'pr_code',
     _statusField: 'pr_status',
     _statusCodeField: 'pr_statuscode',
-    _readUrl:'http://192.168.253.31:9480/product/read/',
-    _saveUrl:'http://192.168.253.31:9480/product/save',
-    _openUrl:'http://192.168.253.31:9480/product/open',
-    _closeUrl:'http://192.168.253.31:9480/product/close',
-    _deleteUrl:'http://192.168.253.31:9480/product/delete/',
+    _readUrl:basePath + 'document/product/read/',
+    _saveUrl:basePath + 'document/product/save',
+    _openUrl:basePath + 'document/product/open',
+    _closeUrl:basePath + 'document/product/close',
+    _deleteUrl:basePath + 'document/product/delete/',
     initId:0,
 
     defaultItems: [{
@@ -28,7 +28,7 @@ Ext.define('saas.view.document.product.panel.FormPanel', {
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'pr_name',
+        name: 'pr_detail',
         fieldLabel: '物料名称',
         allowBlank: false,
         columnWidth: 0.25
@@ -36,12 +36,12 @@ Ext.define('saas.view.document.product.panel.FormPanel', {
         xtype: 'textfield',
         name: 'pr_code',
         fieldLabel: '物料编号',
-        allowBlank: true,
+        allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
         name: 'pr_status',
-        fieldLabel: '状态',
+        fieldLabel: '可用状态',
         allowBlank: true,
         columnWidth: 0.25
     },{
@@ -52,7 +52,7 @@ Ext.define('saas.view.document.product.panel.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.31:9480/producttype/getCombo",
+        storeUrl:basePath + 'document/producttype/getCombo',
         name : "pr_type", 
         fieldLabel : "物料类型", 
         allowBlank : true, 
@@ -64,8 +64,8 @@ Ext.define('saas.view.document.product.panel.FormPanel', {
             producttype:{
                 keyField:'id',
                 dataField:'pr_name',
-                reqUrl:'http://192.168.253.31:9480/producttype/save',
-                delUrl:'http://192.168.253.31:9480/producttype/delete'
+                reqUrl:basePath + 'document/producttype/save',
+                delUrl:basePath + 'document/producttype/delete'
             }
         },
         addHandler:function(b){
@@ -83,6 +83,109 @@ Ext.define('saas.view.document.product.panel.FormPanel', {
             });
             this.dialog.show();
         }
+    },{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/product/getProdUnit',
+        name : "pr_unit", 
+        bind : "{pr_unit}", 
+        fieldLabel : "物料单位", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            produnit:{
+                keyField:'id',
+                dataField:'vk_name',
+                reqUrl:basePath+'ducument/produnit/save',
+                delUrl:basePath+'ducument/produnit/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增物料单位'
+                },
+                dataKind:'vendorkind',
+                belong:this.ownerCmp.etc['vendorkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }
+    },{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/product/getProdBrand',
+        name : "pr_brand", 
+        bind : "{pr_brand}", 
+        fieldLabel : "物料品牌", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            productbrand:{
+                keyField:'id',
+                dataField:'pb_name',
+                reqUrl:basePath+'ducument/productbrand/save',
+                delUrl:basePath+'ducument/productbrand/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增物料单位'
+                },
+                dataKind:'productbrand',
+                belong:this.ownerCmp.etc['productbrand'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }
+    },{
+        xtype : "dbfindtrigger",   
+        name : "pr_vendcode", 
+        bind : "{pr_vendcode}", 
+        fieldLabel : "供应商编号", 
+        allowBlank : true, 
+        columnWidth : 0.25, 
+    }, {
+        xtype : "textfield", 
+        name : "pr_vendname", 
+        bind : "{pr_vendname}", 
+        fieldLabel : "供应商名称", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        xtype : "dbfindtrigger",   
+        name : "pr_whcode", 
+        bind : "{pr_whcode}", 
+        fieldLabel : "仓库编号", 
+        allowBlank : true, 
+        columnWidth : 0.25, 
+    }, {
+        xtype : "textfield", 
+        name : "pr_whname", 
+        bind : "{pr_whname}", 
+        fieldLabel : "仓库名称", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        xtype : "numberfield", 
+        name : "pr_standardprice", 
+        bind : "{pr_standardprice}", 
+        fieldLabel : "标准单价", 
+        allowBlank : true, 
+        columnWidth : 0.25
     },{
         format : "Y-m-d",
         xtype : "datefield", 

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

@@ -22,7 +22,7 @@ Ext.define('saas.view.document.vendor.list.FormPanel', {
 
     searchField:[{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.31:9480/vendorkind/getCombo",
+        storeUrl:basePath+'ducument/vendorkind/getCombo',
         name : "ve_type", 
         emptyText : "请选择供应商类型", 
         allowBlank : true, 
@@ -34,8 +34,8 @@ Ext.define('saas.view.document.vendor.list.FormPanel', {
             vendorkind:{
                 keyField:'id',
                 dataField:'vk_name',
-                reqUrl:'http://192.168.253.31:9480/vendorkind/save',
-                delUrl:'http://192.168.253.31:9480/vendorkind/delete'
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
             }
         },
         addHandler:function(b){
@@ -58,11 +58,11 @@ Ext.define('saas.view.document.vendor.list.FormPanel', {
     //字段属性
     _formXtype:'vendor-panel-formpanel',
     _title:'供应商资料',
-    _dataUrl:'http://192.168.253.31:9480/vendor/list',
-    _deleteUrl:'http://192.168.253.31:9480/vendor/delete/',
-    _batchOpenUrl:'http://192.168.253.31:9480/vendor/batchOpen',
-    _batchCloseUrl:'http://192.168.253.31:9480/vendor/batchClose',
-    _batchDeleteUrl:'http://192.168.253.31:9480/vendor/batchDelete',
+    _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;

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

@@ -3,201 +3,7 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
     alias: 'controller.vendor-panel-formpanel',
     init: function (form) {
         var me = this;
-        this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
-                beforerender:function(f){
-                    f.addHandler=me.addCombo;
-
-                }
-            },
-            //主表单选放大镜模板
-            'dbfindtrigger[name=pu_vendcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'http://192.168.253.41:9480/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
-                        }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(ve_code, ve_name) like '{0}%'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            xtype : "textfield", 
-                            name : "ve_name", 
-                            conditionExpression:"ve_name like '{0}%'",//传入后台条件  替换占位符
-                            fieldLabel : "供应商名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            },
-            //从表单选放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        },{
-                            from:'pr_unit',to:'pd_unit'
-                        }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            },
-            //从表多选放大镜赋值关系 以及 tpl模板
-            'multidbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'http://192.168.253.31:9480/api/document/product/getProductsByCondition',
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        },{
-                            from:'pr_unit',to:'pd_unit'
-                        }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            }
-        });
-
+        this.control({});
     },
 
     auditBtnClick: function() {

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

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
     _codeField: 've_code',
     _statusField: 've_status',
     _statusCodeField: 've_statuscode',
-    _readUrl:'http://192.168.253.31:9480/vendor/read/',
-    _saveUrl:'http://192.168.253.31:9480/vendor/save',
-    _openUrl:'http://192.168.253.31:9480/vendor/open',
-    _closeUrl:'http://192.168.253.31:9480/vendor/close',
-    _deleteUrl:'http://192.168.253.31:9480/vendor/delete/',
+    _readUrl:basePath+'ducument/vendor/read/',
+    _saveUrl:basePath+'ducument/vendor/save',
+    _openUrl:basePath+'ducument/vendor/open',
+    _closeUrl:basePath+'ducument/vendor/close',
+    _deleteUrl:basePath+'ducument/vendor/delete/',
     initId:0,
 
     defaultItems: [{
@@ -52,7 +52,7 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.31:9480/vendorkind/getCombo",
+        storeUrl:basePath+'ducument/vendorkind/getCombo',
         name : "ve_type", 
         fieldLabel : "供应商类型", 
         allowBlank : true, 
@@ -64,8 +64,8 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
             vendorkind:{
                 keyField:'id',
                 dataField:'vk_name',
-                reqUrl:'http://192.168.253.31:9480/vendorkind/save',
-                delUrl:'http://192.168.253.31:9480/vendorkind/delete'
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
             }
         },
         addHandler:function(b){
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'vc_detno',
         storeModel:'saas.model.document.vendorcontact',
-        _deleteDetailUrl:'http://192.168.253.31:9480/vendor/deleteContact/',
+        _deleteDetailUrl:basePath+'ducument/vendor/deleteContact/',
         columns : [
             {
                 text : "ID", 
@@ -171,7 +171,6 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
                 dataIndex : "vc_name", 
                 width : 120.0, 
                 xtype : "", 
-                items : null
             },
             {
                 text : "电话", 
@@ -181,7 +180,6 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
                 dataIndex : "vc_tel", 
                 width : 120.0, 
                 xtype : "", 
-                items : null
             },
             {
                 text : "微信/QQ", 
@@ -191,7 +189,6 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
                 dataIndex : "vc_qq", 
                 width : 120.0, 
                 xtype : "", 
-                items : null
             },
             {
                 text : "邮箱", 
@@ -201,7 +198,6 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
                 dataIndex : "vc_email", 
                 width : 120.0, 
                 xtype : "", 
-                items : null
             },
             {
                 editor : {

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

@@ -183,8 +183,9 @@
             "addType":"product-panel-formpanel",
             "leaf": true
         }, {
+            "id":"other-storeinformation",
             "text": "仓库资料",
-            "viewType": "mainlist",
+            "viewType": "other-storeinformation",
             "leaf": true
         }, {
             "text": "BOM资料",