Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24607 -r24630
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24607)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24630)
@@ -1,4 +1,4 @@
-var documentHeight  = $(window).height();
+
 var recoredTableH ="";
 var assemblyTaskLeftTopTableCon; //left table top
 var addVal = "";
@@ -13,8 +13,7 @@
 var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试
 var packedToussesArray = [];// 用于一次打印所有装配的包
 var tousseesToPrint = [];
-//页面一加载就获取焦点
-$("#searchBarcode").focus();
+
 //增加table的paddiing
 function addPaddingBottom(pbClass){
   $("."+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
@@ -269,7 +268,7 @@
 				
 				
 				$.ajax({
-				    url:"/disinfectSystem/packingController/packingTousse.mhtml",
+				    url:WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
 				    dataType: "json",
 				    async:false,
 				    type: "POST", 
@@ -284,7 +283,7 @@
 					    		packingTasks = result.packingTasks;
 					    		packingTaskArray = packingTaskArray.concat(packingTasks);
 				    		}
-				    		processAfterPacking(false,result,tousseName,inputAmount);
+				    		//processAfterPacking(false,result,tousseName,inputAmount);
 			    		    alert(result.message);
 				    	}else{
 				    		var addNumHtml= "<div class='panel panel-primary panel-tips'>"
@@ -340,7 +339,7 @@
 		
 		assemblyTaskLeftTopTableCon = assembleArray;
 		reloadPackingLeftTopTasks();//刷新左上表格
-		printLabelsAfterPacking();//打印标签
+		//printLabelsAfterPacking();//打印标签
 				
 	  
 });
@@ -470,7 +469,7 @@
 
 function requstCode(barcode,clearId,name,namecode){
 	$.ajax({
-		url:"/disinfectSystem/web/userController/getUserByBarcode.mhtml",
+		url:WWWROOT+"/disinfectSystem/web/userController/getUserByBarcode.mhtml",
 		dataType: "json", 
 	    async: false, 
 	    data: {"barcode":barcode}, 
@@ -490,7 +489,7 @@
 //灭菌程序
 var sterilizerName = $("#sterilizerName option:selected").val();
 $.ajax({  
-    url:"/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml",
+    url:WWWROOT+"/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml",
     type: "get", 
     data:{"sterilingType":sterilizerName},
     success:function(result){
@@ -520,7 +519,7 @@
 //灭菌炉
 function sterilizerNameRequest(){
 	$.ajax({
-		 url:"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml",
+		 url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml",
 		 type: "get", 
 		 async:true,
 		 success:function(result){
@@ -543,7 +542,7 @@
 //包装类型
 function packageTypeRequest(){
 	$.ajax({
-		 url:"/disinfectSystem/baseData/expirationDateInfoController/getPackageTypeAndExpirationDateInfo.mhtml",
+		 url:WWWROOT+"/disinfectSystem/baseData/expirationDateInfoController/getPackageTypeAndExpirationDateInfo.mhtml",
 		 type: "get", 
 		 async:false,
 		 success:function(result){
@@ -571,7 +570,7 @@
 //补充丢失和报损按钮的数字
 function loseAndDamageNum(){
 	$.ajax({  
-		url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml",
+		url:WWWROOT+"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml",
 		type: "get", 
 		async:true,
 		cache:false,
@@ -590,7 +589,258 @@
 
 
 $(function(){
+	var documentHeight  = $(window).height();
+	//页面一加载就获取焦点
+	$("#searchBarcode").focus();
    loseAndDamageNum();//丢失和报损的数字
+   /* left top table start*/
+   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 resultHTop = tableHTop-40;
+   var resultHFoot = tableHFoot-76; 
+
+   var assemblyTaskLeftTopTable_columns=[ 
+         {
+           checkbox : true,
+           switchable: false
+         },
+         {
+           title : '物品名称',
+           field : 'tousseName',
+           align : 'center',
+           sortable:true, //正序,逆序
+           switchable: false,
+           cellStyle:function(value,row,index){
+         	  for(i=0;i<row.children.length;i++){
+         		  if(row.children[i].status == '待装配'){
+   			            var supplent = true;
+   			            for(var j = 0;j < row.children[i].errors.length ; j++) {
+   			                if(errorTypeAdd != row.children[i].errors[j].errorType && ((row.children[i].errors[j].amount - row.children[i].errors[j].additionalAmount) != 0)) {
+   			                    supplent = false;
+   			                }
+   			            }
+   			            if(!supplent){
+   			            	return {css:{"color":"red"}};
+   			            }
+   			    
+   			            if(row.children[i].damages.length > 0){
+   			            	return {css:{"color":"red"}};
+   			            }
+   			        }
+         		  
+         	  }
+         	  return {css:{"color":"#000"}};
+         	}
+
+         },
+         {
+           title : '数量',
+           field : 'amount',
+           align : 'center',
+           sortable:true,
+           switchable: false,
+           formatter:function(v,record){
+         	  var inputId = 'topInput_'+record.tousseID;
+         	  return  "<div class='input-group spinner'>"
+               + "<input id='"+inputId+"' type='text' class='form-control showNum_"+record.tousseID+"' value='" + v + "' tousseName='"+record.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>"
+            }
+         },
+         {
+           title : '加急数量',
+           field : 'urgentAmount',
+           align : 'center',
+            sortable:true
+         },
+         {
+            title : '加急等级',
+            field : 'urgentLevel',
+            align : 'center',
+            sortable:true
+         },
+         {
+            title : '清洗篮筐',
+            field : 'basketName',
+            align : 'center',
+            sortable:true
+         },
+         {
+            title : '操作',
+            field : 'operate',
+            align : 'center',
+            sortable:true,
+            width:300
+         },
+         {
+            title : '申请科室',
+            field : 'department',
+            align : 'center',
+            sortable:true
+         },
+         {
+            title : '清洗时间',
+            field : 'washTime',
+            align : 'center',
+            sortable:true
+         },
+         {
+            title : '状态',
+            field : 'status',
+            align : 'center',
+            sortable:true
+         },
+         {
+            title : '回收时间',
+            field : 'dateTime',
+            align : 'center',
+            sortable:true
+         }
+   ]; 
+   var assemblyTaskLeftTopTable = "<table id='assemblyTaskLeftTopTable' class='table table-striped cleanPadding table-bordered table-hover' data-height='" + resultHTop + "' data-toggle data-toggle='table'></table>";
+   $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable);
+    /*在篮筐中输入条码*/
+     $("#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);
+           //把表格高度变小
+           $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"});
+           $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({
+             "padding-bottom":"2px",
+             "padding-top":"2px"
+           });
+           $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
+             "line-height":"0",
+             "margin-top":"4px",
+             "margin-bottom":"4px"
+           });
+          // subText("assemblyTaskleftTopTable");
+          // $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
+           //topTableRowClickEvent();
+       } 
+   })
+
+
+
+    //中间的高度
+   //计算table的高度
+    var taskmiddleTop = $(".assembly-task-middlefoot").offset().top;
+    taskmiddleH = documentHeight - taskmiddleTop-123;
+    $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"});
+   //var winH =  $(window).height();
+   /*setInterval(function(){
+     var tableHTop = 0;
+     var tableHFoot = 0;
+     var resultHTop = 0;
+     var resultHFoot = 0;
+     var parentH = $(window.parent.document).find(".head-index").height();
+     var taskmiddleTop = $(".assembly-task-middlefoot").offset().top;
+     var taskmiddleH = "";
+     console.log("parentH"+parentH);
+     if(parentH == 0){
+       taskmiddleH = documentHeight - taskmiddleTop-43;
+       tabH = winH-39-33;
+       tableHTop = tabH*0.45;
+       tableHFoot = tabH*0.55;
+       resultHTop = tableHTop-40;
+       //resultHFoot = tableHFoot-38;
+       //$("#assemblyTaskleftFootTableWrapp .fixed-table-container").css("padding-bttom","0");
+     }else if(parentH == 87){
+       taskmiddleH = documentHeight - taskmiddleTop-130;
+       tabH = winH-39-122;
+       tableHTop = tabH*0.45;
+       tableHFoot = tabH*0.55;
+       resultHTop = tableHTop-40;
+       resultHFoot = tableHFoot-76;
+     }*/
+     
+    /* $("#tableTopBox").css({"height":tableHTop+"px"});
+     $("#tableFootBox").css({"height":tableHFoot+"px"});
+
+     $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"});
+      
+     $("#assemblyTaskLeftTopTable").bootstrapTable("resetView", {height:resultHTop});
+     //$("#assemblyTaskLeftFootTable").bootstrapTable("resetView", {height:resultHFoot});
+
+     //$("#assemblyTaskLeftFootTable").bootstrapTable("destroy");
+   },100);*/
+   /* var topTaboffset =  $("#assemblyTaskLeftTopTableWrapp").offset().top;*/
+   //console.log("winH"+documentHeight);
+    assemblyTaskLeftTopload([],assemblyTaskLeftTopTable_columns);
+    $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
+      "line-height":"0",
+      "margin-top":"4px",
+      "margin-bottom":"4px"
+    });
+    $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
+   
+   
+   
+   
+   
+
+
+                     //右边材料清单
+                     var materialsTop = $("#materialsMenu").offset().top;
+                     var materialsH = documentHeight-materialsTop-123;
+                     var materialstable = "<table id='materialsTable' class='table table-striped table-bordered table-hover' data-height='"+materialsH+"' data-toggle data-toggle='table'></table>";                   
+                     $("#materialsMenu").append(materialstable);
+                     materialsLoadTable([],materials_columns);
+                      //把表格的高度变小
+                     $("#materialsTable").css({"min-width": "300px"});
+                     $("#materialsTable th,#materialsTable td").css({
+                       "padding-bottom":"2px",
+                       "padding-top":"2px"
+                     })
+                     /*材料清单 table end*/
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
   //补充丢失/报损表格
   var addLoseTable="<table id='addLoseTable' class='table table-striped table-bordered table-hover' data-height='284' data-toggle data-toggle='table'></table>";
   $('#addLoseTableWrapper').append(addLoseTable);
@@ -666,7 +916,7 @@
           align : 'center',
           sortable:true, //正序,逆序
           switchable: false,
-          formatter:function(v,record,index){       
+       /*   formatter:function(v,record,index){       
         	  var vs = v ;
         	  for(var i=0;i<record.children.length;i++){
         		  if(record.children[i].taskType != taskType_recyclingRecord){
@@ -675,7 +925,7 @@
         		  }
         	  }
            return vs;
-          },
+          },*/
           cellStyle:function(value,row,index){
         	  for(i=0;i<row.children.length;i++){
         		  if(row.children[i].status == '待装配'){
@@ -777,7 +1027,7 @@
   //左下表格数据
   function loadPackingTasks(){
 	  $.ajax({
-		    url: "/disinfectSystem/packingController/getPackingTaskList.mhtml",
+		    url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml",
 		    dataType: "json", 
 		    async: true, 
 		    data: {"taskGroup":taskGroup}, 
@@ -1189,7 +1439,7 @@
     	/*}*/
     		//材料清单
       		$.ajax({
-      		    url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+      		    url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
      		    dataType: "json", 
      		    async: false, 
      		    data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, 
@@ -1564,7 +1814,7 @@
 })
 function confirmDelete(footTabelids){
 	$.ajax({
-	    url: "/disinfectSystem/packingController/deletePackingTask.mhtml",
+	    url:WWWROOT+"/disinfectSystem/packingController/deletePackingTask.mhtml",
 	    dataType: "json", 
 	    async: true, 
 	    type: "post", 
@@ -1683,14 +1933,14 @@
       allBagName=req;
     }
   });*/
-	var allBagName = {"results":[
+	/*var allBagName = {"results":[
     {"id": 1, text: '小手术包' }
-  /*  {"id|1-100": 2, text: '小麻醉包' },
+    {"id|1-100": 2, text: '小麻醉包' },
     {"id|1-100": 3, text: '小麻醉骨科包'},
     {"id|1-100": 4, text: '大麻醉包' },
     {"id|1-100": 5, text: '小器械包' },
     {"id|1-100": 6, text: '大器械包' },
-    {"id|1-100": 7, text: '大器械骨科包' }*/]}
+    {"id|1-100": 7, text: '大器械骨科包' }]}
   selectPull("instrumentSetSelect",allBagName);//器械包名称
   function selectPull(selId,allData){
     $("#"+selId).select2({
@@ -1702,7 +1952,7 @@
       maximumSelectionLength:1
     })
 
-  }
+  }*/
   //科室
   /*Mock.mock(
       'http://mockjsdepartmentame', 
@@ -1713,8 +1963,8 @@
          ]
       }
   );*/
-  $("#departmentsSelect").select2({
-	  /* ajax: {
+  /*$("#departmentsSelect").select2({
+	   ajax: {
       url: "http://mockjsdepartmentame",
       contentType:'application/json;charset=utf-8',
       dataType: 'json',
@@ -1737,13 +1987,13 @@
               };
           },
           cache: true
-      },*/
+      },
     language: "zh-CN",
     placeholder:'关键词搜素',
     allowClear:true,
     minimumInputLength: 1,
     maximumSelectionLength:1
-  })
+  })*/
 
   //报损科室
    /*Mock.mock(
@@ -1756,8 +2006,8 @@
          ]
       }
   );*/
- $("#breakageDeparent").select2({
-	 /*ajax: {
+ /*$("#breakageDeparent").select2({
+	 ajax: {
       url: "http://mockjsdeparent",
       contentType:'application/json;charset=utf-8',
       dataType: 'json',
@@ -1780,13 +2030,13 @@
               };
           },
           cache: true
-      },*/
+      },
     language: "zh-CN",
     placeholder:'关键词搜素',
     allowClear:true,
     minimumInputLength: 1,
     maximumSelectionLength:1
-  })
+  })*/
   //报损环节
  /* Mock.mock(
       'http://mockjslink', 
@@ -1883,8 +2133,8 @@
          ]
       }
   );*/
-  $("#materialsName").select2({
-  /*    ajax: {
+  /*$("#materialsName").select2({
+      ajax: {
         url: "http://mockjsmaterialsName",
         contentType:'application/json;charset=utf-8',
         dataType: 'json',
@@ -1907,13 +2157,13 @@
                 };
             },
             cache: true
-        },*/
+        },
       language: "zh-CN",
       placeholder:'关键词搜素',
       allowClear:true,
       minimumInputLength: 1,
       maximumSelectionLength:1
-  })
+  })*/
 })
 //截取left foot table 文字
 function subText(subId){
@@ -2362,7 +2612,7 @@
 //丢失分类类型option
 var addLoseClassifyTypeOptions = "";   
 $.ajax({   
-    url:"/disinfectSystem/recyclingrecord/materialErrorDamageController/getDamageErrorDepartType.mhtml",
+    url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/getDamageErrorDepartType.mhtml",
     type: "get", 
     async:true,
     success:function(result){
@@ -2457,7 +2707,7 @@
 		 $(brotherSelect).html("<option value='请选择器械类型'>请选择器械类型</option>");
 		 if(departTypeName != '请选择分类类型'){
 				$.ajax({   
-		        url:"/disinfectSystem/recyclingrecord/materialErrorDamageController/getMaterialTypeType.mhtml",
+		        url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/getMaterialTypeType.mhtml",
 		        type: "get", 
 		        async:true,
 		        data:{
@@ -2503,7 +2753,7 @@
  	   if(barcode != "" && barcode != null){
  		   //补充丢失加载清洗篮筐
      	   $.ajax({   
- 	        url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadClassifyBasket.mhtml",
+ 	        url:WWWROOT+"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadClassifyBasket.mhtml",
  	        type: "get", 
  	        async:true,
  	        data:{basketBarcode:barcode},
@@ -2535,7 +2785,7 @@
 	});
     //丢失补充列表
     $.ajax({   
-      url:"/disinfectSystem/recyclingrecord/materialErrorDamageController/loadAdditionalMaterialStore.mhtml",
+      url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/loadAdditionalMaterialStore.mhtml",
       type: "get", 
       async:true,
       cache:false,//解决ie
@@ -2627,7 +2877,7 @@
 		basketBarcodes.push(searchBarcodeHidden);
 		var addLoseBarcodeHidden = $("#addLoseBarcodeHidden").val();
 	    $.ajax({   
-	      url:"/disinfectSystem/recyclingrecord/materialErrorDamageController/materialSupplement.mhtml",
+	      url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/materialSupplement.mhtml",
 	      type: "post", 
 	      async:true,
 	      data:{
@@ -2695,7 +2945,7 @@
 
 function reloadTopTableMoreborde(searchBarcode){
   $.ajax({
-	    url: "/disinfectSystem/packingController/getPackingTaskList.mhtml",
+	    url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml",
 	    dataType: "json", 
 	    async: true, 
 	    data: {"taskGroup":taskGroup,"basketBarcodes":searchBarcode}, 
@@ -2729,196 +2979,8 @@
 }
 
 
-/* left top table start*/
-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 resultHTop = tableHTop-40;
-var resultHFoot = tableHFoot-76; 
 
-var assemblyTaskLeftTopTable_columns=[ 
-      {
-        checkbox : true,
-        switchable: false
-      },
-      {
-        title : '物品名称',
-        field : 'tousseName',
-        align : 'center',
-        sortable:true, //正序,逆序
-        switchable: false,
-        cellStyle:function(value,row,index){
-      	  for(i=0;i<row.children.length;i++){
-      		  if(row.children[i].status == '待装配'){
-			            var supplent = true;
-			            for(var j = 0;j < row.children[i].errors.length ; j++) {
-			                if(errorTypeAdd != row.children[i].errors[j].errorType && ((row.children[i].errors[j].amount - row.children[i].errors[j].additionalAmount) != 0)) {
-			                    supplent = false;
-			                }
-			            }
-			            if(!supplent){
-			            	return {css:{"color":"red"}};
-			            }
-			    
-			            if(row.children[i].damages.length > 0){
-			            	return {css:{"color":"red"}};
-			            }
-			        }
-      		  
-      	  }
-      	  return {css:{"color":"#000"}};
-      	}
 
-      },
-      {
-        title : '数量',
-        field : 'amount',
-        align : 'center',
-        sortable:true,
-        switchable: false,
-        formatter:function(v,record){
-      	  var inputId = 'topInput_'+record.tousseID;
-      	  return  "<div class='input-group spinner'>"
-            + "<input id='"+inputId+"' type='text' class='form-control showNum_"+record.tousseID+"' value='" + v + "' tousseName='"+record.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>"
-         }
-      },
-      {
-        title : '加急数量',
-        field : 'urgentAmount',
-        align : 'center',
-         sortable:true
-      },
-      {
-         title : '加急等级',
-         field : 'urgentLevel',
-         align : 'center',
-         sortable:true
-      },
-      {
-         title : '清洗篮筐',
-         field : 'basketName',
-         align : 'center',
-         sortable:true
-      },
-      {
-         title : '操作',
-         field : 'operate',
-         align : 'center',
-         sortable:true,
-         width:300
-      },
-      {
-         title : '申请科室',
-         field : 'department',
-         align : 'center',
-         sortable:true
-      },
-      {
-         title : '清洗时间',
-         field : 'washTime',
-         align : 'center',
-         sortable:true
-      },
-      {
-         title : '状态',
-         field : 'status',
-         align : 'center',
-         sortable:true
-      },
-      {
-         title : '回收时间',
-         field : 'dateTime',
-         align : 'center',
-         sortable:true
-      }
-]; 
-var assemblyTaskLeftTopTable = "<table id='assemblyTaskLeftTopTable' class='table table-striped cleanPadding table-bordered table-hover' data-height='" + resultHTop + "' data-toggle data-toggle='table'></table>";
-$("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable);
- /*在篮筐中输入条码*/
-  $("#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);
-        //把表格高度变小
-        $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"});
-        $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({
-          "padding-bottom":"2px",
-          "padding-top":"2px"
-        });
-        $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
-          "line-height":"0",
-          "margin-top":"4px",
-          "margin-bottom":"4px"
-        });
-       // subText("assemblyTaskleftTopTable");
-       // $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
-        //topTableRowClickEvent();
-    } 
-})
-
-
-
- //中间的高度
-//计算table的高度
- var taskmiddleTop = $(".assembly-task-middlefoot").offset().top;
- taskmiddleH = documentHeight - taskmiddleTop-123;
- $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"});
-//var winH =  $(window).height();
-/*setInterval(function(){
-  var tableHTop = 0;
-  var tableHFoot = 0;
-  var resultHTop = 0;
-  var resultHFoot = 0;
-  var parentH = $(window.parent.document).find(".head-index").height();
-  var taskmiddleTop = $(".assembly-task-middlefoot").offset().top;
-  var taskmiddleH = "";
-  console.log("parentH"+parentH);
-  if(parentH == 0){
-    taskmiddleH = documentHeight - taskmiddleTop-43;
-    tabH = winH-39-33;
-    tableHTop = tabH*0.45;
-    tableHFoot = tabH*0.55;
-    resultHTop = tableHTop-40;
-    //resultHFoot = tableHFoot-38;
-    //$("#assemblyTaskleftFootTableWrapp .fixed-table-container").css("padding-bttom","0");
-  }else if(parentH == 87){
-    taskmiddleH = documentHeight - taskmiddleTop-130;
-    tabH = winH-39-122;
-    tableHTop = tabH*0.45;
-    tableHFoot = tabH*0.55;
-    resultHTop = tableHTop-40;
-    resultHFoot = tableHFoot-76;
-  }*/
-  
- /* $("#tableTopBox").css({"height":tableHTop+"px"});
-  $("#tableFootBox").css({"height":tableHFoot+"px"});
-
-  $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"});
-   
-  $("#assemblyTaskLeftTopTable").bootstrapTable("resetView", {height:resultHTop});
-  //$("#assemblyTaskLeftFootTable").bootstrapTable("resetView", {height:resultHFoot});
-
-  //$("#assemblyTaskLeftFootTable").bootstrapTable("destroy");
-},100);*/
-/* var topTaboffset =  $("#assemblyTaskLeftTopTableWrapp").offset().top;*/
-//console.log("winH"+documentHeight);
-
 function assemblyTaskLeftTopload(tableDate,columns){
   $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');
   $("#assemblyTaskLeftTopTable").bootstrapTable(
@@ -3022,13 +3084,7 @@
 }
 /*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([],assemblyTaskLeftTopTable_columns);
-$(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
-  "line-height":"0",
-  "margin-top":"4px",
-  "margin-bottom":"4px"
-});
-$("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
+
 function reloadPackingLeftTopTasks() {
 	  $("#assemblyTaskleftTopTable").bootstrapTable("destroy");
 	  loadPackingLetTopTasks();
@@ -3051,10 +3107,37 @@
       subText("assemblyTaskLeftTopTable");
 }
 /*left top table end*/
+var materials_columns=[ 
+                       {
+                         checkbox : true,
+                       },
+                       {
+                         title : '材料名称',
+                         field : 'name',
+                         align : 'center',
+                         sortable:true, //正序,逆序
+                         width:500,
+                         formatter:function(v,record){
+                       	  return "<span washQualityCheckPoint='"+record.washQualityCheckPoint+"' washQualityCheckMethod='"+record.washQualityCheckMethod+"' functionCheck='"+record.functionCheck+"'>"+v+"</span>";
+                         }
+                       },
+                       {
+                         title : '数量',
+                         field : 'count',
+                         align : 'center',
+                         sortable:true //正序,逆序
+                       },
+                       {
+                         title : '是否可拆',
+                         field : 'detachable',
+                         align : 'center',
+                         sortable:true //正序,逆序
+                       }
+                 ];
 //父级材料清单
 function materialList(rows){
   $.ajax({
-    url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+    url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
     dataType: "json", 
     async: true, 
     data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
@@ -3080,7 +3163,7 @@
   for(var i=0;i<subTr.length;i++){
     $(subTr[i]).click(function(){
       $.ajax({
-            url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+            url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
             dataType: "json", 
             async: true, 
             data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
@@ -3153,49 +3236,8 @@
         columns : columns
       });
 	}
-var materials_columns=[ 
-      {
-        checkbox : true,
-      },
-      {
-        title : '材料名称',
-        field : 'name',
-        align : 'center',
-        sortable:true, //正序,逆序
-        width:500,
-        formatter:function(v,record){
-      	  return "<span washQualityCheckPoint='"+record.washQualityCheckPoint+"' washQualityCheckMethod='"+record.washQualityCheckMethod+"' functionCheck='"+record.functionCheck+"'>"+v+"</span>";
-        }
-      },
-      {
-        title : '数量',
-        field : 'count',
-        align : 'center',
-        sortable:true //正序,逆序
-      },
-      {
-        title : '是否可拆',
-        field : 'detachable',
-        align : 'center',
-        sortable:true //正序,逆序
-      }
-];
 
 
-//右边材料清单
-var materialsTop = $("#materialsMenu").offset().top;
-var materialsH = documentHeight-materialsTop-123;
-var materialstable = "<table id='materialsTable' class='table table-striped table-bordered table-hover' data-height='"+materialsH+"' data-toggle data-toggle='table'></table>";                   
-$("#materialsMenu").append(materialstable);
-materialsLoadTable([],materials_columns);
- //把表格的高度变小
-$("#materialsTable").css({"min-width": "300px"});
-$("#materialsTable th,#materialsTable td").css({
-  "padding-bottom":"2px",
-  "padding-top":"2px"
-})
-/*材料清单 table end*/
-
 $(function(){
 	   setInterval(function(){
 	    var  boxW = $(".assembly-task-middlefoot").width();
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24605 -r24630
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24605)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24630)
@@ -74,7 +74,7 @@
 <body style="background:#fff;">
 <object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0 style="display:none;">
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
-</object>
+</object> 
 	<div class="wrapp">
 		<ul class="nav nav-tabs assembly-manage" role="tablist">
 		    <li role="presentation" class="active">
@@ -962,16 +962,16 @@
 <script language="javascript" type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
 
 <!-- bootstrap select2 -->
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.min.js"></script>
+<%-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.min.js"></script>
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/zh-CN.js"></script>
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.full.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.full.min.js"></script> --%>
 <!-- 配置项js -->
-<%@ include file="/disinfectsystem/print/print2.jsp"%>
-<script type="text/javascript" src="${basePath}/disinfectsystem/print/print.js" /></script>
-<script type="text/javascript" src="${basePath}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>	
+<%--  <%@ include file="/disinfectsystem/print/print2.jsp"%> --%>
+<%-- <script type="text/javascript" src="${basePath}/disinfectsystem/print/print.js" /></script>
+<script type="text/javascript" src="${basePath}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>	 --%>
 <script type="text/javascript" src="${basePath}/disinfectsystem/config/${profile}/config.js"></script>
 
-<script type="text/javascript" src="${basePath}/disinfectsystem/common/cssdUtils.js" /></script>	
+<%-- <script type="text/javascript" src="${basePath}/disinfectsystem/common/cssdUtils.js" /></script>	
 <script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseInstanceTableManager.js"></script>
@@ -980,14 +980,14 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ExpirationDateInfoTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/util.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/assemblyManagement.js"></script> 
 </body>
 <script type="text/javascript">
-	//回收报损
-    var LINKTYPE_RECYCLINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_RECYCLINGRECORD%>';
+	 //回收报损
+    var LINKTYPE_RECYCLINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_RECYCLINGRECORD%>'; 
 	//清洗报损
 	var LINKTYPE_WASHANDDISINFECTRECORD = '<%=RecyclingDamageItem.LINKTYPE_WASHANDDISINFECTRECORD%>';
 	//装配报损
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
===================================================================
diff -u -r24605 -r24630
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24605)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24630)
@@ -51,13 +51,20 @@
                         +  "<i onclick=\"closeTab(this,'" +tabId+"')\" class='close-tab'></i>"
                         +  "</a>"
                         +  "</li>";
-   
         var tabContentHtml = "<div class='tab-pane other-tab active' id='"+tabId+"' style='width:100%;height: 100%;position:fixed; top:122px;'>"
         + "<iframe src= '"+url+"'' frameborder='0' scrolling='no' style='width:100%;height:100% !important;'></iframe>"
         + "</div>";
 
         $("#myTab").append(tabHeaderHtml);
         $("#myTabContent").append(tabContentHtml);
+        
+        if ($(".content-index-toggle-off").hasClass("header-closed")) {
+        	$(".head-index").css({"height":"0"}); 
+            $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif");
+            if($("#myTabContent .tab-pane").hasClass("other-tab")) {
+            	$(".other-tab").css({"top":"35px"});
+            }
+        }
     }
 }
 //关掉导航
@@ -79,31 +86,60 @@
  
    //首页切换屏幕按钮    
     $(".content-index-toggle-off").click(function(){
-    	if($("#myTabContent .tab-pane").hasClass("other-tab")){
+    	
+    	var headHeight = $(".head-index").height();
+        if(headHeight==87){
+        	
+        	$(this).addClass("header-closed");
+        	$(".head-index").hide();
+           	$(".head-index").css({"height":"0"}); 
+            $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif");
+            if($("#myTabContent .tab-pane").hasClass("other-tab")) {
+            	$(".other-tab").css({"top":"35px"});
+            }
+        }else{
+        	$(this).removeClass("header-closed");
+            $(".head-index").show();
+         	$(".head-index").css({"height":"87px"}); 
+            $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif");
+            if ($("#myTabContent .tab-pane").hasClass("other-tab")) {
+            	$(".other-tab").css({"top":"122px"});
+            } else {
+            	$(".other-tab").css({"top":"35px"});
+            }
+        }
+    	
+    	/*if($("#myTabContent .tab-pane").hasClass("other-tab")){
     		var headHeight = $(".head-index").height();
             if(headHeight==87){
             	$(".head-index").hide();
                	$(".head-index").css({"height":"0"}); 
                 $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif");
-               	$(".other-tab").css({"top":"35px"});
+               	
+                
+                $(".other-tab").css({"top":"35px"});
             }else{
                 $(".head-index").show();
              	$(".head-index").css({"height":"87px"}); 
                 $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif");
+                
                 $(".other-tab").css({"top":"122px"});
             }
     	}else{
+    		
     		var headHeight = $(".head-index").height();
             if(headHeight==87){
             	$(".head-index").hide();
                	$(".head-index").css({"height":"0"}) 
                 $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif");
             }else{
+            	//alert("222");
                 $(".head-index").show();
                 $(".head-index").stop(true).animate({"height":"87px"},300);
                 $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif");
+                $(".other-tab").css({"top":"35px"});
             }
-    	}
+    	}*/
     	
     })
 
@@ -231,7 +267,7 @@
     
     //加载个人桌面图标
     $.ajax({
-        url:"/disinfectSystem/userController/loadDesktopMenu.mhtml",
+        url:WWWROOT+"/disinfectSystem/userController/loadDesktopMenu.mhtml",
         type: 'get',
         dataType:'JSON',
         async:false,