Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24425 -r24430
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24425)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24430)
@@ -919,11 +919,13 @@
 	       </div>
 	    </div>
 	</div>
+<input type="hidden" value="" id="inspectorCodeInputHidden">
+<input type="hidden" value="" id="operatorCodeHidden">
+<input type="hidden" value="" id="reviewerCodeHidden">
+<input type="hidden" value="" id="wrapperCodeHidden">
+<input type="hidden" value="" id="sterileUserCodeHidden">
 
-<!-- <input type="hidden" >
-<input type="hidden" value="" id="taskId" /> -->
 
-
 <!-- jquery 1.9.1 -->
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-1.9.1.js"></script>
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/js/bootstrap-ie.js"></script>
@@ -986,42 +988,14 @@
 	     searchURL = searchURL.substring(1, searchURL.length);
 	     taskGroup = decodeURIComponent(searchURL.split("?")[0].split("=")[1]);
 	 }
-     //console.log("taskGroup:" +taskGroup);
-  
 </script>
-<script type="text/javascript">
-	  // trType: 0表示父级，那么row为当前列数据；1表示子级，row为this变量
-	/*   function leftFootTableTrClickEvent(trType, row) {
-		  var taskid = "";
-		  if(trType == 0) {
-			  taskid = $(row.tousseName).attr("taskid");
-		  } else if (trType == 1) {
-			  taskid = $(row).find("td:eq(2) span").attr("taskid");
-		  }
-		  $("#taskId").val(taskid);
-	  } */
-</script>
 </html>
-
 <script>
-/*function changeLiTab(tabName) {
-	var liHref = window.location.href;
-	window.location.href = "assemblyManagement" + tabName+ ".html";
-}*/
-
 function changeCheckbox(tableId){
-	//console.log("tr11...",$("#" + tableId).find("tr"));
-	//console.log("11...",$("#" + tableId).find("tr input[name='btSelectItem']"));
 	$("#" + tableId).find("tr input[name='btSelectItem']").change(function(){
-		//console.log("!!!");assemblyTaskleftFootTable
-		//$("#" + targetTableId).find("tr input[name='btSelectItem']").prop('checked', false);
 		console.log("ddd",$("#assemblyTaskLeftTopTableWrapp #assemblyTaskleftFootTable").html());
-       //console.log("...",$("#assemblyTaskleftFootTable tr input[name='btSelectItem']"));
 		$("#assemblyTaskleftFootTable").find("tr input[name='btSelectItem']").prop('checked', false);
-		//console.log("222");
 	});
-	
-	
 }
 </script>
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24425 -r24430
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24425)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24430)
@@ -1,11 +1,7 @@
 var documentHeight  = $(window).height();
-var tableTopL ="";
 var recoredTableH ="";
 var assemblyTaskLeftTopTableCon = []; //left table top
-var result2 ='';
 var addVal = "";
-var getIndexPar ="";
-
 //页面一加载就获取焦点
 $("#searchBarcode").focus();
 //增加table的paddiing
@@ -15,16 +11,13 @@
 }
 $("#packPrint").click(function(){
 	// 开始构造参数循环调用装配方法
-	  
 	  var tempTableId = "";
 	  if($("#assemblyTaskleftFootTable").bootstrapTable('getSelections').length>0){
 		  tempTableId = "assemblyTaskleftFootTable"; 
 	  }else{
 		  tempTableId = "assemblyTaskLeftTopTable"; 
 	  }
 	 var table = $("#" + tempTableId);
-	
-	  //var table = $("#assemblyTaskleftFootTable");
 	  var selections = table.bootstrapTable('getSelections');
 	  if(selections == null || selections.length == 0){
 		  return ;
@@ -127,20 +120,20 @@
 				//检查人
 				var inspector = $("#inspectorInput").val();
 				// 检查人工号
-				var inspectorCode = $("#inspectorCodeInput").val();
+				var inspectorCode = $("#inspectorCodeInputHidden").val();
 				
 				//配包人
 				var operator = $("#operator").val();
-				var operatorCode = $("#operatorCode").val();
+				var operatorCode = $("#operatorCodeHidden").val();
 				//审核人
 				var reviewer = $("#reviewer").val();
-				var reviewerCode = $("#reviewerCode").val();
+				var reviewerCode = $("#reviewerCodeHidden").val();
 				//灭菌人
 				var sterileUserName = $("#sterileUserName").val();
-				var sterileUserCode = $("#sterileUserCode").val();
+				var sterileUserCode = $("#sterileUserCodeHidden").val();
 				//包装人
 				var wrapper = $("#wrapper").val();
-				var wrapperCode = $("#wrapperCode").val();
+				var wrapperCode = $("#wrapperCodeHidden").val();
 				
 				//包装类型
 				var packageType = $("#packageType option:selected").val();
@@ -157,7 +150,6 @@
 				
 				//炉次 
 				var frequency =$("#frequency").val();
-				console.log("taskGroup..."+taskGroup);
 				//确认继续 confirmContinue
 				//tousseWeight 器械包重量
 				
@@ -196,8 +188,6 @@
 				    	"packingParams": JSON.stringify(params)
 				    },
 				    success:function(result){
-				    	//console.log("result...",result);
-				    	//$("#item_table").bootstrapTable('refresh', opt);
 				    	if(result.success == true){
 				    		reloadPackingTasks();//刷新
 				    		alert(result.message);
@@ -215,7 +205,62 @@
 				});
 	  }
 });
-
+//检查人条码
+$("#inspectorCodeInput").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var inspectorCodeInput = $("#inspectorCodeInput").val();
+    	$("#inspectorCodeInputHidden").val(inspectorCodeInput);
+    	requstCode(inspectorCodeInput,"inspectorInput","inspectorCodeInput","operatorCode");
+    }
+})
+//配包人条码
+$("#operatorCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var operatorCode = $("#operatorCode").val();
+    	 $("#operatorCodeHidden").val(operatorCode);
+    	requstCode(operatorCode,"operator","operatorCode","reviewerCode");
+    }
+})
+//审核人条码
+$("#reviewerCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var reviewerCode = $("#reviewerCode").val();
+    	$("#reviewerCodeHidden").val(reviewerCode);
+    	requstCode(reviewerCode,"reviewer","reviewerCode","wrapperCode");
+    }
+})
+//包装人条码
+$("#wrapperCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var wrapperCode = $("#wrapperCode").val();
+    	$("#wrapperCodeHidden").val(wrapperCode);
+    	requstCode(wrapperCode,"wrapper","wrapperCode","sterileUserCode");
+    }
+})
+//灭菌人条码
+$("#sterileUserCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var sterileUserCode = $("#sterileUserCode").val();
+    	$("#sterileUserCodeHidden").val(sterileUserCode);
+    	requstCode(sterileUserCode,"sterileUserName","sterileUserCode","");
+    }
+})
+function requstCode(barcode,name,namecode,focusInput){
+	$.ajax({
+		url:"/disinfectSystem/web/userController/getUserByBarcode.mhtml",
+		dataType: "json", 
+	    async: false, 
+	    data: {"barcode":barcode}, 
+	    type: "post", 
+	    success:function(result){
+	    	 if(result.success == true){
+	    		 $("#"+name).val(result.name);
+		    	 $("#"+namecode).val("");
+		    	 $("#"+focusInput).focus();
+	    	 }
+	    }
+	})
+}
 //补充丢弃器械和报损按钮的数字
 $.ajax({  
 	    url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml",
@@ -236,33 +281,7 @@
 	    	console.log(msg.message);
 	    }*/
 });
-Mock.mock(
-	      'http://shenheren', 
-	      {
-	    	  "success": true,
-	    	  "name":"张三"
-	      }
-);
-//审核人条码
-$("#reviewerCode").keydown(function(e){
-//var reviewer = $("#reviewer").val();
-    if (e.keyCode == 13) {
-    	$.ajax({
-    		url:"http://shenheren",
-    		 dataType: "json", 
-		     async: false, 
-		     data: {}, 
-		     type: "GET", 
-		     success:function(result){
-		    	 console.log("...",result.name);
-		    	 $("#reviewer").val(result.name);
-		    	 $("#reviewerCode").val("");
-		    	 $("#wrapperCode").focus();
-		    	 //console.log(".....",$("#reviewer").parent().parent().next().children().children());
-		     }
-    	})
-    }
-})
+
 $(function(){
   //补充丢失器械按钮弹框
   $("#addLose").click(function(){
@@ -333,8 +352,6 @@
   })
  /* left top table start*/
   var tabH = documentHeight-39-123;
-  console.log("documentHeight"+documentHeight);
-  console.log("tabH"+tabH);
   var tableHTop = tabH*0.45;
   var tableHFoot = tabH*0.55;
   $("#tableTopBox").css({"height":tableHTop+"px"});
@@ -354,9 +371,7 @@
           sortable:true, //正序,逆序
           switchable: false,
           cellStyle:function(value,row,index){
-        	  //console.log("row......"+JSON.stringify(row));
         	  for(i=0;i<row.children.length;i++){
-        		  //console.log("row2222"+JSON.stringify(row.children[i]));
         		  if(row.children[i].status == '待装配'){
 			            var supplent = true;
 			            for(var j = 0;j < row.children[i].errors.length ; j++) {
@@ -408,9 +423,6 @@
            align : 'center',
            sortable:true,
            width:300
-          /* formatter:function(v,record){
-        	   return "<input type=\"button\" value=\"test\" />";
-           }*/
         },
         {
            title : '申请科室',
@@ -440,9 +452,7 @@
    /*在篮筐中输入条码*/
     $("#searchBarcode").keydown(function(e){
       if (e.keyCode == 13) {
-         //console.log(11);
     	  var searchBarcodeVal = $("#searchBarcode").val();
-    	  console.log("searchBarcodeVal..",searchBarcodeVal);
     	  $.ajax({
     		    url: "/disinfectSystem/packingController/getPackingTaskList.mhtml",
     		    dataType: "json", 
@@ -477,11 +487,8 @@
 		    	            "margin-top":"4px",
 		    	            "margin-bottom":"4px"
 		    	          });
-    		    	      subText("assemblyTaskleftTopTable");
-    		    	       $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"29px"});
+    		    	      $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"29px"});
     		    		  subText("assemblyTaskLeftTopTable");
-    		    		  changeCheckbox("assemblyTaskleftTopTable");
-    		    		  /*changeCheckbox("assemblyTaskleftTopTable","assemblyTaskleftFootTable");  	*/
     		    	
     		    	}else{
     		    		alert("错误");
@@ -650,19 +657,9 @@
           field : 'tousseName',
           align : 'center',
           sortable:true, //正序,逆序
-          switchable: false,
-        /*  formatter:function(v,record){
-        	  if(!record.leaf){
-        		  return "<span id='dataPar_index"+record.rowIndex+"'>"+v+"</span>";
-        	  }else{
-        		  return "<span id='dataChild_index"+record.rowIndex+"'>"+v+"</span>";
-        	  }
-       	  
-          },*/
-          cellStyle:function(value,row,index){
-        	  //console.log("row......"+JSON.stringify(row));
+          switchable: false
+          cellStyle:function(value,row,index){;
         	  for(i=0;i<row.children.length;i++){
-        		  //console.log("row2222"+JSON.stringify(row.children[i]));
         		  if(row.children[i].status == '待装配'){
 			            var supplent = true;
 			            for(var j = 0;j < row.children[i].errors.length ; j++) {
@@ -725,9 +722,6 @@
            align : 'center',
            sortable:true,
            width:300
-           /*formatter:function(v,record){
-        	   return "<input type=\"button\" value=\"test\" />";
-           }*/
         },
         {
            title : '申请科室',
@@ -786,19 +780,15 @@
 		    		    "padding-top":"2px"
 		    		  })
 		    		  $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"56px"});
-		    		  subText("assemblyTaskleftFootTable");  
-		    		 // changeCheckbox("assemblyTaskleftFootTable","assemblyTaskleftTopTable"); 
+		    		  subText("assemblyTaskleftFootTable"); 
 		    		  
 		    	}else{
 		    		alert("错误");
 		    	}
 		    }
 		  });
   }
-  
   loadPackingTasks();
-  
-  
   function assemblyTaskLeftFootload(tableDate,columns){
     $("#assemblyTaskleftFootTable").bootstrapTable(
         {   
@@ -820,8 +810,7 @@
             sortName: 'appTime',//排序字段
             showColumns: true,//删选列按钮
             showRefresh: true,//刷新按钮
-          /*  silent: true,  //刷新事件必须设置  
-*/            clickToSelect: true,
+            clickToSelect: true,
             formatLoadingMessage: function () {  
               return "请稍等，正在加载中...";  
             },  
@@ -837,49 +826,21 @@
             },
             onRefresh: function(params){
             	if(params && params.type =='click'){
-            		add();
+            		refreshFootTable();
             	}
-            },
-//           onRefresh:function(params){
-//            	//console.log("刷新。。",params);
-//            	$("#assemblyTaskleftFootTable").bootstrapTable("refresh");
-//            }, 
+            }
             idField : "id",
             columns : columns,//表头
             onExpandRow: function (index, row, $detail) {
-            	//var text=$("#assemblyTaskleftFootTable").find("tr[data-index="+index+"]").children("td")[2].firstChild.getAttribute("id");
-            	getIndexPar =$("#assemblyTaskleftFootTable").find("tr[data-index="+index+"] td:eq(2)").find("span").attr("id");
-            	/*console.log("id:"+text);
-            	console.log("row..."+JSON.stringify(row));
-            	console.log("index"+index);*/
-            	//var mapChildren = {};
-            	//console.log("name/...",row.tousseName.attr("id"));
-            	//<span id='dataPar_index"+i+"' class='foot-index'>"+list.tousseName+"</span>
-            	
-            	//var taskPar1 = $("#dataPar_index"+0).data('taskPar');
-            	//console.log("taskPar1"+JSON.stringify(taskPar1));
-            	
             	var thW = $("#assemblyTaskleftFootTable").find("th");
-            	//console.log("id",$("#assemblyTaskleftFootTable>tbody>td "))
             	var childrens = row.children;
                 var table="<table id='assemblyTaskleftFootTableSub'>";
-            	for(var i=0;i<childrens.length;i++){
-            		//var tempChildJSON = escape(JSON.stringify(childrens[i]));
-            		
+            	for(var i=0;i<childrens.length;i++){            		
             		var tipsColor = "";
             		var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteFoot('" + childrens[i].tousseID + "')'/>"; 
-            		
-            		//table += "<tr onclick=\"leftFootTableTrClickEvent(1, this)\">"
-            		//"<span id='dataPar_index"+i+"' class='foot-index'>"+list.tousseName+"</span>";
-            		
-            		/*table += "<tr id='"+getIndexPar+"datachild_index"+i+"'>"
-                     		+"<td width='"+($(thW[0]).width()+1)+"'></td>"
-                     		+"<td width='"+($(thW[1]).width()+2)+"'></td>";*/
-            		//table += "<tr datajson=" + tempChildJSON + ">"
             		table += "<tr>"
              			+"<td width='"+($(thW[0]).width()+1)+"'></td>"
              			+"<td width='"+($(thW[1]).width()+2)+"'></td>";
-            		
             		if(childrens[i].status == '待装配'){
 			            var supplent = true;
 			            for(var j = 0;j < childrens[i].errors.length ; j++) {
@@ -914,41 +875,18 @@
                 $detail.html(table);
                 subText("assemblyTaskleftFootTableSub");
             },
-           /* onCheckSome:function(rows){
-            	var topCheckeds=$("#assemblyTaskLeftTopTable").bootstrapTable("getSelections");
-            	console.log("topCheckeds",topCheckeds.length);
-            }*/
           onCheck:function(row){//foot
-        	  console.log("row",row);
-            	var topCheckeds=$("#assemblyTaskLeftTopTable").bootstrapTable("getSelections");
-            	if(topCheckeds.length>0){
+            	/*var topCheckeds=$("#assemblyTaskLeftTopTable").bootstrapTable("getSelections");
+            	if(topCheckeds.length>0){*/
             		$("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll");
-            	}
-            	//console.log("topCheckeds",topCheckeds.length);
-            	/*if(topfalse==true){
-            		topfalse = false;
-            	}
-            	            	footfalse = true;
-            	console.log("topfalse.."+topfalse);*/
-            	
-            	//alert("topCheckeds:"+topCheckeds.length);
-            	//如果topCheckeds.length > 0
+            	/*}*/
             }
-
-       
         });
   }
   
- function add(){
-		/*$("#assemblyTaskleftFootTable").bootstrapTable("refresh");*/
-	 
+ function refreshFootTable(){
 	 reloadPackingTasks();
-//	 assemblyTaskLeftFootload(result2.data,assemblyTaskleftFootTable_columns);
-	// $("#assemblyTaskleftFootTable").bootstrapTable("refresh");
  }
-  /*left foot table end*/
-  //var tabH = documentHeight-39-122;
-
   var assemblyTaskLeftTopTable = "<table id='assemblyTaskLeftTopTable' class='table table-striped table-bordered table-hover cleanPadding' data-height='"+resultHTop+"' data-toggle data-toggle='table'></table>";                  
   $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); 
   assemblyTaskLeftTopload(assemblyTaskLeftTopTableCon,assemblyTaskLeftTopTable_columns);
@@ -1251,10 +1189,10 @@
     
     $("#assemblyTaskLeftTopTable").on("check.bs.table check-all.bs.table",function(row){
     	//首先判断FootTable是否已有选中
-    	var footCheckeds=$("#assemblyTaskleftFootTable").bootstrapTable("getSelections");
-    	if(footCheckeds.length>0){
+    	/*var footCheckeds=$("#assemblyTaskleftFootTable").bootstrapTable("getSelections");
+    	if(footCheckeds.length>0){*/
     		$("#assemblyTaskleftFootTable").bootstrapTable("uncheckAll");
-    	}
+    	/*}*/
    
     	
     })
@@ -1263,7 +1201,6 @@
 
 //加载table
 function loadTable(id,tableDate,columns,isPagination,isSearch,toolbarId,detailView,showColumn,isRefresh){//detailView树形菜单
-    //console.log(tableDate);
     $("#"+id).bootstrapTable(
                 {   
                     data:tableDate,
@@ -1314,10 +1251,7 @@
 //今天本组装配记录
 function todayAssemblyRecordTableload(todayId,tableHead,tableConData){
   $("#"+todayId).bootstrapTable(
-    {   
-        /* method : 'get',
-        dataType : "json",
-        dataField : "data",*/// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+    {  
         striped : true,// 设置为 true 会有隔行变色效果
         undefinedText : " ",// 当数据为 undefined 时显示的字符
         pagination : true, // 分页
@@ -1365,9 +1299,6 @@
 function addBreakageTableload(todayId,tableHead,tableConData){
   $("#"+todayId).bootstrapTable(
     {   
-        /* method : 'get',
-        dataType : "json",
-        dataField : "data",*/// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
         striped : true,// 设置为 true 会有隔行变色效果
         undefinedText : " ",// 当数据为 undefined 时显示的字符
        // pagination : true, // 分页
@@ -1429,100 +1360,96 @@
 
 }
 var printAmendtable_columns=[ 
-                             {
-                               checkbox : true,
-                             },
-                             {
-                               title : "条形码",
-                               field : 'barCode',
-                               align : 'center',
-                               sortable:true //正序,逆序
-                             },
-                             {
-                                title : '器械包',
-                                field : 'instrument',
-                                align : 'center',
-                               sortable:true //正序,逆序
-                             },
-                             {
-                                title : '科室',
-                                field : 'deparent',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             },
-                             {
-                                title : '配包员',
-                                field : 'bagpeo',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             },
-                              {
-                                title : '审核人',
-                                field : 'auditor',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             },
-                              {
-                                title : '包装人',
-                                field : 'openBagPeo',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }, {
-                                title : '清洗时间',
-                                field : 'cleanDate',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }, {
-                                title : '装配时间',
-                                field : 'bagDate',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }
-                             , {
-                                title : '包装类型',
-                                field : 'bagClass',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }
-                             , {
-                                title : '灭菌程序',
-                                field : 'sterilizeProcedure',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }
-                              , {
-                                title : '失效日期',
-                                field : 'expiryDate',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }
-                              , {
-                                title : '灭菌炉',
-                                field : 'sterilizeBox',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }
-                              , {
-                                title : '炉次',
-                                field : 'boxNum',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }
-                              , {
-                                title : '状态',
-                                field : 'sterilizeSatatus',
-                                align : 'center',
-                                sortable:true //正序,逆序
-                             }
+     {
+       checkbox : true,
+     },
+     {
+       title : "条形码",
+       field : 'barCode',
+       align : 'center',
+       sortable:true //正序,逆序
+     },
+     {
+        title : '器械包',
+        field : 'instrument',
+        align : 'center',
+       sortable:true //正序,逆序
+     },
+     {
+        title : '科室',
+        field : 'deparent',
+        align : 'center',
+        sortable:true //正序,逆序
+     },
+     {
+        title : '配包员',
+        field : 'bagpeo',
+        align : 'center',
+        sortable:true //正序,逆序
+     },
+      {
+        title : '审核人',
+        field : 'auditor',
+        align : 'center',
+        sortable:true //正序,逆序
+     },
+      {
+        title : '包装人',
+        field : 'openBagPeo',
+        align : 'center',
+        sortable:true //正序,逆序
+     }, {
+        title : '清洗时间',
+        field : 'cleanDate',
+        align : 'center',
+        sortable:true //正序,逆序
+     }, {
+        title : '装配时间',
+        field : 'bagDate',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+     , {
+        title : '包装类型',
+        field : 'bagClass',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+     , {
+        title : '灭菌程序',
+        field : 'sterilizeProcedure',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '失效日期',
+        field : 'expiryDate',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '灭菌炉',
+        field : 'sterilizeBox',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '炉次',
+        field : 'boxNum',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '状态',
+        field : 'sterilizeSatatus',
+        align : 'center',
+        sortable:true //正序,逆序
+         }
 
-                       ];
+   ];
 //今天本组装配记录点击表格每一行出现的弹框表格
 $("#printAmendtable").bootstrapTable(
-  {   
-      /* method : 'get',
-      dataType : "json",
-      dataField : "data",*/// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
-      //是否显示分页（*）
+  {  
       striped : true,// 设置为 true 会有隔行变色效果
       undefinedText : " ",// 当数据为 undefined 时显示的字符
       pageNumber : 1,// 如果设置了分页，首页页码
@@ -1548,7 +1475,6 @@
       },
       onClickRow: function (row) {//点击每一行
         $("#todayAssemblyRecordModel").modal('show');
-        //console.log(row);
       },
       idField : "id",
       columns : printAmendtable_columns 
@@ -1581,9 +1507,7 @@
 
 //left  top  table 报损按钮
 function addBreakageTableBtnTop(){
-  //console.log("!!1");
   $('.addBreakageModel').modal('show');
-  //console.log("con",$("#addBreakageModel").html());
   $(".addBreakageModel .modal-title").text("器械补充");
 }
 
@@ -2155,7 +2079,7 @@
 // 渲染右侧table end
 
 // 右侧table td绑定点击事件 start
-function rightTableTdClickEvent() {
+/*function rightTableTdClickEvent() {
   $("#materialsTable tbody tr").each(function(trIndex, trEle){
     $(trEle).find("td:not(:first)").click(function(){
       var $secendTdSpan = $(this).parent().find("td:eq(1) span");
@@ -2230,22 +2154,18 @@
       }
     });
   });
-}
+}*/
 // 右侧table td绑定点击事件 end
 
 window.onload=function(){
   $("#assemblyTaskLeftTopTableWrapp").bootstrapTable('resetView');//自适应宽度
   $("#assemblyTaskleftFootTableWrapp").bootstrapTable('resetView');//自适应宽度
   subText("assemblyTaskleftTopTable");//截取
   subText("assemblyTaskleftFootTable");//截取left foot table
-  //footTableRowClickEvent();
-  //topTableRowClickEvent();
  
+ 
 }
-/*function showNumWrapper(that){
-	var vals = $(that).val();
-	console.log("vals"+vals);
-}*/
+
 /*数字增减*/
 function addNum(that){
 	var numVals = $(that).parent().siblings("input").val();
@@ -2278,15 +2198,13 @@
 	  $(that).parent().siblings("input").val(addVal);
   }
 }
-console.log("addVal..."+addVal);
-///炉次增减
+//增加炉次
 function addFrequency(that){
   var addVal = parseInt($(that).parent().siblings("input").val())+1;
   if(($(that).parent().siblings("input").val())==""){
     addVal =1;
   }
   $(that).parent().siblings("input").val(addVal);
-  //console.log("valsssss.."+$(that).parent().siblings("input").val());
 }
 function reduceFrequency(that){
   var reduceVal = parseInt($(that).parent().siblings("input").val())-1;
@@ -2310,7 +2228,6 @@
       var scrollY = document.documentElement.scrollTop || document.body.scrollTop;  
       var x = e.pageX || e.clientX + scrollX;  
       var y = e.pageY || e.clientY + scrollY; 
-      //$("#showTip").html(txts);
       var windowWidth = $(window).width();
       var windowHeight = $(window).height();
       var materialsW = $(".metariles-list-tips").width();
@@ -2337,7 +2254,7 @@
   }
 })
 
-function prevPage(num){
+/*function prevPage(num){
   var countPage = parseInt($("#goodsImg").attr("imgcount"));
   if(countPage<2){
     return;
@@ -2346,7 +2263,6 @@
   indexPage = indexPage+ parseInt(num);
   if( num > 0 ){//下一页
     if(indexPage > countPage-1){
-      //indexPage = 0;
       alert("已经是最后一张");
       return;
 
@@ -2360,7 +2276,7 @@
   }
   $("#goodsImg").attr("src", $("#goodsImg").attr("src"+indexPage));
   $("#goodsImg").attr("startindex", indexPage);
-}
+}*/
 
 $(function(){
 	   setInterval(function(){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
===================================================================
diff -u -r24425 -r24430
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24425)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24430)
@@ -41,7 +41,6 @@
                         +  "<i onclick=\"closeTab(this,'" +tabId+"')\" class='close-tab'></i>"
                         +  "</a>"
                         +  "</li>";
-       // var tempUrl = url + "?taskGroup=" +tabName;
         var tabContentHtml = "<div class='tab-pane active' id='"+tabId+"' style='width:100%;height: 100%;'>"
                            + "<iframe src= '"+url+"'' frameborder='0' scrolling='no' style='width:100%;height: 100%;'></iframe>"
                            + "</div>";
@@ -206,13 +205,10 @@
     //加载个人桌面图标
     $.ajax({
         url:"/disinfectSystem/userController/loadDesktopMenu.mhtml",
-        //url:"http://grzmtb",
         type: 'get',
         dataType:'JSON',
         async:false,
-        //data:{userCode:userCode},
         success:function(result){
-        	console.log("result.."+result);
             if(result.success == true){
                 menuJsonRows = result.rows;
                 for (var k = 0;k < (result.rows.length/12);k++) {
@@ -222,7 +218,6 @@
                 }
                 //onclick="changeTab('tab5', '清洗消毒','html/qxxd.html')"
                 for(var i = 0; i < result.rows.length; i++){
-                	// console.log("menuJsonRows"+ result.rows[i]);
                     var myMenuGroup = "";// 自定义菜单
                     var menuHref = "javascript:void(0);";
                     var menuTarget ="target=\"_black\"";
@@ -259,7 +254,6 @@
                         //自定义菜单的ul
                         //<ul class="menu sub-menu" id="sub_menu_[parentId]"></ul>  
                         var subMenu = "<ul class='right-hand-custom-menu' id='sub_menu_"+tabId+"'></ul>";
-                        //console.log("sub_menu_"+tabId+""); 6 ,7 ,9
                         $("body").append(subMenu);
                         //数据
                         var submenu = menuJson.children;
@@ -269,7 +263,6 @@
                         for(var j = 0 ; j < submenu.length; j++) {
                             var submenusLi = submenu[j];
                             var taskTitle = submenusLi.title;
-                            //console.log("title",submenusLi.title);
                             submenuClick = "onclick=\"changeTab(" 
                                             + "'"
                                             + "menu_sub_" 
@@ -301,8 +294,6 @@
                                  + ","
                                  + "'" + menuJson.itemLinkUrl + "'"
                                  + ")\"";
-                       /* systemWarningModel = "data-toggle" + "=" + "modal";
-                        systemWarningModelTarget = "data-target" + "=" + "#systemWarning";*/
                         
                     }
                     var menuTemplateHtml = "<div class='col-lg-1 col-md-2 col-sm-2 col-xs-4 text-center content-index-tab-col-mb20 " + myMenuGroup +"'  id='menu_"+tabId+"' data-id='"+tabId+"'>"
@@ -311,12 +302,8 @@
                         + "<p class='content-index-tab-icon-text'><span>"+menuText+"</span></p>"
                         + "</a>"
                         + "</div>"
-                        //判断应该append到哪一个row
+                     //判断应该append到哪一个row
                     $("#row_" + rowsIndex).append(menuTemplateHtml);
-                        //图片提示,在数据里面配置需要这个的
-                   // var countMsg = menuJson.countMsg;
-            
-                   
                     //放在这里不放在前面是因为要等前面的结构append完
                     if(menuJson.type == 3) {
                         bindEventForMenu(tabId);
@@ -464,7 +451,6 @@
                 for(var i = 0; i < menuJsonRows.length;i++){
                     var tabId = menuJsonRows[i].itemId;
                     //changeTab('menu_xtgjid','系统告警','html/xtgj.html')
-                    //var myId = 
                     if(menuJsonRows[i].type == 4 && tabId == "jwglid"){
                         if (result.data.amount == undefined || result.data.amount <= 0) {
 
@@ -513,12 +499,12 @@
     })
     
     //退出系统
-    $.ajax({
+  /*  $.ajax({
         //url:"http://",
         type: 'post',
         dataType:'JSON',
         success:function(){
             window.location.href=""
         }
-    })
+    })*/
 })