Index: ssts-web/src/main/webapp/disinfectsystem/CombinationKits/CombinationKits.js
===================================================================
diff -u -r28319 -r28366
--- ssts-web/src/main/webapp/disinfectsystem/CombinationKits/CombinationKits.js	(.../CombinationKits.js)	(revision 28319)
+++ ssts-web/src/main/webapp/disinfectsystem/CombinationKits/CombinationKits.js	(.../CombinationKits.js)	(revision 28366)
@@ -21,7 +21,7 @@
         if (ids == null) {
             ids = records[i].data['id'];
         } else {
-            ids = ids + ';' + records[i].data['id'];
+            ids = ids + ',' + records[i].data['id'];
         }
     }
     top.Ext4.Msg.confirm(
@@ -30,7 +30,7 @@
         function(button) {
             if ('yes' == button) {
                 top.Ext4.Ajax.request({
-                    url : WWWROOT+'/disinfectSystem/foreignTousseCombinationController/deleteDataByIds.mhtml?ids='+ ids,
+                    url : WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!deleteForeignCombo.do?comboIds='+ ids,
                     success : function(response, options) {
                         var result = top.Ext4.decode(response.responseText);
                         if (result && result.success) {
@@ -50,32 +50,28 @@
 
     var fields = [
         {name : 'id', mapping : 'id'},
-        {name : 'name', mapping : 'name'},
+        {name : 'tousseName', mapping : 'tousseName'},
         {name : 'spelling', mapping : 'spelling'},
-        {name : 'wbcode', mapping : 'wbcode'},
-        {name : 'configUser', mapping : 'configUser'},
+        {name : 'wbCode', mapping : 'wbCode'},
         {name : 'remark', mapping : 'remark'}
     ];
 
     var columns = [{
-        header: "器械包名称", dataIndex: 'name', width: 470, minWidth:70, maxWidth:470, filterable: true, filter: {type: 'string'}, renderer : rendererFun
+        header: "器械包名称", dataIndex: 'tousseName', width: '20%', minWidth:70, maxWidth:470, filterable: true, filter: {type: 'string'}, renderer : rendererFun
     },{
-        header: "拼音码", dataIndex: 'spelling', width: 300, minWidth:70, maxWidth:300, filterable: true, filter: {type: 'string'}
+        header: "拼音码", dataIndex: 'spelling', width: '20%', minWidth:70, maxWidth:300, filterable: true, filter: {type: 'string'}
     },{
-        header: "五笔码", dataIndex: 'wbcode', width: 200, minWidth: 300, filterable: true, filter: {type: 'string'}
+        header: "五笔码", dataIndex: 'wbCode', width: '20%', minWidth: 300, filterable: true, filter: {type: 'string'}
     },{
-        header: "配置人", dataIndex: 'configUser', width: 300, minWidth: 300, filterable: true, filter: {type: 'numeric'}
-    },{
-        header: "备注", dataIndex: 'remark', width: 300, minWidth: 300, filterable: true, filter: {type: 'numeric'}
+        header: "备注", dataIndex: 'remark', width: '30%', minWidth: 300, filterable: true, filter: {type: 'string'}
     }];
 
     grid = Ext4.create('ExtJs.forgon4.Grid', {
         title : entityName,
-        dataUrl:'http://rap2api.taobao.org/app/mock/85153/disinfectSystem/grid/gridController/getGrid.mhtml',
+        dataUrl:WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadForeignTousseCombosList.do',
         fields : fields,
         columns : columns,
-        sorters : { property : 'transitionTime', direction: 'DESC'},
-        extraParams : {},  //如果你要自定义参数，这里一定要先给一个空的对象，要不然会报空异常
+        extraParams : {},
         showRightClick : false,
         tbar : [{
                 text : '添加',
@@ -112,7 +108,6 @@
                 }
             }]
     });
-
     var viewport = Ext4.create('Ext4.Viewport', {
         layout : 'fit',
         items : grid