Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r24092 -r24105 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 24092) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 24105) @@ -874,7 +874,7 @@ if (result && result != 'null') { var sterilingModeFromSterilingGoodsDetailGrid = getSterilingModeFromSterilingGoodsDetailGrid(); - if(sterilingModeFromBasketGoodsDetailGrid.length > 1){ + if(sterilingModeFromSterilingGoodsDetailGrid.length > 1){ showResult("该篮筐有多种不同灭菌方式的物品,不能装载器械包,请先将灭菌框内灭菌方式不同的物品移除!"); sterilizationRecordWin.getEl().unmask(); return false; @@ -900,8 +900,8 @@ showResultWithoutSpeak("此外来器械包含有植入物,需要做生物监测!", null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); } - if(sterilingModeFromBasketGoodsDetailGrid.length == 1 && sterilingModeFromBasketGoodsDetailGrid[i] != sterilingMode){ - showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromBasketGoodsDetailGrid[0] +"】物品不一致,不能入框"); + if(sterilingModeFromSterilingGoodsDetailGrid.length == 1 && sterilingModeFromSterilingGoodsDetailGrid[i] != sterilingMode){ + showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromSterilingGoodsDetailGrid[0] +"】物品不一致,不能入框"); sterilizationRecordWin.getEl().unmask(); return; } @@ -933,8 +933,8 @@ var tousseName = tousseInstan.tousseName; //器械包名称 var sterilingMode = resultData.sterilingMode; //灭菌方式 - if(sterilingModeFromBasketGoodsDetailGrid.length == 1 && sterilingModeFromBasketGoodsDetailGrid[i] != sterilingMode){ - showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromBasketGoodsDetailGrid[0] +"】物品不一致,不能入框"); + if(sterilingModeFromSterilingGoodsDetailGrid.length == 1 && sterilingModeFromSterilingGoodsDetailGrid[i] != sterilingMode){ + showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromSterilingGoodsDetailGrid[0] +"】物品不一致,不能入框"); sterilizationRecordWin.getEl().unmask(); return; } @@ -1055,8 +1055,8 @@ var tousseName = tousseInstan.tousseName; //器械包名称 var sterilingMode = tousseInstan.sterilingMode; //灭菌方式 - if(sterilingModeFromBasketGoodsDetailGrid.length == 1 && sterilingModeFromBasketGoodsDetailGrid[i] != sterilingMode){ - showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromBasketGoodsDetailGrid[0] +"】物品不一致,不能入框"); + if(sterilingModeFromSterilingGoodsDetailGrid.length == 1 && sterilingModeFromSterilingGoodsDetailGrid[i] != sterilingMode){ + showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromSterilingGoodsDetailGrid[0] +"】物品不一致,不能入框"); sterilizationRecordWin.getEl().unmask(); return; } @@ -1134,8 +1134,8 @@ var tousseInstan = tousseInstanceArr[i]; var tousseName = tousseInstan.tousseName; //器械包名称 var sterilingMode = tousseInstan.sterilingMode; //器械包类型(用于分类统计) - if(sterilingModeFromBasketGoodsDetailGrid.length == 1 && sterilingModeFromBasketGoodsDetailGrid[i] != sterilingMode){ - showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromBasketGoodsDetailGrid[0] +"】物品不一致,不能入框"); + if(sterilingModeFromSterilingGoodsDetailGrid.length == 1 && sterilingModeFromSterilingGoodsDetailGrid[i] != sterilingMode){ + showResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromSterilingGoodsDetailGrid[0] +"】物品不一致,不能入框"); sterilizationRecordWin.getEl().unmask(); return; }