Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24513 -r24517
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24513)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24517)
@@ -954,7 +954,9 @@
 	var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>';
 	var IMAGE_TYPE_MATERIAL_FUNCTIONCHECK = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>';
 	var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT%>';
-	
+	//回收记录
+	 var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>';
+	 
    	 var WWWROOT = '${basePath}';
 	// var taskGroup = '${taskGroup}';
 	 var taskGroup = parent.myGroupName;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
===================================================================
diff -u -r24513 -r24517
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24513)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24517)
@@ -196,7 +196,7 @@
         $("#setDepartments").modal('hide');//这个隐藏看情况
         $.ajax({
            // url:"/systemmanage/user/setCurrentOrgUnitCode.do",
-            url:"http://",
+           // url:"http://",
             type: 'get',
             dataType:'JSON',
             success:function(result){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24513 -r24517
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24513)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24517)
@@ -9,6 +9,7 @@
   $("."+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
   $("#"+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
 }
+//点击装配按钮
 $("#packPrint").click(function(){
 	// 开始构造参数循环调用装配方法
 	  var tempTableId = "";
@@ -141,7 +142,16 @@
 				var sterilingType = $("#sterilingType option:selected").val();
 				//灭菌日期
 				var sterileDate = $("#determineDate").val();
-				
+        
+				if(sterileDate == undefined || sterileDate == ""){
+          var date = new Date();
+          Y = date.getFullYear() + '-';
+          M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
+          D = date.getDate() + ' ';
+          D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate());
+          sterileDate =  Y+M+D;
+
+        }
 				//外来器械拆包信息  splitPackage
 				//篮筐条码
 				//扫描的篮筐条码 scannedBasketBarcodes
@@ -570,7 +580,7 @@
     		  });
 
         
-        //把表格高度变小
+          //把表格高度变小
           $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"});
           $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({
             "padding-bottom":"2px",
@@ -655,6 +665,7 @@
             sortName: 'appTime',//排序字段
             showColumns: true,//删选列按钮
             silent: true,  //刷新事件必须设置  
+            clickToSelect:true,//选中行时帮我选中复选框
             formatLoadingMessage: function () {  
               return "请稍等，正在加载中...";  
             },  
@@ -714,44 +725,30 @@
                 $detail.html(table);
                 subText("assemblyTaskleftTopTableSub");
                 var topTableSubTr = $detail.find("#assemblyTaskleftTopTableSub tbody tr");
-    			for(var i=0;i<topTableSubTr.length;i++){
-    				$(topTableSubTr[i]).click(function(){
-    					$.ajax({
-                  		    url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
-                 		    dataType: "json", 
-                 		    async: true, 
-                 		    data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, 
-                 		    type: "post", 
-                 		    success: function(result) {
-                 		    	console.log("result..",result);
-                 		    	if(result.success == true){
-                 		    		$("#materialTotalAmount").text(result.materialTotalAmount);
-             		    			$("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);
-             		    			$("#materialsTable").bootstrapTable('destroy');
-                     		    	materialsLoadTable(result.rows,materials_columns);
-                     		    	metarilsFocus();//显示功能检查
-                 		    	}else{
-                 		    		alert(result.message);
-                 		    	}
-                 		    	
-                 		    }
-                  			
-                  		})
-    				})
-    			
-    			}
+        		    materialListSub(topTableSubTr,row);//子级材料清单
                 metarilsFocus();//显示功能检查
             },
             onClickRow: function(row,element){
-      			$("#sterilingType").val(row.sterilingMethod);
-      			//根据灭菌程序设置灭菌方式的值
-      			$("#sterilingType").change();
-      		    $("#packageType").val(row.packageType);          		
-           },
-           /* onCheck:function(row){
-            	
+      		    $("#sterilingType").val(row.sterilingMethod);
+    			    //根据灭菌程序设置灭菌方式的值
+      			  $("#sterilingType").change();
+      		    $("#packageType").val(row.packageType);  
+      		    //父材料清单
+          		materialList(row);
+            },
+            onCheck:function(row){//top
+         	    packPrintChange();
+            },
+            onUncheck:function(row){
+          	  packPrintChange();
+            }
+         /*   onCheckAll:function(row){
+           	  packPrintChange();
+            },
+            onUncheckAll:function(row){
+            	packPrintChange();
             }*/
-       
+            
         });
   }
   /*left top table end*/
@@ -767,17 +764,15 @@
           align : 'center',
           sortable:true, //正序,逆序
           switchable: false,
-          formatter:function(v,record){
+          formatter:function(v,record,index){       
+        	  var vs = v ;
         	  for(var i=0;i<record.children.length;i++){
-        		  if(record.children[i].basketName !=""){
-        			  $("#packPrint").hide();
-        			  return "<span class=''>"+v+"</span>";
-        		  }else{
-        			  $("#packPrint").show();
-        			  return "<span class='glyphicon glyphicon-star'>"+v+"</span>";
+        		  if(record.children[i].taskType != taskType_recyclingRecord){
+        			  vs = "<img src='/dx-disinfectsystem/img/start.png' class='stratImg'/>"+v;
+        			  break;
         		  }
         	  }
-        	 
+           return vs;
           },
           cellStyle:function(value,row,index){
         	  for(i=0;i<row.children.length;i++){
@@ -887,7 +882,7 @@
 		        //console.log('start');
 		    },
 		    success: function(result) {
-		    	 result2 = result;
+		    	 //result2 = result;
 		    	if(result.success == true){
 		    		var mapParent = {};
 		    	      for(var i=0;i<result.data.length;i++){
@@ -958,13 +953,14 @@
             onExpandRow: function (index, row, $detail) {
             	var thW = $("#assemblyTaskleftFootTable").find("th");
             	var childrens = row.children;
-                var table="<table id='assemblyTaskleftFootTableSub'>";
-            	for(var i=0;i<childrens.length;i++){            		
+            
+              var table="<table id='assemblyTaskleftFootTableSub'>";
+            	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>"
-             			+"<td width='"+($(thW[0]).width()+1)+"'></td>"
-             			+"<td width='"+($(thW[1]).width()+2)+"'></td>";
+                 			+"<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++) {
@@ -981,10 +977,10 @@
 			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addLoseTableBtnFoot('" +childrens[i].tousseID + "')'>报损</button>";
 			            	tipsColor = "style='color:red;'";
 			            }
-			        }
+			          }
 			        	
             		table += "<td width='"+($(thW[2]).width()+2)+"' "+tipsColor+" ><span id='datachild_index"+i+"'>"+childrens[i].tousseName+"</span></td>"
-            		 +"<td width='"+($(thW[3]).width()+2)+"'>"+childrens[i].amount+"</td>"
+            		     +"<td width='"+($(thW[3]).width()+2)+"'>"+childrens[i].amount+"</td>"
                      +"<td width='"+($(thW[4]).width()+2)+"'>"+childrens[i].urgentAmount+"</td>"
                      +"<td width='"+($(thW[5]).width()+2)+"'>"+childrens[i].urgentLevel+"</td>"
                      +"<td width='"+($(thW[6]).width()+2)+"'>"+childrens[i].basketName+"</td>"
@@ -993,85 +989,119 @@
                      +"<td width='"+($(thW[9]).width()+2)+"'>"+childrens[i].washTime+"</td>"
                      +"<td width='"+($(thW[10]).width()+2)+"'>"+childrens[i].status+"</td>"
                      +"<td width='"+($(thW[11]).width()+1)+"'>"+childrens[i].dateTime+"</td>"
-                    +"</tr>"
+                     +"</tr>"
             	}
-                table +="</table>";
-                $detail.html(table);
-                subText("assemblyTaskleftFootTableSub");
-                var footTableSubTr = $detail.find("#assemblyTaskleftFootTableSub tbody tr");
-    			for(var i=0;i<footTableSubTr.length;i++){
-    				$(footTableSubTr[i]).click(function(){
-    					$.ajax({
-                  		    url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
-                 		    dataType: "json", 
-                 		    async: true, 
-                 		    data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, 
-                 		    type: "post", 
-                 		    success: function(result) {
-                 		    	console.log("result..",result);
-                 		    	if(result.success == true){
-                 		    		$("#materialTotalAmount").text(result.materialTotalAmount);
-             		    			$("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);
-             		    			$("#materialsTable").bootstrapTable('destroy');
-                     		    	materialsLoadTable(result.rows,materials_columns);
-                     		    	metarilsFocus();//显示功能检查
-                 		    	}else{
-                 		    		alert(result.message);
-                 		    	}
-                 		    	
-                 		    }
-                  			
-                  		})
-    				})
-    			
-    			}
+              table +="</table>";
+              $detail.html(table);
+              subText("assemblyTaskleftFootTableSub");
+              var footTableSubTr = $detail.find("#assemblyTaskleftFootTableSub tbody tr");
+              materialListSub(footTableSubTr,row);//子级材料清单
                 
             },
            onClickRow: function(row,element){
       			$("#sterilingType").val(row.sterilingMethod);
       			//根据灭菌程序设置灭菌方式的值
       			$("#sterilingType").change();
-      		    $("#packageType").val(row.packageType);          		
+      		  $("#packageType").val(row.packageType);          		
            },
           onCheck:function(row){//foot
-        	for(var i=0;i<row.children.length;i++){
-        		  //判断按钮显示
-        		  if(row.children[i].basketName != ""){
-        			  $("#packPrint").hide();
-        		  }else{
-        			  $("#packPrint").show();
-        		  }
-        	 };
-        	$("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll");
-    		//材料清单
-      		$.ajax({
-      		    url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
-     		    dataType: "json", 
-     		    async: true, 
-     		    data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, 
-     		    type: "post", 
-     		    success: function(result) {
-     		    	if(result.success == true){
-     		    		//器械总数
-     		    		$("#materialTotalAmount").text(result.materialTotalAmount);
-     		    		//一次性物品总数
- 		    			$("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);         		    			
- 		    			$("#materialsTable").bootstrapTable('destroy');
-         		    	materialsLoadTable(result.rows,materials_columns);
-         		    	metarilsFocus();//显示功能检查
-     		    	}else{
-     		    		alert(result.message);
-     		    	}
-     		    }
-      			
-      		})
+            $("#sterilingType").val(row.sterilingMethod);
+            //根据灭菌程序设置灭菌方式的值
+            $("#sterilingType").change();
+            $("#packageType").val(row.packageType);
+        	  packPrintChange();///判断按钮
+        	  $("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll");
+      		  //父级材料清单
+            materialList(row);
+        	
+           },
+           onUncheck:function(){
+        	   packPrintChange();
            }
         });
   }
-  
+  //父级材料清单
+  function materialList(rows){
+    $.ajax({
+      url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+      dataType: "json", 
+      async: true, 
+      data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
+      type: "post", 
+      success: function(result) {
+        if(result.success == true){
+          //器械总数
+          $("#materialTotalAmount").text(result.materialTotalAmount);
+          //一次性物品总数
+          $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);                       
+          $("#materialsTable").bootstrapTable('destroy');
+            materialsLoadTable(result.rows,materials_columns);
+            metarilsFocus();//显示功能检查
+        }else{
+          alert(result.message);
+        }
+      }
+      
+    })
+  }
+  //子级材料清单
+  function materialListSub(subTr,rows){
+    for(var i=0;i<subTr.length;i++){
+      $(subTr[i]).click(function(){
+        $.ajax({
+              url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+              dataType: "json", 
+              async: true, 
+              data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
+              type: "post", 
+              success: function(result) {
+                if(result.success == true){
+                $("#materialTotalAmount").text(result.materialTotalAmount);
+                $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);
+                $("#materialsTable").bootstrapTable('destroy');
+                    materialsLoadTable(result.rows,materials_columns);
+                    metarilsFocus();//显示功能检查
+                }else{
+                  alert(result.message);
+                }
+                
+              }
+              
+        });
+      })
+    }
+  }
  function refreshFootTable(){
 	 reloadPackingTasks();
  }
+ //判断按钮显示
+ function packPrintChange(){
+	 var selectionsTop = $("#assemblyTaskLeftTopTable").bootstrapTable('getSelections');
+	 if(selectionsTop.length>0){
+		 $("#packPrint").show();
+		 return;
+	 }
+	 var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections');
+	  var show = false;
+	  for(var i=0;i<selections.length;i++){
+		  var selectionsNode = selections[i].children;
+		  for(var j=0;j<selectionsNode.length;j++){
+			//不为回收任务时,不显示装配与打印按钮,只有任务类型为回收任务时才显示
+	       		if(selectionsNode[j].taskType != taskType_recyclingRecord){
+	       			show = true;
+	       			break;
+	       		}
+		  }
+		  if(show){
+			  break;
+		  }
+	  }
+	  if(show){
+		  $("#packPrint").show();
+	  }else{
+		  $("#packPrint").hide();
+	  }
+ }
   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);
@@ -1405,6 +1435,7 @@
     	/*var footCheckeds=$("#assemblyTaskleftFootTable").bootstrapTable("getSelections");
     	if(footCheckeds.length>0){*/
     		$("#assemblyTaskleftFootTable").bootstrapTable("uncheckAll");
+    		//packPrintChange();
     	/*}*/
     		//材料清单
       		$.ajax({
@@ -2115,6 +2146,7 @@
 })
 //截取left foot table 文字
 function subText(subId){
+	//return;
   var leftFootTrs = $("#" + subId + " tbody tr");
   if (subId == "assemblyTaskleftTopTable") {
     leftFootTrs = $("#assemblyTaskLeftTopTable tbody tr");
@@ -2125,24 +2157,32 @@
     for (var j = 0; j< leftFootTds.length; j++) {
       var leftFootTd = leftFootTds[j];
       //判断该td下是否有img或者button标签，有就continue
-      if ($(leftFootTd).has('img').length > 0 || $(leftFootTd).has('button').length > 0) {
+      if ($(leftFootTd).has("img:not('.stratImg')").length > 0 || $(leftFootTd).has('button').length > 0) {
         continue;
       }
        //判断该td下是否有span标签，并且含有assemblymanaged-date类，是就continue
-      if($(leftFootTd).has('span').length > 0 && $(leftFootTd).find("span").hasClass('assemblymanaged-date')){
+      /*if($(leftFootTd).has('span').length > 0 && $(leftFootTd).find("span").hasClass('assemblymanaged-date')){
         continue;
-      }
+      }*/
 
       var leftFootTdText = $(leftFootTd).text();
+      var tempImgSrc = $(leftFootTd).find("img").attr("src");
       if($(leftFootTd).attr("txts") == undefined || $(leftFootTd).attr("txts").length <= 0){
         $(leftFootTd).attr("txts",leftFootTdText);
       }
      
 
      if (leftFootTdText.length > 4) {
         //截取后
-        var subleftFootText = leftFootTdText.substring(0,4)+"...";
-        $(leftFootTd).text(subleftFootText);
+        var subleftFootText = leftFootTdText.substring(0,3)+"...";
+        if (tempImgSrc != undefined) {
+          $(leftFootTd).html("<img src='" + tempImgSrc + "'/>" + subleftFootText);
+        } else {
+          $(leftFootTd).text(subleftFootText);
+        }
+       
+
+
         $(leftFootTd).mouseover(function(e){
           $(this).css( "cursor","pointer");
           var e =e||window.event;
@@ -2152,6 +2192,8 @@
           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);
           
           $("#showTip").css({
@@ -2480,14 +2522,9 @@
 	  $(that).parent().siblings("input").val(reduceVal);
   }
 }
-
-/*$(function(){
-	
- 
-})*/
 function metarilsFocus(){
 	 //材料清单表格上mouseover显示的表格
-	  var materialsTr= $("#materialsTable tr");
+	  var materialsTr= $("#materialsTable tbody tr");
 	  var tables;
 	  for (var i = 0; i< materialsTr.length; i++) {
 	    $(materialsTr[i]).mouseover(function(e){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/img/start.png
===================================================================
diff -u
Binary files differ