Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r31995 -r31996 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 31995) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 31996) @@ -42,6 +42,7 @@ //GZTHZL-1 获取需要检查的包的材料 var getPackingMaterialsForCheck = new newMap(); +var clickItemId = ''; //SZSDSRMYY-54 var responsibilityPart = '清洗消毒' @@ -2405,6 +2406,7 @@ var diposableGoodsTotalAmount = 0; var tousseName = []; var tousseDefinitionId = records[0].raw.tousseDefinitionId; + clickItemId = tousseDefinitionId; for(var i = 0 ; i < len ; i++){ var type = records[i].data.type; tousseName[i+2] = records[i].data.name; @@ -2545,7 +2547,6 @@ if(sstsConfig.enablePackingMaterialsCheckFunction){ var tousseDefinitionId = record.raw.tousseDefinitionId; if(getPackingMaterialsForCheck.size() == 1){ - var tousseDefinitionId = getPackingMaterialsForCheck.element(0).key; materialsAddBgColor(tousseDefinitionId,rowIndex,td); }else if(getPackingMaterialsForCheck.size() > 1){ showResult('一次只能检查一种物品,请勿勾选多种物品!'); @@ -5014,6 +5015,9 @@ //GZTHZL-1:材料添加背景色 function materialsAddBgColor(tousseDefinitionId,rowIndex,td) { + if(tousseDefinitionId !== clickItemId){ + return false; + } if(getPackingMaterialsForCheck.get(tousseDefinitionId)){ var packingMaterialsArray = getPackingMaterialsForCheck.get(tousseDefinitionId); var tousseName = packingMaterialsArray[0]; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/packingMaterialsCheck/packingMaterialsCheckForm.js =================================================================== diff -u -r31992 -r31996 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/packingMaterialsCheck/packingMaterialsCheckForm.js (.../packingMaterialsCheckForm.js) (revision 31992) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/packingMaterialsCheck/packingMaterialsCheckForm.js (.../packingMaterialsCheckForm.js) (revision 31996) @@ -120,6 +120,8 @@ ] }); + tousseJsonStore.load(); + var tbar = [{ text: '选择物品:' }, { @@ -145,14 +147,18 @@ iconCls: 'btn_ext_application_add', handler: function () { if (top.Ext4.getCmp("tousseName").getRawValue() == '') { - showResult('请先检索物品'); - return; + tousseListStore.removeAll(); } + var res = []; for (var i = 0; i < tousseJsonStore.getCount(); i++) { var id = tousseJsonStore.getAt(i).get('id'); var name = tousseJsonStore.getAt(i).get('name'); - addTousseItems(id, name) + res[i] = { + id: id, + name: name + } } + tousseListStore.add(res); top.Ext4.getCmp("tousseName").setValue(""); } }, {