Pman.Dialog.AdminCompanyMerge.bjs

[Pman.Admin] / Pman.Dialog.AdminCompanyMerge.js

diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index c6233c0..cc7ba06 100644 (file)
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -168,10 +168,7 @@ Pman.Dialog.AdminCompanyMerge = {
             beforeload : function (_self, o){
                  o.params = o.params || {};
                  
-                 o.params['etype'] = _this.data.etype;
-                 
                  o.params['!id'] = _this.form.findField('id').getValue();
-                 // set more here
              }
            },
            xns : Roo.data,
@@ -187,7 +184,14 @@ Pman.Dialog.AdminCompanyMerge = {
             xtype : 'JsonReader',
             fields : [
                 {
-                    "name":"id","type":"int"},{"name":"name","type":"string"}],
+                    "name":"id",
+                    "type":"int"
+                },
+                {
+                    "name":"name",
+                    "type":"string"
+                }
+            ],
             id : 'id',
             root : 'data',
             totalProperty : 'total',