Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28710 -r28713 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28710) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28713) @@ -10,6 +10,7 @@ var isDelete = false; var saveBasketsArr = []; var shareDeparts = []; +var shareDepartsStr = ''; /** * 不回收的器械包的集合。这个是由绑定带出来的器械包,并且不回收,在回收这里本来是不做处理的。现在要能修改原来的申请数量,相关的还有装配任务 */ @@ -750,6 +751,7 @@ } }); shareDeparts = []; + shareDepartsStr = ''; return true; } @@ -1717,6 +1719,7 @@ alertDiv('该器械包不属于该科室。'); return; } + shareDepartsStr = tousseDepart; } // 对于已废弃的包,不检查其位置和所属科室的信息 var ti = msg.tousseInstance; @@ -5144,6 +5147,11 @@ alertDiv('该科室跟器械包的科室为共用科室,请删除器械包后再切换'); return; } + }else { + if(shareDepartsStr !== departName){ + alertDiv('该科室已有器械包,不能切换'); + return; + } } var oldValue = document.getElementById('departCode').value; //加载科室申领模板