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

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

@@ -64,10 +64,31 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_delivery", 
         fieldLabel : "交货日期"
     },{
-        xtype : "textfield", 
+        editable:false,
+        xtype : "remotecombo", 
+        storeUrl:'/api/document/address/getCombo',
         name : "pu_shipaddresscode", 
-        fieldLabel : "交货地址",
-        columnWidth: 0.5
+        fieldLabel : "交货地址", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        hiddenBtn:false,//true 则会关闭新增按钮功能
+        addHandler:function(b){
+            var document = Ext.create('saas.view.document.kind.Kind',{});
+            var form = this.ownerCmp.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增交货地址'
+                },
+                dataKind:'address',
+                belong:document.etc['address'],
+                _parent:form,
+                _combo:this.ownerCmp,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }
     }, {
         xtype : "textfield", 
         name : "pu_total",