Index: ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.js
===================================================================
diff -u -r15116 -r21483
--- ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.js	(.../goodsBindingConfigView.js)	(revision 15116)
+++ ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.js	(.../goodsBindingConfigView.js)	(revision 21483)
@@ -59,7 +59,7 @@
                 {type: 'string', dataIndex: 'secondaryGoodName'},
                 {type: 'string', dataIndex: 'mainCount'},
                 {type: 'string', dataIndex: 'secondaryCount'},
-                {type: 'string', dataIndex: 'mainGoodsType'},
+                {type: 'string', dataIndex: 'mainGoodType'},
                 {type: 'string', dataIndex: 'secondaryGoodType'},
                 {type: 'string', dataIndex: 'bidirectionalStatus'}
             ]
@@ -74,16 +74,17 @@
         {name: 'secondaryGoodName'},
         {name: 'mainCount'},
         {name: 'secondaryCount'},
-        {name: 'mainGoodsType'},
+        {name: 'mainGoodType'},
         {name: 'secondaryGoodType'},
         {name: 'bidirectionalStatus'}
     ];
 
     var columns = [
         {header: "记录id", width: 50, dataIndex: 'id', hidden: true},
-        // {header: "主绑定物品名称", width: 200, dataIndex: 'mainGoodName'},
-        {header: "主绑定物品名称", width: 200, dataIndex: 'mainGoodName', renderer: customRender.modifyGoodsBindRender},
-        {header: "次绑定物品名称", width: 200, dataIndex: 'secondaryGoodName'},
+        {header: "主绑定物品名称", width: 250, dataIndex: 'mainGoodName', renderer: customRender.modifyGoodsBindRender},
+        {header: "主绑定物品类型", width: 150, dataIndex: 'mainGoodType'},
+        {header: "次绑定物品名称", width: 250, dataIndex: 'secondaryGoodName'},
+        {header: "次绑定物品类型", width: 150, dataIndex: 'secondaryGoodType'},
         {header: "主数量", width: 100, dataIndex: 'mainCount'},
         {header: "次数量", width: 100, dataIndex: 'secondaryCount'},
         {header: "捆绑比例", width: 100, renderer: customRender.bindRatioRender},