Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -6,7 +6,8 @@ applications/**/target/
 base-servers/**/target/
 framework/**/target/
 !.mvn/wrapper/maven-wrapper.jar
-
+### VSCODE ###
+.vscode
 ### STS ###
 .apt_generated
 .classpath

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -127,11 +127,13 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
+            f.belong = 'query';
+            return f.ownerCt.ownerCt
+        }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
             f.belong = 'form';
             return f.ownerCt
-        }
-        else if(f.column){
+        }else if(f.column){
             f.belong = 'grid';
             return f.column.ownerCt.ownerCt.ownerCt
         }

frontend/saas-web/app/view/core/dbfind/MultiDbfindTrigger.js

@@ -166,11 +166,13 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
+            f.belong = 'query';
+            return f.ownerCt.ownerCt
+        }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
             f.belong = 'form';
             return f.ownerCt
-        }
-        else if(f.column){
+        }else if(f.column){
             f.belong = 'grid';
             return f.column.ownerCt.ownerCt.ownerCt
         }

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

@@ -39,10 +39,16 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var me = this;
         var form = this.getView();
         var id = form.getForm().findField(form._idField);
+        var code = form.getForm().findField(form._codeField);
         if(id&&id.value!=0){
             me.BaseUtil.request({
-                url: form._deleteUrl+id.value,
-                method: 'GET',
+                url: form._deleteUrl,
+                params:{
+                    id:id.value,
+                    code:code.value,
+                    namne:form.caller
+                },
+                method: 'POST',
             })
             .then(function(res) {
                 var localJson = new Ext.decode(res.responseText);

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

@@ -6,13 +6,10 @@ Ext.define('saas.view.core.tab.Controller', {
         var me = this,
         tab = me.getView(),
         tabConfig = tab.tabViewConfig,
-        type = tabConfig.type,
-        viewType = type == 'form' ? tabConfig.formtype : tabConfig.querytype;
+        viewtype = tabConfig.viewtype;
 
-        console.log(viewType);
-        
         tab.add({
-            xtype: viewType
+            xtype:viewtype
         });
     },
 

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

@@ -7,6 +7,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
     layout: 'fit',
     modal: true,
     width: 400,
+    //工具类
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
     height: 220,
     listeners:{
       show:function(w){
@@ -43,7 +46,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'vk_id'
             },{
                 xtype:'textfield',
-                name:'vk_kind',
+                name:'vk_name',
                 allowBlank:false,
                 fieldLabel:'类型'
             }],
@@ -91,15 +94,37 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         return Ext.apply(conf, me.etc[kind]);
     },
     onSave:function(){
-
+        var belong = this.belong;
         var form=this.down('form');
-        alert('save');
+        var dataField = form.down('[name='+belong.dataField+']');
+        if(!dataField.value){
+             Ext.Msg.alert('提示','数据有误');
+            return false;
+        }
+        var keyField = form.down('[name='+belong.keyField+']');
+        //保存接口
+        var params = {};
+        params[belong.dataField] = dataField.value;
+        params[belong.keyField] = keyField.value || 0;
+        this.BaseUtil.request({
+            url: belong.reqUrl,
+            params: JSON.stringify(params),
+            method: 'POST',
+        })
+        .then(function(res) {
+            var localJson = new Ext.decode(res.responseText);
+            if(localJson.success){
+                Ext.Msg.alert('提示','保存成功');
+                var grid = form.ownerCt._parent.lookup('document-kind-Grid');
+                grid.store.load();
+                form.ownerCt.close();
+            }
+        })
+        .catch(function() {
+            Ext.Msg.alert('提示','保存失败');
+        });
     },
     onCancel:function(){
-        alert('cancel');
         this.hide();
-    },
-
-
-
+    }
 });

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

@@ -4,6 +4,8 @@
 Ext.define('saas.view.document.kind.Kind', {
     extend: 'Ext.panel.Panel',
     xtype: 'document-kind',
+    autoScroll: true,
+    layout:'fit',
     controller:'document-kind',
     viewModel: {
         type: 'document-kind'
@@ -78,11 +80,12 @@ Ext.define('saas.view.document.kind.Kind', {
         vendorkind:{
             columns: [{
                 text: '供应商类型',
-                dataIndex: 'vk_kind',
+                dataIndex: 'vk_name',
                 flex: 1
             }],
             keyField:'vk_id',
-            reqUrl:''
+            dataField:'vk_name',
+            reqUrl:'http://192.168.253.41:9480/api/document/vendorkind/save'
         },
         productkind:{
             columns: [{

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

@@ -10,6 +10,7 @@ Ext.define('saas.view.document.kind.KindController', {
             vm = me.getViewModel(),
             defaultKind=vm.getData()['dataKind'].value,
             etc = view.etc[defaultKind];
+
         grid.reconfigure(vm.getStore(defaultKind), me.insertActionColumn(etc.columns));
     },
     onKindToggle:function(container, button, pressed){
@@ -20,6 +21,7 @@ Ext.define('saas.view.document.kind.KindController', {
             vm = me.getViewModel(),
             etc = view.etc[name],
             store=vm.getStore(name);
+
        var columns=me.insertActionColumn(etc.columns);
         grid.reconfigure(store, columns);
         if(store) store.reload();
@@ -72,7 +74,6 @@ Ext.define('saas.view.document.kind.KindController', {
     },
     createDialog: function(dataKind,record) {
         var view = this.getView();var me=this;
-
         this.isEdit = !!record;
         this.dialog = view.add({
             xtype: 'document-kind-childwin',
@@ -80,6 +81,8 @@ Ext.define('saas.view.document.kind.KindController', {
                 title: record ? '修改{title}类型' : '新增{title}类型'
             },
             dataKind:dataKind,
+            belong:this.getView().etc[dataKind],
+            _parent:this.getView(),
             record:record,
             session: true
         });

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

@@ -27,13 +27,17 @@ Ext.define('saas.view.document.kind.KindModel', {
         vendorkind:{
             fields:[
                 {name: 'vk_id', type: 'int'},
-                {name: 'vk_kind',  type: 'string'}
+                {name: 'vk_name',  type: 'string'}
             ],
             proxy: {
                 type: 'ajax',
-                url: 'resources/json/vendor.json',
+                url: 'http://192.168.253.41:9480/api/document/vendorkind/getAll',
+                actionMethods: {
+                    read: 'GET'
+                },
                 reader: {
-                    type: 'json'
+                    type: 'json',
+                    rootProperty: 'data'
                 }
             },
             pageSize: null,

frontend/saas-web/app/view/main/Navigation.js

@@ -21,30 +21,30 @@ Ext.define('saas.view.main.Navigation', {
                         items: [{
                             id: 'purchase',
                             text: '采购单',
-                            formType:'purchase-purchase-formpanel',
-                            queryType: 'purchase-purchase-querypanel'
+                            addType:'purchase-purchase-formpanel',
+                            viewType: 'purchase-purchase-querypanel'
                         }, {
                             id: 'purchaseIn',
                             text: '采购验收单',
-                            formType:'purchase-purchaseIn-formpanel',
-                            queryType: 'purchase-purchaseIn-querypanel'
+                            addType:'purchase-purchaseIn-formpanel',
+                            viewType: 'purchase-purchaseIn-querypanel'
                         },{
                             id: 'purchaseOut',
                             text: '采购验退单',
-                            formType:'purchase-purchaseOut-formpanel',
-                            queryType: 'purchase-purchaseOut-querypanel'
+                            addType:'purchase-purchaseOut-formpanel',
+                            viewType: 'purchase-purchaseOut-querypanel'
                         },{
                             id: 'form1',
                             text: '测试-采购单明细界面',
-                            formType: 'test-order-formpanel'
+                            addType: 'test-order-formpanel'
                         }, {
                             id: 'myform',
                             text: '测试-明细界面',
-                            formType: 'test-myform-formpanel'
+                            addType: 'test-myform-formpanel'
                         }, {
                             id: 'myquerytest',
                             text: '测试-采购单查询界面',
-                            queryType: 'test-query-querypanel',
+                            viewType: 'test-query-querypanel',
                         }]
                     }, {
                         text: '报表',
@@ -54,10 +54,112 @@ Ext.define('saas.view.main.Navigation', {
                             text: '采购付款一览表'
                         }]
                     }]
-                }, {
-                    text: '销售',
-                    iconCls: 'x-fa fa-shopping-cart',
-                }],
+                },{
+                    text: '资料',
+                    iconCls: 'x-fa fa-book',
+                    items: [
+                        {
+                            text: '基础资料',
+                            items: [
+                                {
+                                    text: '客户资料',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '供应商管理',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '商品管理',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '仓库管理',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '职员管理',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '账户管理',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '发货地址管理',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '新手导航',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                }
+                            ]
+                        },
+                        {
+                            text: '辅助资料',
+                            items: [
+                                {
+                                    text: '客户类别',
+                                    viewType: 'document-kind',
+                                    leaf: true
+                                },
+                                {
+                                    text: '供应商类别',
+                                    viewType: 'document-kind',
+                                    leaf: true
+                                },
+                                {
+                                    text: '商品类别',
+                                    viewType: 'document-kind',
+                                    leaf: true
+                                },
+                                {
+                                    text: '支出类别',
+                                    viewType: 'document-kind',
+                                    leaf: true
+                                },
+                                {
+                                    text: '收入类别',
+                                    viewType: 'document-kind',
+                                    leaf: true
+                                },
+                                {
+                                    text: '计量单位',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '结算方式',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '辅助属性',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '客户物料编码',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                },
+                                {
+                                    text: '单据编码规则',
+                                    viewType: 'mainlist',
+                                    leaf: true
+                                }
+                            ]
+                        }
+                    ]
+                }]
             }),
             tpl : new Ext.XTemplate('<ul class="x-navlist">',
                 '<tpl for=".">',
@@ -108,7 +210,7 @@ Ext.define('saas.view.main.Navigation', {
         if(!menu) {
             var view = new Ext.DataView({
                 store : Ext.create('Ext.data.Store', {
-                   fields: ['id', 'text', 'formType', 'queryType'],
+                   fields: ['id', 'text', 'addType', 'viewType'],
                    data: menuItems
                 }),
                 tpl: new Ext.XTemplate('<div class="x-navitem-menu">',
@@ -119,11 +221,11 @@ Ext.define('saas.view.main.Navigation', {
                             '<div class="menu-content">',
                                 '<tpl for="items">',
                                 '<div class="menuitem">',
-                                    '<div class="item-text" title="{text}" data-id="{id}" data-text="{text}" data-type="query" data-queryType="{queryType}">',
+                                    '<div class="item-text" title="{text}" data-id="{id}" data-text="{text}" data-type="query" data-viewType="{viewType}">',
                                         '{text}',
                                     '</div>',
-                                    '<tpl if="{formType}">',
-                                    '<div class="item-icon" data-id="{id}" data-text="{text}" data-type="form" data-formType="{formType}">新增</div>',
+                                    '<tpl if="{addType}">',
+                                    '<div class="item-icon" data-id="{id}" data-text="{text}" data-type="form" data-viewType="{addType}">新增</div>',
                                     '</tpl>',
                                 '</div>',
                                 '</tpl>',