Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r21888 -r21892
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 21888)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 21892)
@@ -1476,6 +1476,7 @@
             }else{
                 showResult("增加数量失败，请勿提交数据");
             }
+            sterilizationRecordWin.getEl().unmask();
             top.Ext.getCmp('saveBtn').enable();
         },
         failure : function(response, options) {
@@ -1524,6 +1525,7 @@
     clickNode.remove();//将当前节点移除
     myFixedBarcodes.removeByValue(fixedBarcode);//在全局条码中移除该固定条码
     statisticsTousseAndBasket(); 
+    
     return;//第一版先不做右边的处理
     //addPendingStarilizationGoodsFromRecord(clickNode);
     Ext.Ajax.request({
@@ -1588,6 +1590,7 @@
             }else{
                 showResult("减少数量失败，请勿提交数据");
             }
+            sterilizationRecordWin.getEl().unmask();
             top.Ext.getCmp('saveBtn').enable();//成功删除全部后，启用保存按钮
         },
         failure : function(response, options) {
@@ -1710,6 +1713,7 @@
     
     sterilizationColumnTreeEditer.on("beforestartedit", function(thiz,el,v){
         var tempNode = thiz.editNode;//将要编辑的节点&& tempNode.attributes.scanFixedBarcode == '是'
+        //alert(parseInt(tempNode.attributes.stockAmount))
         if(thiz.editColIndex == 'amount' && parseInt(tempNode.attributes.stockAmount)>0){
             return true;
         }else {
@@ -1803,8 +1807,9 @@
     
     
     sterilizationColumnTree.on("beforeclick",function(clickNode,eObj){
-        if(isClickDel){ //点击删除图标
+        if(isClickDel){ //点击删除图标111
             if(myFixedBarcodes.indexOf(clickNode.attributes.barcode)!=-1){//该条码为固定条码
+                sterilizationRecordWin.getEl().mask("正在删除.请稍等...", "x-mask-loading");
                 clickDeleteIcon(clickNode);
             }else{
                 deleteGiveBackColumnTreeItem(clickNode); 
@@ -3028,7 +3033,7 @@
         items : [ formObj ]
     });
     sterilizationRecordWin.show();
-    //左下角灭菌记录
+    //灭菌记录
     formObj.form.load({
         url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!loadSterilizationRecord.do',
         method : 'GET',
@@ -3045,6 +3050,8 @@
                 top.Ext.getCmp('startDate').setValue(formatDateYear(sr.startDate));
                 top.Ext.getCmp('endDate').setValue(formatDateYear(sr.endDate));
                 top.Ext.getCmp('srSituationComfirmer').setValue(sr.srSituationComfirmer);
+                
+                //加载条码放至全局数组中
                 var fixedBarcodes = action.result.fixedBarcodes
                 var barcodes = action.result.barcodes
                 myFixedBarcodes = fixedBarcodes.split(",")