Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css
===================================================================
diff -u -r24844 -r24846
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24844)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24846)
@@ -27,7 +27,10 @@
 .assembly-task-lefttop{
     margin-left: 0 ;
     margin-right: 0;
-    height: 38px;
+    height: 28px;
+    width:100%;
+    background: #C6E3CA;
+    border-bottom:1px solid #aedeb4;
 }
 .assembly-task-lefttop label,.assembly-task-lefttop input{
     font-size: 12px;
@@ -37,20 +40,33 @@
     margin-left: 15px;
 }
 .basketry{
-    width:100%;
-    background: #C6E3CA;
-    border-bottom:1px solid #aedeb4;
     padding-top: 2px;
     padding-bottom: 2px;
 }
 .basketry input{
     height:22px;
 }
+.checkbox-all-table{
+	width: 50px;
+}
+.checkbox-all-table label{
+	width:100%;
+}
+.checkbox-all-table label input{
+	width:14px;
+}
 .assembly-task-leftprint{
     margin-left: 14px;
+    margin-top:3px;
+    margin-bottom:3px !important;
 }
+.assembly-task-leftprint label{
+	 font-size:12px;
+}
 .assembly-task-leftprint select{
     width:auto;
+    height:26px;
+    font-size:12px;
 }
 .assembly-task-inputh input{
     width:14px;
@@ -185,8 +201,8 @@
     height:265px;
 }
 .task-middletop-showImg  .task-middletop-showImg-name{
-    height:35px;
-    line-height: 35px;
+    height:28px;
+    line-height: 28px;
     background: #C6E3CA;
     padding-left:10px;
 }
@@ -249,9 +265,7 @@
     display:inline-block; 
     float:left;
     width:50%;
-        margin-left: 1%;
-    
-   /*  min-width:100px; */
+    margin-left: 1%;
 }
 .assembly-task-middlefoot-form .setInputH input,.assembly-task-middlefoot-form .setInputH select{
     width:100%;
@@ -269,8 +283,8 @@
     background: #C6E3CA;
     border-bottom: 1px solid #aedeb4;
     margin-top: 0;
-    height: 34px;
-    line-height: 32px;
+    height: 28px;
+    line-height: 26px;
     font-size: 15px;
     color:#52a652;
     font-weight: bold;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24844 -r24846
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24844)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24846)
@@ -117,6 +117,11 @@
 									    <label for="searchBarcode">扫描篮筐条码:</label>
 									    <input type="text" class="form-control input-sm" id="searchBarcode" placeholder="扫描篮筐条码">
 									</div>
+									<div class="checkbox checkbox-all-table">
+									    <label>
+									      <input type="checkbox"  id="checkboxAllToptable">全选
+									    </label>
+									</div>
 				    			</div>
 			    				<div class="form-group assembly-task-leftprint" id="printClass" style="width:200px;">
 								 	<label>打印分组类型:</label>
@@ -162,6 +167,11 @@
 				    					<span class="glyphicon glyphicon-print"></span>
 				    					打印回收清单
 				    				</button>
+				    				<div class="checkbox checkbox-all-table">
+									    <label >
+									      <input type="checkbox" id="checkboxAllFoottable"> 全选
+									    </label>
+									</div>
 				    			</div>
 					    		<div class="assembly-task-inputh" id="assemblyTaskleftFootTableWrapp" style="width:100%;"> 
 					    			 <div id="assemblyTaskleftFootTable" style="width:100%;"></div>
@@ -516,7 +526,7 @@
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/common/common-tools.js"></script>
 <!-- 引入自身js -->
 <!-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js"></script>  -->
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick.js"></script>  
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js"></script>  
 <!-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagementModal.js"></script>  -->
 <!-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord.js"></script>  -->
 <script type="text/javascript">
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js	(revision 24846)
@@ -0,0 +1,1635 @@
+var grid,dataView;
+var loadData=[];
+var assemblyTaskleftFootTable_columns = [];
+var checkboxSelector;
+var visibleColumns;
+var selectedRows;
+var dataviews;
+var options;
+var addVal = "";
+var multiSelectFootData = [];
+var selectionTopOrFoot;//判断上下表格装配
+
+var dataViewTopTable;
+var gridTopTable;
+var optionsTopTable;
+var assemblyTaskleftTopTable_columns = [];
+var visibleColumnsTopTable;
+var checkboxSelectorTopTable;
+var searchBarcodeHidden;
+var loadDataTop=[];
+var assemblyTaskLeftTopTableCon;
+var selectedRowsTop;
+var multiSelectTopData = [];
+var dataviewsTop;
+var childTopData;
+//打印标签部分
+var packingTasks;
+var packing = false;
+var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试
+var packedToussesArray = [];// 用于一次打印所有装配的包
+var tousseesToPrint = [];
+//点击装配
+$("#packPrint").click(function(){
+	packing = true;
+	if(packing){
+		packingToussesArray = []; // 清除所装配的器械包数组
+		packedToussesArray = [];
+		tousseesToPrint = [];
+	}
+	//检查人
+	var inspector = $("#inspectorInput").val();
+	// 检查人工号
+	var inspectorCode = $("#inspectorCodeInputHidden").val();
+	
+	//配包人
+	var operator = $("#operator").val();
+	var operatorCode = $("#operatorCodeHidden").val();
+	//审核人
+	var reviewer = $("#reviewer").val();
+	var reviewerCode = $("#reviewerCodeHidden").val();
+	//灭菌人
+	var sterileUserName = $("#sterileUserName").val();
+	var sterileUserCode = $("#sterileUserCodeHidden").val();
+	//包装人
+	var wrapper = $("#wrapper").val();
+	var wrapperCode = $("#wrapperCodeHidden").val();
+	
+	//包装类型
+	var packageType = $("#packageType option:selected").val();
+	//灭菌程序
+	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() < 10 ? '0'+(date.getDate()) : date.getDate());
+	    sterileDate =  Y+"-"+M+"-"+D;
+    }
+   
+	//外来器械拆包信息  splitPackage
+	//篮筐条码
+	//扫描的篮筐条码 scannedBasketBarcodes
+	//标识牌实例id  idCardInstanceID
+	//标识牌定义id   idCardDefinitionId
+	
+	//炉次 
+	var frequency =$("#frequency").val();
+	//确认继续 confirmContinue
+	//tousseWeight 器械包重量
+	
+	//remark 备注 
+	var remark = $("#remark").val();
+
+	
+	if(inspector == ""){
+		alert("请扫描检查人条码");
+		return;
+	}
+	/*if(operator == "" ){
+		alert("请扫描配包人条码");
+		return;
+	}
+	if(reviewer == ""){
+		alert("请扫描审核人条码");
+		return;
+	}*/
+	if(wrapper == ""){
+		alert("请扫描包装人条码");
+		return;
+	}
+	if(sterileUserName == ""){
+		alert("请扫描灭菌人条码");
+		return;
+	}
+	var tempTableId = "";
+
+	// 开始构造参数循环调用装配方法
+	/*var tempTableId = "";
+	if($("#assemblyTaskleftFootTable").bootstrapTable('getSelections').length>0){
+		tempTableId = "assemblyTaskleftFootTable"; 
+	}else{
+		tempTableId = "assemblyTaskLeftTopTable"; 
+	}
+	var table = $("#" + tempTableId);
+	var selections = table.bootstrapTable('getSelections');*/
+	if(multiSelectTopData.length>0){
+		selectionTopOrFoot = multiSelectTopData;
+		tempTableId = "assemblyTaskLeftTopTable"; 
+	}else{
+		// selectionTopOrFoot  = selectData;
+		selectionTopOrFoot  = multiSelectFootData
+		tempTableId = "assemblyTaskleftFootTable";
+	}
+	var selections = selectionTopOrFoot;
+	if(selections == null || selections.length == 0){
+		return ;
+	}
+	var packingTaskArray = [];
+	for(var tousseIndex=0;tousseIndex<selections.length;tousseIndex++){
+		var tousseNode = selections[tousseIndex];
+  		var pTousseName = tousseNode.tousseName;
+  		var haveIDCard = tousseNode.haveIDCard;
+  		 // 跳过有标识牌的器械包
+  		/* if(haveIDCard){
+  			 continue;
+  		 }*/
+  		 //器械包装配数量
+  		var packingAmount = tousseNode.amount;
+	    if(packingAmount <= 0){
+	        continue;
+	    }
+
+		var taskIdArray = [];
+	    var scannedBasketBarcodes = [];
+	    var basketBarcode;
+	    var tousseName;
+	    var tousseType;
+	    var packageType;
+	    var sterilingType;
+	    var supplierName;
+	    var damages;
+	    var errors;
+	    var department;
+	    var departmentArray = [];
+	    var status;
+	    var urgentAmount;
+	    //遍历器械包下的每条装配任务数据
+	    var children = tousseNode.children;
+      
+        for(var taskIndex=0;taskIndex<children.length;taskIndex++){
+      	    var task = children[taskIndex];
+			tousseName = task.tousseName;
+			status = task.status;
+			basketBarcode = task.basketBarcode;
+			urgentAmount = task.urgentAmount;
+      	    var taskId = task.taskId;
+      		var amount = task.amount;
+	      	if(amount > packingAmount){
+	      		amount = packingAmount;
+	      	}
+      	    packageType = task.packageType;
+          	//  if(useManualSelectPackageType()){
+            //		packageType = Ext4.getCmp('packageType').getValue();
+            //	}
+            sterilingType = task.sterilingMethod;
+            //	if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){
+            //		sterilingType = Ext4.getCmp('sterilingType').getValue();
+            //	}
+	      	tousseType = task.tousseType;
+	      	supplierName = task.supplierName;
+	      	damages = task.damages;
+	      	errors = task.errors;
+	      	department = task.department;
+	      	departmentArray.push(department);
+	      	if(!sstsConfig.allowPackingWhenUnSupplementMaterial){
+	     		if(errors != null && errors.length > 0){
+	         		//showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+	                alert("材料缺失，不够组成器械包，请补充缺失器械！");
+	         		return;
+	            }
+	            if(damages != null && damages.length > 0){
+	            	//showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+	            	alert("材料已报损，不够组成器械包，请补充报损器械！");
+	            	return;
+	            }
+	     	} 
+	     	taskIdArray.push(taskId);   	
+            	
+	    };
+		taskIdArray = taskIdArray.join(";");
+		// packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
+	    //var taskIds = taskIdsArray.join(";");
+		//装配数量
+		var inputId ="";
+		if (tempTableId == "assemblyTaskleftFootTable") {
+			inputId = '#input_'+tousseNode.tousseID;
+		} else {
+			inputId = '#inputTop_'+tousseNode.tousseID;
+		}
+		var inputAmount = $(inputId).val();
+		//return;
+		var params = {
+			"taskIds":taskIdArray,
+	    	"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": Date.parse(sterileDate.replace(/-/g,"/")),//这样转换是为了兼容ie8
+	    	"packAmount":inputAmount,
+	    	"taskGroup":taskGroup,
+	    	"frequency":frequency,
+	    	"urgentAmount":urgentAmount,
+	    	"remark":remark
+		};
+
+		if(inspector == ""){
+			alert("请扫描检查人条码");
+			return;
+		}
+		/*if(operator == "" ){
+			alert("请扫描配包人条码");
+			return;
+		}
+		if(reviewer == ""){
+			alert("请扫描审核人条码");
+			return;
+		}*/
+		if(wrapper == ""){
+			alert("请扫描包装人条码");
+			return;
+		}
+		if(sterileUserName == ""){
+			alert("请扫描灭菌人条码");
+			return;
+		}
+		$.ajax({
+		    url:WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
+		    dataType: "json",
+		    async:false,
+		    cache:false,//解决ie
+		    type: "get", 
+		    data:{
+		    	"packingParams": JSON.stringify(params)
+		    },
+		    success:function(result){
+		    	if(result.success == true){
+		    		alert(result.message);
+		    		if (tempTableId ==  "assemblyTaskleftFootTable") {
+		    			//leftFootLoad();////刷新左下表格
+		    			multiSelectFootData = [];//清空
+		    		} else {
+			    		packingTasks = result.packingTasks;
+			    		packingTaskArray = packingTaskArray.concat(packingTasks);
+			    		multiSelectTopData=[];
+		    		}
+
+		    		$("#checkboxAllToptable").prop("checked", false);
+		    		//processAfterPacking(false,result,tousseName,inputAmount);
+		    	}else{
+		    		var addNumHtml= "<div class='panel panel-primary panel-tips'>"
+			               + "<div class='panel-heading'>提示</div>"
+			               + "<div class='panel-body'>"
+			               + ""+result.message+""
+			               + "</div>"
+			               + "</div>";
+		    		$("body").append(addNumHtml);
+		    	}
+			}	
+		});
+
+
+	}
+	var assembleArray = [];
+	if (assemblyTaskLeftTopTableCon != undefined && assemblyTaskLeftTopTableCon.length > 0) {
+		for (var i = 0; i < assemblyTaskLeftTopTableCon.length; i++) {
+			var assembleModel = assemblyTaskLeftTopTableCon[i];
+			if (assembleModel.children.length <= 0) {
+				continue;
+			}
+			var assembleArrayModel = [];//新children
+			for (var j = 0; j < assembleModel.children.length; j++) {
+				var objTaskId = assembleModel.children[j].taskId;
+				for (var k = 0; k < packingTaskArray.length; k++) {
+					//相等更改数量
+					if (objTaskId == packingTaskArray[k].taskId) {
+						assembleModel.children[j].amount = packingTaskArray[k].unPackAmount;
+					} 
+				}
+					
+				//大于0，保存起来
+				if (assembleModel.children[j].amount > 0) {
+					assembleArrayModel.push(assembleModel.children[j]);
+				}
+			}
+				
+			if (assembleArrayModel.length > 0) {
+				//把不需要删除的重新赋值给children，改变了children的值
+				assembleModel.children = assembleArrayModel;
+				assembleModel.amount = 0;
+				for (var m = 0; m < assembleArrayModel.length; m++) {
+					assembleModel.amount += parseInt(assembleArrayModel[m].amount);
+				}
+				assembleArray.push(assembleModel);
+			}
+		}
+	}
+		
+	assemblyTaskLeftTopTableCon = assembleArray;
+	reloadPackingLeftTopTasks();//刷新左上表格
+	leftFootLoad();//刷新左下表格
+	//printLabelsAfterPacking();//打印标签
+});
+
+function hidePackingTousseBtnClick_mask(){
+	if(packingTousseBtnClick_mask != null){
+		packingTousseBtnClick_mask.destroy();
+		packingTousseBtnClick_mask = null;
+	}
+}
+function processAfterPacking(printImmediately,result, showName, packAmount){
+	var tousses = result.tousses;
+	packingToussesArray = packingToussesArray.concat(tousses);
+	packedToussesArray = packedToussesArray.concat(tousses);
+	
+	// 取装配物品的是否审核和是否打印的属性(第一个元素的即可)
+	var isReview = tousses[0].isReview;//是否装配
+	var isPrint = tousses[0].isPrint;//是否打印
+	// 默认装配时打印标签
+	var isPrintLabelNow = true;
+	
+	// 如果系统设定为在审核时打印标签，并且该器械包需要审核，则现在不打印标签
+	if (sstsConfig.printLabelWhenReviewing == true && isReview == true){
+		isPrintLabelNow = false;
+	}
+	if (isPrintLabelNow == false || !packing){
+		//showResult(packAmount + "个" + showName + "装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		alert(packAmount + "个" + showName + "装配完成");
+	}
+	// 现在打印标签
+	else{
+		// 该物品的器械包定义是否需要打印标签
+		if (isPrint){
+			
+			tousseesToPrint = tousseesToPrint.concat(tousses);
+		}
+		else{
+			
+			alert(packAmount + "个" + showName + "装配完成，该物品设置为不打印条码标签！");
+		}
+		
+	}
+}
+
+function printLabelsAfterPacking(){
+	if(!packing){
+		return;
+	}
+	//hidePackingTousseBtnClick_mask();//装配以后提示正在加载的进度条
+	var packAmount = packedToussesArray.length;//返回的数据
+	//showResult(packAmount + "个" + showName + "装配完成");
+	//打印分组类型?这个是获取打印分组类型里面的值吗？
+	var printGroupType = $("#printPacketTypes option:selected").val();
+	//var printGroupType = Ext4.getCmp('printGroupType').getValue();
+	var cfg = createPrintLabelsConfig(printGroupType);
+	
+	if(tousseesToPrint.length > 0){
+		doPrintLabels(tousseesToPrint,cfg);//?
+		if(sstsConfig.enableConfirmNoticeAfterPackingPrint){
+			//打印完成给出确认提示筐,物品是否有缺陷,正常则不管,缺陷则弹出质量监测窗口:CDSLQYQYYY-51
+			/*Ext.Msg.show({
+				title : '请确认',
+				msg : '物品是否有缺陷？',
+				buttons: {"yes":"正常","no":"缺陷"},
+				width: 200,
+				height: 100,
+				fn : function(btn){
+					if(btn == 'no'){
+						addQualityMonitoringByResponPart("清洗消毒");
+					}
+				}
+			});*/
+			$("#printLabel").modal('show');
+		}
+	}
+}
+//检查人条码
+$("#inspectorCodeInput").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var inspectorCodeInput = $("#inspectorCodeInput").val();
+    	requstCode(inspectorCodeInput,"inspectorCodeInput","inspectorInput","inspectorCodeInputHidden");
+    }
+})
+//配包人条码
+$("#operatorCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var operatorCode = $("#operatorCode").val();
+    	requstCode(operatorCode,"operatorCode","operator","operatorCodeHidden");
+    }
+})
+//审核人条码
+$("#reviewerCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var reviewerCode = $("#reviewerCode").val();
+    	requstCode(reviewerCode,"reviewerCode","reviewer","reviewerCodeHidden");
+    }
+})
+//包装人条码
+$("#wrapperCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var wrapperCode = $("#wrapperCode").val();
+    	requstCode(wrapperCode,"wrapperCode","wrapper","wrapperCodeHidden");
+    }
+})
+//灭菌人条码
+$("#sterileUserCode").keydown(function(e){
+    if (e.keyCode == 13) {
+    	var sterileUserCode = $("#sterileUserCode").val();
+    	requstCode(sterileUserCode,"sterileUserCode","sterileUserName","sterileUserCodeHidden");
+    }
+})
+
+function requstCode(barcode,clearId,name,namecode){
+	$.ajax({
+		url:WWWROOT+"/disinfectSystem/web/userController/getUserByBarcode.mhtml",
+		dataType: "json", 
+	    async: false, 
+	    data: {"barcode":barcode}, 
+	    type: "post", 
+	    success:function(result){
+	    	 if(result.success == true){
+	    		 $("#"+name).val(result.fullName);//名字,例如检查人
+		    	 $("#"+namecode).val(result.name);//工号放入隐藏域在提交装配时传参
+		    	 $("#"+clearId).val("");//清空检查人条码
+		    	 $("#"+name).parent().parent().parent().next().children("div:first-child").children().children("input").focus();	
+	    	 }else{
+	    		 alert(result.message);
+	    	 }
+	    }
+	})
+}
+
+//灭菌方式
+$("#sterilingType").change(function(){
+	var sterilizationMode = $("#sterilingType option:selected").attr("data-mode");
+	$('#sterilizationMode').val(sterilizationMode);
+});
+//灭菌炉
+function sterilizerNameRequest(){
+	$.ajax({
+		 url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml",
+		 type: "get", 
+		 async:true,
+		 success:function(result){
+		 	$("#sterilizerName").html("");
+			var result = JSON.parse(result);
+			if(result.success == true){
+				 for(var i=0;i<result.rows.length;i++){
+					var sterilizerOptions = "<option value='"+result.rows[i].name+"'>"+result.rows[i].name+"</option>";
+					$("#sterilizerName").append(sterilizerOptions);
+				}
+			}else{
+				alert(result.message);
+			}
+			 
+		}
+	});
+}
+//灭菌程序
+var sterilizerName = $("#sterilizerName option:selected").val();
+$.ajax({  
+    url:WWWROOT+"/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml",
+    type: "get", 
+    data:{"sterilizerName":sterilizerName},
+    success:function(result){
+    	if(result.success == true){
+    		for(var i=0;i<result.rows.length;i++){
+    			if(result.rows[i].sterilizationMode == "" || result.rows[i].sterilizationMode == undefined){
+    				result.rows[i].sterilizationMode = "";
+    			}
+    			var options = "<option data-mode='"+result.rows[i].sterilizationMode+"' value='"+result.rows[i].sterilisation+"'>"+result.rows[i].sterilisation+"</option>";
+    			$("#sterilingType").append(options);
+    			
+    		}
+    	}else{
+    		alert(result.message);
+    	}
+    	
+    }
+});
+//包装类型
+function packageTypeRequest(){
+	$.ajax({
+		 url:WWWROOT+"/disinfectSystem/baseData/expirationDateInfoController/getPackageTypeAndExpirationDateInfo.mhtml",
+		 type: "get", 
+		 cache:false,//解决ie
+		 async:false,
+		 success:function(result){
+			var result = JSON.parse(result);
+			if(result.success == true){
+				$("#packageType").html("");	
+				for(var i=0;i<result.rows.length;i++){
+					var optionText = "<option data-validDate='"+result.rows[i].validDate+"' data-validDateUnit='"+result.rows[i].validDateUnit+"' value='"+result.rows[i].optionText+"'>"+result.rows[i].optionText+"</option>";
+					$("#packageType").append(optionText);
+				}
+			}else{
+				alert(result.message);
+			}			 
+		}
+	})
+}
+$("#packageType").change(function(){
+	var packageTypeVal = $("#packageType option:selected").val();
+	var validDate = $("#packageType option:selected").attr("data-validDate");
+	var validDateUnit = $("#packageType option:selected").attr("data-validDateUnit");
+	alert(packageTypeVal+"的失效期为"+validDate+validDateUnit);
+})
+$(function(){
+    //页面一加载就获取焦点
+    $("#searchBarcode").focus();
+    loseAndDamageNum();//丢失和报损的数字
+    $("#tableTopBox").show();
+    $("#tableFootBox").show();
+  	topOrFootTableWrappHeight();//上下table父级的高度
+  	leftFootLoad();//左下表格
+  	$("#refreshFootTable").click(function(){
+  		leftFootLoad();
+  	})
+  	/*左上表格 start*/
+  	leftTopload();
+  	dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true });
+    gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", [], visibleColumnsTopTable, optionsTopTable);
+    $(".slick-viewport").css({"overflow":"auto"});
+	//subText("assemblyTaskLeftTopTable");
+	gridTopTable.init();
+
+   	/*左上在篮筐中输入条码*/
+   	//reloadTopTableMoreborde("");
+    $("#searchBarcode").keydown(function(e){
+        if (e.keyCode == 13) {
+     	    var searchBarcodeVal = $("#searchBarcode").val();
+     	    if(searchBarcodeVal == ""){
+     		    alert("请扫描篮筐条码");
+     		    return;
+     	    }
+        	$("#searchBarcodeHidden").val(searchBarcodeVal);
+            searchBarcodeHidden = $("#searchBarcodeHidden").val();
+            $("#searchBarcode").val("");
+            reloadTopTableMoreborde(searchBarcodeHidden);
+          // subText("assemblyTaskleftTopTable");
+           //topTableRowClickEvent();
+       } 
+    })
+
+ 
+  
+
+	//点击左下全选
+	$("#checkboxAllFoottable").click(function(){
+		var checkedFlag = $(this).is(":checked");
+    	var tableInput =  $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").find("input[type='checkbox']");
+        $(tableInput).prop("checked", checkedFlag);
+
+        multiSelectFootData = [];
+        if (checkedFlag) {
+			var items = dataView.getItems();
+			for (var i = 0; i < items.length; i++) {
+				if (items[i].parent == null) {
+					multiSelectFootData.push(items[i]);
+				}
+			}
+        }
+    })
+
+    //点击左上全选
+	$("#checkboxAllToptable").click(function(){
+		var checkedFlag = $(this).is(":checked");
+    	var tableInput =  $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content").find("input[type='checkbox']");
+        $(tableInput).prop("checked", checkedFlag);
+
+        multiSelectTopData = [];
+        if (checkedFlag) {
+			var items = dataView.getItems();
+			for (var i = 0; i < items.length; i++) {
+				if (items[i].parent == null) {
+					multiSelectTopData.push(items[i]);
+				}
+			}
+        }
+    })
+
+
+})/*$(function) end*/
+
+
+function topOrFootTableWrappHeight(){
+	var documentHeight  = $(window).height();
+    var tabH = documentHeight-39-123;
+ 	var tableHTop = tabH*0.45;
+ 	var tableHFoot = tabH*0.55;
+    $("#tableTopBox").css({"height":tableHTop+"px"});  
+    $("#tableFootBox").css({"height":tableHFoot+"px"});  
+
+    //中间下面的高度
+    var taskmiddleH = documentHeight -335-123;
+    $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"});
+}
+/*左下表格start*/
+function leftFootLoad(){
+	options = {
+	    enableCellNavigation: true,
+	    enableColumnReorder: false,
+	    rowHeight: 28,
+	    editable: true,
+	    enableAddRow: false,
+	    forceFitColumns: false,
+	    checked:true,
+	    enableForHeaderCells:true,
+	    asyncEditorLoading: false
+	};
+    //$.support.cors = true;
+    
+	assemblyTaskleftFootTable_columns = [];
+    assemblyTaskleftFootTable_columns.push(
+    	{
+            field: 'id',
+            name: 'ID',
+            align:'center',
+            sortable: true,
+            minWidth: 100
+        },
+	    {
+	    	id: "tousseName",
+	        name : '物品名称',
+	        field : 'tousseName',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+            minWidth: 100,
+            resizable: false,
+	        formatter:tousseNameFormatter
+
+	    },
+		{
+			id:"amount",
+		    name : '数量',
+		    field : 'amount',
+		    align : 'center',
+		    sortable:true,
+		    cssClass: "cell-title",
+            minWidth: 100,
+		    formatter:function(r, c, v, cd, dc){
+		    	if(dc.parent == null){
+		    		var inputId = 'input_'+dc.tousseID;
+				  	  return  "<div class='input-group spinner'>"
+				        + "<input id='"+inputId+"' type='text' class='form-control showNum_"+dc.tousseID+"' value='" + v + "' tousseName='"+dc.tousseName+"'  max-value='" + v +"' />"
+				        + "<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>"
+		    	}else{
+		    		return v;
+		    	}
+		    },
+		    focusable: false
+		},
+	    {
+	    	id:"urgentAmount",
+	        name : '加急数量',
+	        field : 'urgentAmount',
+	        align : 'center',
+	        sortable:true,
+	        cssClass: "cell-title",
+            minWidth: 100
+	    },
+	    {	
+	    	id:"urgentLevel",
+	        name : '加急等级',
+	        field : 'urgentLevel',
+	        align : 'center',
+	        sortable:true,
+	        cssClass: "cell-title",
+            minWidth: 100
+	    },
+	    {
+	    	id:"basketName",
+	        name : '清洗篮筐',
+	        field : 'basketName',
+	        align : 'center',
+	        sortable:true,
+	        cssClass: "cell-title",
+            minWidth: 100
+	    },
+	    {
+	    	id:"operate",
+	        name : '操作',
+	        field : 'operate',
+	        align : 'center',
+	        sortable:true,
+	        width:300,
+	        cssClass: "cell-title",
+            minWidth: 200,
+            formatter:function(r, c, v, cd, dc){
+		    	if(dc.parent != null){
+		    		var tipsColor = "";
+	                var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteFootTabel(this)'/>";
+		    		if(dc.status == '待装配'){
+			            var supplent = true;
+			            for(var m = 0;m< dc.errors.length; m++) {
+			                if(errorTypeAdd !=dc.errors[m].errorType && ((dc.errors[m].amount - dc.errors[m].additionalAmount) != 0)) {
+			                    supplent = false;
+			                }
+			            }
+			            if(!supplent){
+			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addloseFootTableBtn(this);'>丢失</button>";
+			            	tipsColor = "style='color:red;'"
+			            }
+			    
+			            if(dc.damages.length > 0){
+			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addDameageFootTableBtn(this)'>报损</button>";
+			            	tipsColor = "style='color:red;'";
+			            }
+				    }
+				    return operateHtml;
+		    	}
+            }
+	    },
+	    {
+	    	id:"department",
+	        name : '申请科室',
+	        field : 'department',
+	        align : 'center',
+	        sortable:true,
+	        cssClass: "cell-title",
+            minWidth: 100
+	    },
+	    {
+	    	id:"washTime",
+	        name : '清洗时间',
+	        field : 'washTime',
+	        align : 'center',
+	        sortable:true,
+	        cssClass: "cell-title",
+            minWidth: 100
+	    },
+	    {
+	      	id:"status",
+	        name : '状态',
+	        field : 'status',
+	        align : 'center',
+	        sortable:true,
+	        cssClass: "cell-title",
+            minWidth: 100
+	    },
+	    {
+	    	id:"dateTime",
+	        name : '回收时间',
+	        field : 'dateTime',
+	        align : 'center',
+	        sortable:true,
+	        cssClass: "cell-title",
+            minWidth:150
+	    }
+    ); 
+    //将id列隐藏
+    visibleColumns = [];//定义一个数组存放显示的列
+    for (var i = 0; i <  assemblyTaskleftFootTable_columns.length; i++) {
+        if (i!=0){
+            visibleColumns.push(assemblyTaskleftFootTable_columns[i]);//将columns的列push进去
+        }
+
+    }
+    loadPackingTasks();
+}
+function loadPackingTasks(){
+	$.ajax({
+    	url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml",
+    	dataType: "json", 
+    	type:'get',
+    	cache:false,//解决ie
+    	data: {"taskGroup":taskGroup}, 
+    	success:function(data){
+    		var datas =data.data;
+    		loadData = [];
+    		loadData = requestData(datas);//加载数据
+		    dataView.beginUpdate();
+		    dataView.setItems(loadData);
+		    dataView.setFilter(myFilter);
+		    dataView.endUpdate();
+    	}
+    })
+    leftFootTable();
+}
+
+
+function leftFootTable(){
+	$("#assemblyTaskleftFootTable").css("height",($("#tableFootBox").height()-75)+"px");
+	dataView = new Slick.Data.DataView({ inlineFilters: true });
+    grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options);
+  /*   $(".slick-viewport").css({
+        "overflow-y": "auto"
+    });*/
+
+    //获取选中行数据
+   /* grid.onSelectedRowsChanged.subscribe(function(){
+    })
+    */
+    grid.onClick.subscribe(function (e, args) {
+    	grid.setSelectionModel(new Slick.RowSelectionModel());//选中行
+
+    	// 上下table选择互斥  assemblyTaskleftTopTable
+    	$("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content")
+    		.find("input[type='checkbox']").each(function(inputIndex, inputEle){
+    			$(inputEle).prop("checked", false);
+			});
+    	multiSelectTopData = [];
+
+    	if (dataView.getItem(args.row).parent == null) {
+    		var inputEle = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").eq(args.row).find("input[type='checkbox']");
+    		if (args.cell == 0) {
+				$(inputEle).prop("checked", $(inputEle).is(':checked'));
+    		} else {
+    			$(inputEle).prop("checked", !$(inputEle).is(':checked'));
+    		}
+    	}else if(dataView.getItem(args.row).parent != null){
+    		var childData = dataView.getItem(args.row);
+    		$("#sterilingType").val(childData.sterilingMethod);
+	        $("#sterilingType").change();
+
+	        sterilizerNameRequest();//灭菌炉
+       		packageTypeRequest();//包裝類型
+       		$("#packageType").val(childData.packageType);
+    	}
+
+    	//multiSelectFootData = [];
+    	var inputCheckBox = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").find("input[type='checkbox']:checked");
+    	for (var i = 0; i < inputCheckBox.length; i++) {
+    		var tdEle = $(inputCheckBox[i]).parent().parent();
+    		multiSelectFootData.push(dataView.getItem($(tdEle).index()));
+    	}
+
+    	// 全选与否
+    	var allCheckBoxes = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").find("input[type='checkbox']");
+		var checkboxBoxAllChecked = inputCheckBox.length == allCheckBoxes.length;
+		$("#checkboxAllFoottable").prop("checked", checkboxBoxAllChecked);
+
+
+    	//判断按钮
+    	$('.childrenInput').val(JSON.stringify(multiSelectFootData));
+        var childrenInput =  $('.childrenInput').val();
+        childrenInput = JSON.parse(childrenInput);
+        packPrintChange(childrenInput,"","");
+        //灭菌程序
+        if(multiSelectFootData.length>0){
+        	var num;
+	        for(var i=0;i<multiSelectFootData.length;i++){
+	        	num = multiSelectFootData[i];
+	        }
+	        $("#sterilingType").val(num.sterilingMethod);
+	        $("#sterilingType").change();
+
+	        sterilizerNameRequest();//灭菌炉
+       		packageTypeRequest();//包裝類型
+       		$("#packageType").val(num.packageType);
+        }
+	    if ($(e.target).hasClass("toggle")) {
+	       var item = dataView.getItem(args.row);
+	        if (item) {
+	          if (!item._collapsed) {
+	            item._collapsed = true;
+	          } else {
+	            item._collapsed = false;
+	          }
+	          dataView.updateItem(item.id, item);
+	        }
+	        e.stopImmediatePropagation();
+	      
+	    }
+    });
+ 	dataView.onRowsChanged.subscribe(function (e, args) {
+        grid.invalidateRows(args.rows);
+        grid.render();
+    });
+ 	//修改样式
+ 	grid.onBeforeAppendCell.subscribe(function (e, args) {
+ 		if (grid.getColumns()[args.cell].id !== 'tousseName') return null;
+ 		var argData = dataView.getItem(args.row);
+	 	if(argData.parent != null){
+	 		if(argData.status == '待装配'){
+		        var supplent = true;
+			        for(var m = 0;m< argData.errors.length; m++) {
+			            if(errorTypeAdd !=argData.errors[m].errorType && ((argData.errors[m].amount - argData.errors[m].additionalAmount) != 0)) {
+			                supplent = false;
+			            }
+			        }
+			        if(!supplent){
+			        	return "tousse-name-color";
+			        }
+
+			        if(argData.damages.length > 0){
+			            return "tousse-name-color";
+			        }
+
+			}
+	 	}else if(argData.parent == null){
+	 		var children = argData.children;
+	 		for(var i=0;i<children.length;i++){
+	 			if(children[i].status == '待装配'){
+		        var supplent = true;
+			        for(var m = 0;m< children[i].errors.length; m++) {
+			            if(errorTypeAdd !=children[i].errors[m].errorType && ((children[i].errors[m].amount - children[i].errors[m].additionalAmount) != 0)) {
+			                supplent = false;
+			            }
+			        }
+			        if(!supplent){
+			        	return "tousse-name-color";
+			        }
+
+			        if(children[i].damages.length > 0){
+			            return "tousse-name-color";
+			        }
+
+			    }
+	 		}
+	 	}
+	 	return "tousse-name-defaultColor";
+	}); 
+
+    grid.init(); 
+}
+
+/*左下表格end*/
+//判断子菜单start
+function tousseNameFormatter(row, cell, value, columnDef, dataContext){
+    //如果没有数据，就都返回
+    if (value == null || value == undefined || dataContext === undefined) { return ""; }
+   
+    value = value.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+    //制造一个占位
+    var spacer = "<span style='display:inline-block;height:1px;width:" + (15 * dataContext["indent"]) + "px'></span>";
+
+
+    //根据ID获取此行内容的索引值
+    var idx = dataView.getIdxById(dataContext.id);
+    
+    //判断星星父菜单
+    if(dataContext.parent == null){
+   		var child = dataContext.children;
+   		for(var i=0;i<child.length;i++){
+		 	if(child[i].taskType != taskType_recyclingRecord){
+		 		spacer += "<img src='/dx-disinfectsystem/img/start.png' class='stratImg'/>";
+		 		break;
+		 	}
+		}
+    }
+    
+    //判断星星子菜单
+    if(dataContext.parent !=null){
+	 	if(dataContext.taskType != taskType_recyclingRecord){
+	 		spacer += "<img src='/dx-disinfectsystem/img/start.png' class='stratImg'/>";
+	 	}
+    }
+    if (loadData[idx + 1] && loadData[idx + 1].indent > loadData[idx].indent) {
+      //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进
+        if (dataContext._collapsed) {
+
+        	return spacer + "<input type='checkbox' style='width:14px;'/>&nbsp;<span class='toggle expand'></span>&nbsp;<span>"+value+"</span>" ;//收缩
+     	} else {
+        	return spacer + "<input type='checkbox'  style='width:14px;'/>&nbsp; <span class='toggle collapse'></span>&nbsp;<span>"+value+"</span>";//展开
+      	}
+    } else {
+        return spacer + " <span class='toggle'></span>&nbsp;<span>"+value+"</span>";
+    }
+}
+function myFilter(item) {
+  if (item.parent != null) {//代表有子菜单
+    var parent = loadData[item.parent];
+    while (parent) {
+      if (parent._collapsed) {//展开
+        return false;
+      }
+
+      parent = loadData[parent.parent];
+    }
+  }
+
+  return true;
+}
+/*判断子菜单end*/
+
+/*左上表格start*/
+function leftTopload(){
+	optionsTopTable = {
+	    enableCellNavigation: true,
+	    enableColumnReorder: false,
+	    rowHeight: 28,
+	    editable: false,
+	    enableAddRow: false,
+	    checked:true,
+	    enableForHeaderCells:true,
+	    asyncEditorLoading: false
+	}
+    $("#assemblyTaskleftTopTable").css("height",($("#tableTopBox").height()-56)+"px");
+	assemblyTaskleftTopTable_columns.push(
+	    {
+	        field: 'id',
+	        name: 'ID',
+	        align:'center',
+	        sortable: true,
+	        minWidth: 100
+	    },
+	    {
+	    	id: "tousseName",
+	    	name : '物品名称',
+	        field : 'tousseName',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false,
+	        formatter:tousseNameFormatterTopTable
+	    },
+		{
+		    id: "amount",
+		    name : '数量',
+		    field : 'amount',
+		    align : 'center',
+		    align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false,
+	         focusable: false,
+		 	formatter:amountFormatterTopTable
+		},
+	    {
+	    	id: "urgentAmount",
+	        name : '加急数量',
+	        field : 'urgentAmount',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false
+	    },
+	    {
+	    	id: "urgentLevel",
+	        name : '加急等级',
+	        field : 'urgentLevel',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false
+	    },
+	    {
+	    	id: "basketName",
+	        name : '清洗篮筐',
+	        field : 'basketName',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false
+	    },
+	  	{	
+	  		id: "operate",
+	        name : '操作',
+	        field : 'operate',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 200,
+	        resizable: false,
+	        formatter:function(r, c, v, cd, dc){
+		    	if(dc.parent != null){
+	                var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteFootTabel(this)'/>";
+		    		if(dc.status == '待装配'){
+			            var supplent = true;
+			            for(var m = 0;m< dc.errors.length; m++) {
+			                if(errorTypeAdd !=dc.errors[m].errorType && ((dc.errors[m].amount - dc.errors[m].additionalAmount) != 0)) {
+			                    supplent = false;
+			                }
+			            }
+			            if(!supplent){
+			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addloseFootTableBtn(this);'>丢失</button>";
+			            }
+			    
+			            if(dc.damages.length > 0){
+			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addDameageFootTableBtn(this)'>报损</button>";
+			            }
+				    }
+				    return operateHtml;
+		    	}
+            }
+	  	},
+	  	{
+	  		id: "department",
+	        name : '申请科室',
+	        field : 'department',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false
+	  	},
+	  	{
+	  		id: "washTime",
+	     	name : '清洗时间',
+	     	field : 'washTime',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false
+	  	},
+	  	{
+	  		id: "status",
+	        name : '状态',
+	        field : 'status',
+	        align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false
+	  	},
+	  	{
+	  		id: "dateTime",
+	     	name : '回收时间',
+	     	field : 'dateTime',
+	     	align : 'center',
+	        sortable:true, //正序,逆序
+	        cssClass: "cell-title",
+	        minWidth: 100,
+	        resizable: false
+	  	}
+	); 
+	//将id列隐藏
+    visibleColumnsTopTable = [];//定义一个数组存放显示的列
+    for (var i = 0; i <  assemblyTaskleftTopTable_columns.length; i++) {
+        if (i!=0){
+            visibleColumnsTopTable.push(assemblyTaskleftTopTable_columns[i]);//将columns的列push进去
+        }
+
+    }
+}
+function leftToploadTable(){
+	dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true });
+    gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", dataViewTopTable, visibleColumnsTopTable, optionsTopTable);
+	gridTopTable.init();
+	
+	//获取选中行数据
+	/*gridTopTable.onSelectedRowsChanged.subscribe(function(){
+	})*/
+	gridTopTable.onClick.subscribe(function (e, args) {
+		gridTopTable.setSelectionModel(new Slick.RowSelectionModel());//选中行
+		// 上下table互斥
+		$("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content")
+    		.find("input[type='checkbox']").each(function(inputIndex, inputEle){
+    			$(inputEle).prop("checked", false);
+			});
+    	multiSelectFootData = [];
+
+    	if (dataViewTopTable.getItem(args.row).parent == null) {
+    		var inputEle = $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content").eq(args.row).find("input[type='checkbox']");
+    		if (args.cell == 0) {
+				$(inputEle).prop("checked", $(inputEle).is(':checked'));
+    		} else {
+    			$(inputEle).prop("checked", !$(inputEle).is(':checked'));
+    		}
+    	}else if(dataViewTopTable.getItem(args.row).parent != null){
+    		childTopData = dataViewTopTable.getItem(args.row);
+    		$("#sterilingType").val(childTopData.sterilingMethod);
+	        $("#sterilingType").change();
+
+	        sterilizerNameRequest();//灭菌炉
+       		packageTypeRequest();//包裝類型
+       		$("#packageType").val(childTopData.packageType);
+       		//packPrintChange("",childTopData);
+    	}
+
+    	//multiSelectTopData = [];
+    	
+    	var inputCheckBox = $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content").find("input[type='checkbox']:checked");
+    	for (var i = 0; i < inputCheckBox.length; i++) {
+    		var tdEle = $(inputCheckBox[i]).parent().parent();
+    		multiSelectTopData.push(dataViewTopTable.getItem($(tdEle).index()));
+    	}
+
+    	// 全选与否
+    	var allCheckBoxes = $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content").find("input[type='checkbox']");
+		var checkboxBoxAllChecked = inputCheckBox.length == allCheckBoxes.length;
+		$("#checkboxAllToptable").prop("checked", checkboxBoxAllChecked);
+
+
+    	$('.childrenInputTop').val(JSON.stringify(multiSelectTopData));
+        var childrenInpuTop =  $('.childrenInputTop').val();
+        childrenInpuTop = JSON.parse(childrenInpuTop);
+        packPrintChange("",childrenInpuTop);
+       //灭菌程序
+        if(multiSelectTopData.length>0){
+        	var num;
+	        for(var i=0;i<multiSelectTopData.length;i++){
+	        	num = multiSelectTopData[i];
+	        }
+	        $("#sterilingType").val(num.sterilingMethod);
+	        $("#sterilingType").change();
+
+	       
+	        sterilizerNameRequest();//灭菌炉
+       		packageTypeRequest();//包裝類型
+       		$("#packageType").val(num.packageType);
+        }
+	    if ($(e.target).hasClass("toggle")) {
+	       var item = dataViewTopTable.getItem(args.row);
+	        if (item) {
+	          if (!item._collapsed) {
+	            item._collapsed = true;
+	          } else {
+	            item._collapsed = false;
+	          }
+	          dataViewTopTable.updateItem(item.id, item);
+	        }
+	        e.stopImmediatePropagation();
+	      
+	    }
+	});
+	dataViewTopTable.onRowsChanged.subscribe(function (e, args) {
+		gridTopTable.invalidateRows(args.rows);
+		gridTopTable.render();
+	});
+ 	//修改样式
+ 	gridTopTable.onBeforeAppendCell.subscribe(function (e, args) {
+ 		if (gridTopTable.getColumns()[args.cell].id !== 'tousseName') return null;
+ 		var argData = dataViewTopTable.getItem(args.row);
+	 	if(argData.parent != null){
+	 		if(argData.status == '待装配'){
+		        var supplent = true;
+			        for(var m = 0;m< argData.errors.length; m++) {
+			            if(errorTypeAdd !=argData.errors[m].errorType && ((argData.errors[m].amount - argData.errors[m].additionalAmount) != 0)) {
+			                supplent = false;
+			            }
+			        }
+			        if(!supplent){
+			        	return "tousse-name-color";
+			        }
+
+			        if(argData.damages.length > 0){
+			            return "tousse-name-color";
+			        }
+
+			}
+	 	}else if(argData.parent == null){
+	 		var children = argData.children;
+	 		for(var i=0;i<children.length;i++){
+	 			if(children[i].status == '待装配'){
+		        var supplent = true;
+			        for(var m = 0;m< children[i].errors.length; m++) {
+			            if(errorTypeAdd !=children[i].errors[m].errorType && ((children[i].errors[m].amount - children[i].errors[m].additionalAmount) != 0)) {
+			                supplent = false;
+			            }
+			        }
+			        if(!supplent){
+			        	return "tousse-name-color";
+			        }
+
+			        if(children[i].damages.length > 0){
+			            return "tousse-name-color";
+			        }
+
+			    }
+	 		}
+	 	}
+	 	return "tousse-name-defaultColor";
+	}); 
+	
+}
+function reloadTopTableMoreborde(searchBarcode){
+  	$.ajax({
+	    url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml",
+	    dataType: "json", 
+	    async: true, 
+	    cache:false,//解决ie
+	    data: {"taskGroup":taskGroup,"basketBarcodes":searchBarcode}, 
+	    type: "post", 
+	    success: function(result) {
+	    	if(result.success == true){
+	    		assemblyTaskLeftTopTableCon = result.data;
+	    	    var datas =result.data;
+    			var tempId = 0;
+    			loadDataTop = [];
+    			loadDataTop = requestData(datas);//加载数据
+		    	dataViewTopTable.beginUpdate();
+			    dataViewTopTable.setItems(loadDataTop);
+			    dataViewTopTable.setFilter(myFilterTopTable);
+			    dataViewTopTable.endUpdate();
+	    	}else{
+	    		alert(result.message);
+	    	}
+	    	
+	    }
+	});
+  	leftToploadTable();
+
+}
+//装配以后刷新
+function reloadPackingLeftTopTasks() {
+    var datas =assemblyTaskLeftTopTableCon;
+	var tempId = 0;
+	loadDataTop = [];
+	for(var  i=0;i<datas.length;i++){
+		var d = (loadDataTop[tempId] = {});
+		var parentId = tempId;
+		d["id"] = tempId;
+		d["tousseID"] = datas[i].tousseID;
+		d["indent"] = 0;
+		d["parent"] = null;
+		d["tousseName"]=datas[i].tousseName;
+		d["amount"]=datas[i].amount;
+		d["urgentAmount"]= datas[i].urgentAmount;
+		d["urgentLevel"]= datas[i].urgentLevel;
+		d["basketName"]=datas[i].basketName;
+		d["operate"]="";
+		d["department"]=datas[i].department;
+		d["washTime"]=datas[i].washTime;
+		d["status"]=datas[i].status;
+		d["dateTime"]=datas[i].dateTime;
+		d["children"]=datas[i].children;
+		d["haveIDCard"]=datas[i].haveIDCard;
+		d["sterilingMethod"]=datas[i].sterilingMethod;
+		d["packageType"]=datas[i].packageType;
+		tempId ++;
+
+		var childrens = datas[i].children;
+		if (childrens != undefined || childrens.length > 0) {
+			//var tipsColor = "";
+           // var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteFootTabel(this)'/>"; 
+			for(var j=0; j < childrens.length; j++){
+				var k = (loadDataTop[tempId] = {});
+				k["id"] = (Math.random()*10000000);
+    			k["indent"] = 1;
+        		k["parent"] = parentId;
+    			k["tousseName"]=childrens[j].tousseName;
+    			k["amount"]=childrens[j].amount;
+    			k["urgentAmount"]=childrens[j].urgentAmount;
+    			k["urgentLevel"]=childrens[j].urgentLevel;
+    			k["basketName"]=childrens[j].basketName;
+    			//k["operate"]=operateHtml;
+    			k["department"]=childrens[j].department;
+    			k["washTime"]=childrens[j].washTime;
+    			k["status"]=childrens[j].status;
+    			k["dateTime"]=childrens[j].dateTime;
+
+
+    			k["errors"]=childrens[j].errors;
+    			k["damages"]=childrens[j].damages;
+    			k["taskType"]=childrens[j].taskType;
+    			k["sterilingMethod"]=childrens[j].sterilingMethod;
+    			k["packageType"]=childrens[j].packageType;
+
+				tempId ++;
+			}
+		}
+		
+	}
+
+	gridTopTable.invalidateAllRows();
+	dataViewTopTable.beginUpdate();
+    dataViewTopTable.setItems(loadDataTop);
+    dataViewTopTable.setFilter(myFilterTopTable);
+    dataViewTopTable.endUpdate();
+		
+}
+function amountFormatterTopTable(row, cell, value, columnDef, dataContext){
+	if(dataContext.parent == null){
+		var inputId = 'inputTop_'+dataContext.tousseID;
+	  	  return  "<div class='input-group spinner'>"
+	        + "<input id='"+inputId+"' type='text' class='form-control showNum_"+dataContext.tousseID+"' value='" + value + "' tousseName='"+dataContext.tousseName+"'  max-value='" + value +"' />"
+	        + "<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>"
+	}else{
+		return value;
+	}
+}
+function tousseNameFormatterTopTable(row, cell, value, columnDef, dataContext){
+    //如果没有数据，就都返回
+    if (value == null || value == undefined || dataContext === undefined) { return ""; }
+   
+    value = value.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+    //制造一个占位
+    var spacer = "<span style='display:inline-block;height:1px;width:" + (15 * dataContext["indent"]) + "px'></span>";
+
+
+    //根据ID获取此行内容的索引值
+    var idx = dataViewTopTable.getIdxById(dataContext.id);
+
+    if (loadDataTop[idx + 1] && loadDataTop[idx + 1].indent > loadDataTop[idx].indent) {
+      //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进
+        if (dataContext._collapsed) {
+
+        	return spacer + " <input type='checkbox' style='width:14px;'/>&nbsp;<span class='toggle expand'></span>&nbsp;<span>"+value+"</span>" ;//收缩
+     	} else {
+        	return spacer + "<input type='checkbox' style='width:14px;'/>&nbsp; <span class='toggle collapse'></span>&nbsp;<span>"+value+"</span>";//展开
+      	}
+    } else {
+        return spacer + " <span class='toggle'></span>&nbsp;<span>"+value+"</span>";
+    }
+}
+function myFilterTopTable(item) {
+  if (item.parent != null) {//代表有子菜单
+    var parent = loadDataTop[item.parent];
+    while (parent) {
+      if (parent._collapsed) {//展开
+        return false;
+      }
+
+      parent = loadDataTop[parent.parent];
+    }
+  }
+
+  return true;
+}
+
+//上下公共方法数据
+function requestData(data){
+	var renderData = [];
+	var tempId = 0;
+	for(var  i=0;i<data.length;i++){
+		var d = (renderData[tempId] = {});
+		var parentId = tempId;
+		d["id"] = tempId;
+		d["tousseID"] = data[i].tousseID;
+		d["indent"] = 0;
+		d["parent"] = null;
+		d["tousseName"]=data[i].tousseName;
+		d["amount"]=data[i].amount;
+		d["urgentAmount"]= data[i].urgentAmount;
+		d["urgentLevel"]= data[i].urgentLevel;
+		d["basketName"]=data[i].basketName;
+		d["operate"]="";
+		d["department"]=data[i].department;
+		d["washTime"]=data[i].washTime;
+		d["status"]=data[i].status;
+		d["dateTime"]=data[i].dateTime;
+		d["children"]=data[i].children;
+		d["haveIDCard"]=data[i].haveIDCard;
+		d["sterilingMethod"]=data[i].sterilingMethod;
+		d["packageType"]=data[i].packageType;
+		tempId ++;
+
+		var childrens = data[i].children;
+		if (childrens != undefined || childrens.length > 0) {
+			for(var j=0; j < childrens.length; j++){
+				var k = (renderData[tempId] = {});
+				k["id"] = (Math.random()*10000000);
+				k["indent"] = 1;
+	    		k["parent"] = parentId;
+				k["tousseName"]=childrens[j].tousseName;
+				k["amount"]=childrens[j].amount;
+				k["urgentAmount"]=childrens[j].urgentAmount;
+				k["urgentLevel"]=childrens[j].urgentLevel;
+				k["basketName"]=childrens[j].basketName;
+				k["department"]=childrens[j].department;
+				k["washTime"]=childrens[j].washTime;
+				k["status"]=childrens[j].status;
+				k["dateTime"]=childrens[j].dateTime;
+
+
+				k["errors"]=childrens[j].errors;
+				k["damages"]=childrens[j].damages;
+				k["taskType"]=childrens[j].taskType;
+				k["sterilingMethod"]=childrens[j].sterilingMethod;
+				k["packageType"]=childrens[j].packageType;
+
+				tempId ++;
+			}
+		}	
+    }
+    return renderData;
+}
+/*左上表格end*/
+/*数量增减start*/
+function addNum(that){
+	var numVals = parseInt($(that).parent().siblings("input").val());
+	var touseName = $(that).parent().siblings("input").attr("tousseName");
+	var maxValue = parseInt($(that).parent().siblings("input").attr("max-value"));
+	if(numVals > 0 && numVals == maxValue){
+		var addNumHtml= "<div class='panel panel-primary panel-tips'>"
+	               + "<div class='panel-heading'>提示</div>"
+	               + "<div class='panel-body'>"
+	               + ""+touseName+"装配数量不能大于"+numVals+""
+	               + "</div>"
+	               + "</div>";
+        $("body").append(addNumHtml);
+	    return;
+    } 
+    if(numVals == 0 || numVals < maxValue){
+	   addVal = parseInt($(that).parent().siblings("input").val())+1;
+	   $(that).parent().siblings("input").val(addVal);
+    }
+}
+setInterval(function(){
+	$(".panel-tips").hide();
+},9000);
+function reduceNum(that){
+    addVal = parseInt($(that).parent().siblings("input").val())-1;
+    if(addVal<0){
+	     return;
+	}else{
+		$(that).parent().siblings("input").val(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);
+}
+function reduceFrequency(that){
+    var reduceVal = parseInt($(that).parent().siblings("input").val())-1;
+    if(reduceVal<0){
+        return;
+	}else{
+		$(that).parent().siblings("input").val(reduceVal);
+	}
+}
+/*数量增减end*/
+
+//补充丢失和报损按钮的数字
+function loseAndDamageNum(){
+	$.ajax({  
+		url:WWWROOT+"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml",
+		type: "get", 
+		async:true,
+		cache:false,
+		success:function(result){
+			var result = JSON.parse(result);
+			if(result.success == true){
+				$("#addLose b").text(result.errorCount);
+		    	$("#addBreakage b").text(result.damageCount);
+			}else{
+				alert(result.message);
+			}
+			
+		}
+	});
+};
+
+//判断按钮显示
+function packPrintChange(selectRowDatas,selectRowDatasTop,childTopData){
+	//左上表格
+	var selectionsTop = selectRowDatasTop;
+	//var childTopData = childTopData;
+	if(selectionsTop.length>0){
+		$("#packPrint").show();
+		return;
+	}
+	//左下表格
+    var selections = selectRowDatas;
+	var show = false;
+	for(var i=0;i<selections.length;i++){
+		var selectionsNode = selections[i].children;
+		if (selectionsNode == undefined ) {//子级
+			if (selections[i].taskType != taskType_recyclingRecord) {
+				show = true;
+   				break;
+   			}
+		} else {
+			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();
+	}
+}
+
+//日期插件
+function datePick(dateId,format,direction){
+    $("#"+dateId).datetimepicker({//选择年月日
+	　　format: format,
+	　　language: 'zh-CN',
+	　　weekStart: 1,
+	　　todayBtn: 1,//显示‘今日’按钮
+	　　autoclose: 1,
+	　　todayHighlight: 1,
+	　　startView: 2,//Number, String. 默认值：0, 'hour'，日期时间选择器所能够提供的最精确的时间选择视图。
+	　　minView: 2,  
+	　　//clearBtn:true,//清除按钮
+	　　forceParse: 0,
+	    pickerPosition:direction
+　  });
+}
+datePick("dateFrom_breakage","yyyy-mm-dd hh:ii:ss","bottom-right");//添加报损器械
+datePick("determineDate","yyyy-mm-dd","top-right");//灭菌日期
+datePick("dateFrom_Amend","yyyy-mm-dd hh:ii:ss","bottom-right");//灭菌开始时间
+datePick("dateFrom_printBegin","yyyy-mm-dd hh:ii:ss","bottom-right");//打印回收清单开始时间
+datePick("dateFrom_printEnd","yyyy-mm-dd hh:ii:ss","bottom-right");//打印回收清单结束时间
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/addOrAmendRole.js
===================================================================
diff -u -r24754 -r24846
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/addOrAmendRole.js	(.../addOrAmendRole.js)	(revision 24754)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/addOrAmendRole.js	(.../addOrAmendRole.js)	(revision 24846)
@@ -1,10 +1,13 @@
 $(function(){
-	//计算高度
-    var parentHead = window.parent.$(".head-index");
-    var navbar =  window.parent.$(".content-index");
-    var systemInforWrapp_Height = $(window).height() - parentHead.height() - navbar.height() - 20;
-    $(".authority-management-wrapp").css("height",systemInforWrapp_Height+"px");
 
+	//增加角色
+	$(".add-role-wrapp").show();
+	sysMamHeight(".add-role-wrapp");
+	resizeComon(".add-role-wrapp");
+	//修改角色
+	$(".amend-role-wrapp").show();
+	sysMamHeight(".amend-role-wrapp");
+	resizeComon(".amend-role-wrapp");
   	formVerify();//验证表单  
   	//点击保存按钮
     $("#saveRoleAdd").click(function(){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/distributionAuth.js
===================================================================
diff -u -r24754 -r24846
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/distributionAuth.js	(.../distributionAuth.js)	(revision 24754)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/distributionAuth.js	(.../distributionAuth.js)	(revision 24846)
@@ -1,14 +1,7 @@
 $(function(){
-   	//计算高度
-    var parentHead = window.parent.$(".head-index");
-    var navbar =  window.parent.$(".content-index");
-    var systemInforWrapp_Height = $(window).height() - parentHead.height() - navbar.height() - 20;
-    $(".authority-management-wrapp").css("height",systemInforWrapp_Height+"px");
-
-
-   
-
-  	/*修改权限start*/
+   	$(".distribution-auth-wrapp").show();
+	sysMamHeight(".distribution-auth-wrapp");
+	resizeComon(".distribution-auth-wrapp");
   	//全选
 	$(".disinfect-system-list .row").each(function(){
 		$(this).find("div:first .checkbox input").click(function(){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
===================================================================
diff -u -r24844 -r24846
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24844)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24846)
@@ -90,9 +90,13 @@
     var $loginDate =$(".head-index-right-login-date");
     $loginDate.text(year+"年"+month+"月"+date+"日"+str);    
     
-
+/*
     $(".head-index-right").mouseover(function(){
         $(".head-index-user-list").show();
+    })*/
+    
+    $(".head-index-user-open").click(function(){
+        $(".head-index-user-list").show();
     })
     $(".head-index-user-list").mouseout(function(){
         $(this).hide();