Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r32431 -r32473
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 32431)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 32473)
@@ -236,6 +236,7 @@
var entityName = '代理灭菌';
var editMode = true;
var SSTS_ProxyDisinfection_Update = true;
+ var pageName = 'packingView';
SSTS_ProxyDisinfection_Update = false;
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
===================================================================
diff -u -r32471 -r32473
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js (.../proxyDisinfectionForm.js) (revision 32471)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js (.../proxyDisinfectionForm.js) (revision 32473)
@@ -480,6 +480,10 @@
showResult(result.containerName + "已经扫描");
return false;
}
+ if(pageName !== 'proxyDisinfectionView'){
+ showResult('接收物品时才能入筐!');
+ return
+ }
if (notDeliverTousseAmount > 0) {
if (sstsConfig.disableGoodsNotShippedAlert) {
top.Ext.getCmp('basketBarcode').setValue(barcode);
Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
===================================================================
diff -u -r32449 -r32473
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 32449)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 32473)
@@ -103,6 +103,7 @@
var entityName = '代理灭菌';
var editMode = true;
var SSTS_ProxyDisinfection_Update = true;
+ var pageName = 'historyPackingView';
SSTS_ProxyDisinfection_Update = false;
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp
===================================================================
diff -u -r32452 -r32473
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp (.../proxyDisinfectionView.jsp) (revision 32452)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp (.../proxyDisinfectionView.jsp) (revision 32473)
@@ -47,6 +47,7 @@
var currentDepartCoding = '<%=AcegiHelper.getLoginUser().getCurrentOrgUnitCode()%>';
var currentDepartName = '<%=AcegiHelper.getLoginUser().getCurrentOrgUnitName()%>';
+var pageName = 'proxyDisinfectionView';