Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r15763 -r15784
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15763)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15784)
@@ -179,7 +179,7 @@
 				}else if(result=="notExistItemsUsed"){
 					showResult("该篮筐或清洗架未存放清洗物品");
 				}else if(result=="packed"){
-					showResult("该篮筐或清洗架已经进行了装配,不能录清洗记录");
+					showResult("该篮筐内部分物品已装配并打印标签，不能再次清洗！");
 				}else if (result != null && result != "null") {
 					var materialArray = new Array();
 					materialArray = result.split("#@");
@@ -374,6 +374,15 @@
 	resetWashMaterialCount();
 }
 
+function buildLogInfo(description){
+	Ext.Ajax.request({
+		url :  WWWROOT + '/log/saveLog.do',
+		params : {model : '清洗模块',type : 'A',description : description},
+		success : function(response, options) {
+		}
+	});
+}
+
 //加载清洗的材料
 function loadDisinfectedMaterial(id){
 	Ext.Ajax.request({
@@ -524,8 +533,7 @@
         	header : '数量',
         	width : 50,
         	dataIndex : 'objAmount'
-        }
-        ,{
+        },{
             header : '载入',
             width : 50,
             dataIndex : 'type',
@@ -727,36 +735,20 @@
 											if(barcode!=null && barcode != ""){
 												BarcodeTableManager.getBarcodeTypeByBarcode(barcode,function(jsonStr){
 													var result = Ext.util.JSON.decode(jsonStr);
-													var scanedGoods = "";
 													if(result !=null && result !=""){
 														if(result.returnType == 'container'){
-															scanedGoods = "篮筐";
 															addPendingWashAndDisinfectBasketToRecord(barcode);
 														}else if(result.returnType == 'rinser'){
-															scanedGoods = "清洗机";
 															loadWashMachineByBarcode(barcode);
 														}else if(result.returnType == 'cleanmethod'){
-															scanedGoods = "清洗程序";
 															loadWashProgramByBarcode(barcode);
 														}else if(result.returnType == 'user'){
-															scanedGoods = "用户";
 															loadUserByBarcode(barcode);
 														}else if(result.returnType == 'position'){
-															scanedGoods = "位置";
 															loadPositionByBarcode(barcode);
 														}else{
-															scanedGoods = "错误条码";
 															showResult(result.message);
 														}
-														
-														//日志
-														Ext.Ajax.request({
-											    			url :  WWWROOT + '/log/saveLog.do',
-											    			params : {model : '清洗模块',type : 'A',description : "PC清洗消毒扫描条码：" + barcode + ",条码类型：" + scanedGoods},
-											    			success : function(response, options) {
-											    				
-											    			}
-											    		});
 													}else{
 														showResult('找不到该条码所对应的信息！');
 													}
@@ -901,7 +893,14 @@
 								altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 								format:'Y-m-d H:i:s',
 								allowBlank : false,
-								anchor : '99%'
+								anchor : '99%',
+								listeners:{
+									change:function(thiz,newValue,oldValue){
+										var newStr = Ext.util.Format.date(newValue, 'Y-m-d H:i'); 
+										var oldStr = Ext.util.Format.date(oldValue, 'Y-m-d H:i');
+										buildLogInfo("PC修改清洗时间，将开始时间" + oldStr + "改为" + newStr);
+									}
+								}
 							}]
 						} ,{
 							id : 'disinfectProgramField',
@@ -948,7 +947,14 @@
 								altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 								format:'Y-m-d H:i:s',
 								allowBlank : false,
-								anchor : '99%'
+								anchor : '99%',
+								listeners:{
+									change:function(thiz,newValue,oldValue){
+										var newStr = Ext.util.Format.date(newValue, 'Y-m-d H:i'); 
+										var oldStr = Ext.util.Format.date(oldValue, 'Y-m-d H:i');
+										buildLogInfo("PC修改清洗时间，将开始时间" + oldStr + "改为" + newStr);
+									}
+								}
 							}]
 						},{
 							id : "cycleCounterId",
@@ -1264,6 +1270,8 @@
 		}
 	}
 	loadMaterial(barcode,removePendingWashAndDisinfectGoods(barcode));
+	//日志
+	buildLogInfo("PC清洗消毒扫描条码：" + barcode + ",条码类型：篮筐");
 }
 // callback
 //移除右边表格的数据(今天待审核的数据列表),barcode可能为单个器械包条码,也可能为两个条码中间用分号隔开