Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24379 -r24390
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24379)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24390)
@@ -5,74 +5,143 @@
 //var assemblyTaskLeftFootTableCon = []; //left table foot
 //var footTable = []; //left table foot
 var addVal = "";
+var getIndexPar ="";
 
-
 //增加table的paddiing
 function addPaddingBottom(pbClass){
   $("."+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
   $("#"+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
 }
 
 $("#packPrint").click(function(){
-	  // 
-	  var taskIds = $("#taskId").val();
-	  //检查人
-	  var inspectorCodeInput = $("#inspectorCodeInput").val();
-	  console.log("KKKKK",inspectorCodeInput);
-	  return;
-	  var inspectorCode = $("#inspectorCode").val();
-	  //配包人
-	  var operator = $("#operator").val();
-	  var operatorCode = $("#operatorCode").val();
-	  //审核人
-	  var reviewer = $("#reviewer").val();
-	  var reviewerCode = $("#reviewerCode").val();
-	  //灭菌人
-	  var sterileUserName = $("#sterileUserName").val();
-	  var sterileUserCode = $("#sterileUserCode").val();
-	  //包装人
-	  var wrapper = $("#wrapper").val();
-	  var wrapperCode = $("#wrapperCode").val();
-	  
-	  //包装类型
-	  var packageType = $("#packageType option:selected").val();
-	  //灭菌程序
-	  var sterilingType = $("#sterilingType option:selected").val();
-	  //灭菌日期
-	  var sterileDate = $("#determineDate").val();
-	  //装配数量
-	  //任务组
-	  //外来器械拆包信息  splitPackage
-	  //篮筐条码
-	  //扫描的篮筐条码 scannedBasketBarcodes
-	  //标识牌实例id  idCardInstanceID
-	  //标识牌定义id   idCardDefinitionId
-	  //炉次 
-	  var frequency =$("#frequency").val();
-	  console.log("frequency..."+frequency);
-	  //确认继续 confirmContinue
-	  //urgentAmount 加急数量
-	  //tousseWeight 器械包重量
-	  //remark 备注 
-	  var remark = $("#remark").val();
-	  console.log("remark"+remark);
-	  /*$.ajax({
+	/*var taskPar = $("#dataPar_index"+0).data('taskPar');
+	
+	var taskChild = $("#"+getIndexPar+"datachild_index"+0).data('taskChild');
+	var taskArray =[];
+	  console.log("taskPar............",taskPar);
+	  console.log("taskChild............",taskChild);
+	  var footParTrLen = $("#assemblyTaskleftFootTable>tbody>tr");
+	  //console.log("footLen"+footLen);
+	  for(var i=0;i < footParTrLen.length; i++){
+		  var taskId = $(footParTrLen[i]).find("td:eq(2)").children("span").attr("id");
+		  taskArray.push(taskId);
+		  console.log("111",taskArray);
+		  
+		  var footParCheck = $(footParTrLen[i]).find("td:eq(1)").children();
+		  for(var j=0;j<footParCheck.length;j++){
+			 // console.log($(footParCheck[j]).attr('checked'));
+			  if($(footParCheck[j]).is(':checked')){
+				  
+				  return;
+			  }else{
+				  alert(false);
+			  }
+		  }
+		  if($footParTd.is(':checked')){
+			  alert("选择");
+		  }
+		  console.log("footParTd.............",footParTd);
+	  }*/
+	
+	/*var taskIdsArray = [];
+	// //装配数量
+	var packAmount = 1;
+	$("#assemblyTaskleftFootTable tbody tr").each(function(index, ele){
+		var tempInput = $(this).find("td:eq(1) input[name='btSelectItem']");
+		if($(tempInput).is(':checked')) {
+			var datajson = unescape($(tempInput).parent().next().find("span").attr("datajson"));
+			$(JSON.parse(datajson).children).each(function(childIndex, childEle){
+				taskIdsArray.push(childEle.taskId);
+			});
+			packAmount += parseInt($(tempInput).parent().next().next().find("input").val());
+		}
+	});
+	var taskIds = taskIdsArray.join(";");
+	//检查人
+	var inspector = $("#inspectorInput").val();
+	// 检查人工号
+	var inspectorCode = $("#inspectorCodeInput").val();
+	
+	//配包人
+	var operator = $("#operator").val();
+	var operatorCode = $("#operatorCode").val();
+	//审核人
+	var reviewer = $("#reviewer").val();
+	var reviewerCode = $("#reviewerCode").val();
+	//灭菌人
+	var sterileUserName = $("#sterileUserName").val();
+	var sterileUserCode = $("#sterileUserCode").val();
+	//包装人
+	var wrapper = $("#wrapper").val();
+	var wrapperCode = $("#wrapperCode").val();
+	
+	//包装类型
+	var packageType = $("#packageType option:selected").val();
+	//灭菌程序
+	var sterilingType = $("#sterilingType option:selected").val();
+	//灭菌日期
+	var sterileDate = $("#determineDate").val();
+	
+	//任务组
+	
+	//外来器械拆包信息  splitPackage
+	//篮筐条码
+	//扫描的篮筐条码 scannedBasketBarcodes
+	//标识牌实例id  idCardInstanceID
+	//标识牌定义id   idCardDefinitionId
+	//炉次 
+	var frequency =$("#frequency").val();
+	console.log("taskGroup..."+taskGroup);
+	//确认继续 confirmContinue
+	//urgentAmount 加急数量
+	var urgentAmount = 0;
+	//tousseWeight 器械包重量
+	//remark 备注 
+	var remark = $("#remark").val();
+	
+	var params = {
+			"taskIds":taskIds,
+	    	"inspector":inspector,
+	    	"inspectorCode":inspectorCode,
+	    	"operator":operator,
+	    	"operatorCode":operatorCode,
+	    	"reviewer":reviewer,
+	    	"reviewerCode":reviewerCode,
+	    	"sterileUserName":sterileUserName,
+	    	"sterileUserCode":sterileUserCode,
+	    	"wrapper":wrapper,
+	    	"wrapperCode":wrapperCode,
+	    	"packageType":packageType,
+	    	"sterilingType":sterilingType,
+	    	"sterileDate": new Date(sterileDate).getTime(),
+	    	"packAmount":packAmount,
+	    	"taskGroup":taskGroup,
+	    	"frequency":frequency,
+	    	"urgentAmount":urgentAmount,
+	    	"remark":remark
+		};
+	//alert("remark"+remark);
+	return;
+	console.log(JSON.stringify(params));
+	$.ajax({
 	    url:"/disinfectSystem/packingController/packingTousse.mhtml",
 	    dataType: "json", 
-	    type: "post", 
+	    type: "POST", 
 	    data:{
-	    	
-	    }
+	    	"packingParams": JSON.stringify(params)
+	    },
 	    success:function(result){
+	    	console.log("1111111111111111"+JSON.stringify(result));
 	    	if(result.success == true){
-	    		console.log("1111111111111111"+result);
+	    		
 	    	}else{
-	    		alert(result.message);
+	    		// alert(result.message);
 	    	}
 	    	
 	    }
-	  });*/
+	});*/
 });
+
 $(function(){
   //补充丢失器械按钮弹框
   $("#addLose").click(function(){
@@ -167,7 +236,7 @@
           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]));
+        		  //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++) {
@@ -249,10 +318,13 @@
         }
   ]; 
    /*在篮筐中输入条码*/
-  var searchBarcodeVal = $("#searchBarcode").val();
+  
+  
   $("#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", 
@@ -461,6 +533,14 @@
           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));
         	  for(i=0;i<row.children.length;i++){
@@ -516,7 +596,7 @@
            align : 'center',
            sortable:true,
            width:300
-          /* formatter:function(v,record){
+           /*formatter:function(v,record){
         	   return "<input type=\"button\" value=\"test\" />";
            }*/
         },
@@ -557,20 +637,32 @@
     },
     success: function(result) {
     	if(result.success == true){
+    		var mapParent = {};
     	      for(var i=0;i<result.data.length;i++){
     	        var list = result.data[i];
+    	        var tempListJSON = escape(JSON.stringify(list));
     	        list.amount = "<div class='input-group spinner'>"
 	                             + "<input type='text' class='form-control showNum_"+list.tousseID+"' value='" + list.amount + "' tousseName='"+list.tousseName+"'  max-value='" + list.amount +"'/>"
 	                             + "<div class='input-group-btn-vertical'>"
 	                             + "<button class='btn btn-default ' type='button' onclick='addNum(this)'><i class='fa fa-caret-up'></i></button>"
 	                             + "<button class='btn btn-default ' type='button' onclick='reduceNum(this)'><i class='fa fa-caret-down'></i></button>"
 	                             + "</div>"
 	                             + "</div>"; 
-    	        var taskIds = "";
+    	        //list.tousseName = "<span datajson=" + tempListJSON + ">"+list.tousseName+"</span>";
+//    	        console.log("tempListJSON", tempListJSON);
+    	        
+    	        //list.rowIndex = i;
+    	       /* var taskIds = "";
     	        for(var j = 0; j <list.children.length; j++){
     	        	taskIds += list.children[j].taskId + ";";
-    	        }
-    	        list.tousseName = "<span taskid='"+taskIds+"' >"+list.tousseName+"</span>";
+    	        }*/
+    	        
+    	        
+    	        //list.tousseName = "<span id='dataPar_index"+i+"'>"+list.tousseName+"</span>";
+    	        //console.log()
+    	        //mapParent['dataPar_index'+i] =  list;
+    	        //console.log("tasj..", map['data_index'+i]);
+    	        //list.tousseName = "<span taskid='"+taskIds+"' >"+list.tousseName+"</span>";
     	      }
     		  var assemblyTaskleftFootTable = "<table id='assemblyTaskleftFootTable' class='table table-striped table-bordered table-hover cleanPadding' data-height='" + resultHFoot + "' data-toggle data-toggle='table'></table>";                  
     		  $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable);
@@ -582,15 +674,23 @@
     		  })
     		  $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"56px"});
     		  //assemblyTaskLeftFootTableCon = req;
-    		  subText("assemblyTaskleftFootTable");    		
+    		  subText("assemblyTaskleftFootTable");   
+    		/*  for(var p in mapParent){
+    			  if(p.indexOf('dataPar_index') != -1){
+    				  $("#"+p).data("taskPar",mapParent[p]);
+    			  }
+//    			  console.log("map[p]=",map[p]);
+//    			 console.log("pp...",$("#"+p).data('task'));
+    		 }*/
+    		  
     	}else{
     		alert("错误");
     	}
     }
   });
   
-
   
+  
   function assemblyTaskLeftFootload(tableDate,columns){
 	 // console.log("tableDate"+tableDate);
     $("#assemblyTaskleftFootTable").bootstrapTable(
@@ -614,6 +714,7 @@
             showColumns: true,//删选列按钮
             showRefresh: false,//刷新按钮
             silent: true,  //刷新事件必须设置  
+            clickToSelect: true,
             formatLoadingMessage: function () {  
               return "请稍等，正在加载中...";  
             },  
@@ -630,15 +731,39 @@
             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]));
+            		
             		var tipsColor = "";
             		var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteFoot('" + childrens[i].tousseID + "')'/>"; 
-            		table += "<tr onclick=\"leftFootTableTrClickEvent(1, this)\">"
-                     +"<td width='"+($(thW[0]).width()+1)+"'></td>"
-                     +"<td width='"+($(thW[1]).width()+2)+"'></td>";
+            		
+            		//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++) {
@@ -657,7 +782,7 @@
 			            }
 			        }
 			        	
-            		table += "<td width='"+($(thW[2]).width()+2)+"' "+tipsColor+" ><span taskid='"+childrens[i].taskId+"'>"+childrens[i].tousseName+"</span></td>"
+            		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[4]).width()+2)+"'>"+childrens[i].urgentAmount+"</td>"
                      +"<td width='"+($(thW[5]).width()+2)+"'>"+childrens[i].urgentLevel+"</td>"
@@ -668,15 +793,28 @@
                      +"<td width='"+($(thW[10]).width()+2)+"'>"+childrens[i].status+"</td>"
                      +"<td width='"+($(thW[11]).width()+1)+"'>"+childrens[i].dateTime+"</td>"
                     +"</tr>"
+                    
+                    //list.tousseName = "<span id='data_index"+i+"' >"+list.tousseName+"</span>";
+                   // mapChildren[getIndexPar+"datachild_index"+i] =  childrens[i];
             	}
                 table +="</table>";
                 $detail.html(table);
                 subText("assemblyTaskleftFootTableSub");
+                
+              /*  for(var p in mapChildren){
+      			  if(p.indexOf('datachild_index') != -1){
+      				  $("#"+p).data("taskChild",mapChildren[p]);
+      				 // console.log("pp222,...."+$("#"+p));
+      			  }
+      		 }*/
             },
-            onClickRow:function(row){
+            onCheckSome:function(row){
+            	console.log("check:"+row);
+            }
+            /*onClickRow:function(row){
             	leftFootTableTrClickEvent(0, row);
             	
-            }
+            }*/
        
         });
   }
@@ -709,7 +847,7 @@
 	    async:false,
 	    success:function(result){
 	    	if(result.success == true){
-	    		console.log("1111111111111111"+result);
+	    		//console.log("1111111111111111"+result);
 	    	}else{
 	    		//alert(result.message);
 	    	}
@@ -1477,7 +1615,7 @@
 //今天本组装配
 $(function(){
   //select2器械包名称
-  Mock.mock(
+  /*Mock.mock(
     'http://mockjsbagname', {
        'list|60':[
           {"id|1-100": 1, text: '小手术包' },
@@ -1727,7 +1865,7 @@
       allowClear:true,
       minimumInputLength: 1,
       maximumSelectionLength:1
-  })
+  })*/
 })
 //截取left foot table 文字
 function subText(subId){
@@ -2181,3 +2319,5 @@
 	    $(".setInputH").css({"width":jgw+"px"});
 	   },350);
 })
+
+