代码提交

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

@@ -14,7 +14,6 @@ Ext.define('saas.util.BaseUtil', {
                 'Access-Control-Allow-Origin': '*',
                 "Content-Type": 'application/json;charset=UTF-8' 
             };
-
         return new Ext.Promise(function (resolve, reject) {
             Ext.Ajax.request({
                 url: url,

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

@@ -108,6 +108,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 fieldLabel:'类型'
             }]
         },
+        address:{
+            items:[{
+                xtype:'hidden',
+                name:'id'
+            },{
+                xtype:'textfield',
+                name:'ad_address',
+                allowBlank:false,
+                fieldLabel:'地址详情'
+            }]
+        },
         warehouse:{
             items:[{
                 xtype:'hidden',

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

@@ -144,6 +144,16 @@ Ext.define('saas.view.document.kind.Kind', {
             reqUrl: '/api/document/fundinouttype/save',
             delUrl: '/api/document/fundinouttype/delete'
         },
+        address:{
+            columns: [{
+                text: '地址名称',
+                dataIndex: 'ad_address',
+                flex: 1
+            }],
+            keyField:'id',
+            reqUrl: '/api/document/address/save',
+            delUrl: '/api/document/address/delete'
+        },
         warehouse:{
             columns: [{
                 text: '仓库编号',

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

@@ -149,6 +149,26 @@ Ext.define('saas.view.document.kind.KindModel', {
             },
             pageSize: null,
             autoLoad: false
+        },
+        address: {
+            fields:[
+                {name: 'id', type: 'int'},
+                {name: 'ad_address',  type: 'string'},
+                {name: 'ad_recorddate',  type: 'date'}
+            ],
+            proxy: {
+                type: 'ajax',
+                url: '/api/document/address/list',
+                actionMethods: {
+                    read: 'GET'
+                },
+                reader: {
+                    type: 'json',
+                    rootProperty: 'data.list'
+                }
+            },
+            pageSize: null,
+            autoLoad: false
         }
     }
 });

frontend/saas-web/app/view/document/other/Address.js

@@ -0,0 +1,25 @@
+/**
+ * Created by zhouy on 2018/10/18.
+ */
+Ext.define('saas.view.document.other.Address', {
+    extend: 'saas.view.document.kind.Kind',
+    xtype: 'other-address',
+    autoScroll: true,
+    layout:'fit',
+    defaultType:'address',
+    tbar: ['->',{
+        xtype:'button',
+        text:'新增',
+        listeners: {
+            click: 'onAdd'
+        }
+    },{
+        xtype:'button',
+        text:'刷新',
+        listeners: {
+            click: 'onRefresh'
+        }
+    }]
+})
+
+

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

@@ -211,8 +211,9 @@
             "viewType": "document-kind",
             "leaf": true
         }, {
+            "id":"other-address",
             "text": "采购交货地址",
-            "viewType": "document-kind",
+            "viewType": "other-address",
             "leaf": true
         }, {
             "id":"document-kind",