Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24392 -r24399
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24392)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24399)
@@ -2,11 +2,13 @@
 var tableTopL ="";
 var recoredTableH ="";
 var assemblyTaskLeftTopTableCon = []; //left table top
+var result2 ='';
 //var assemblyTaskLeftFootTableCon = []; //left table foot
 //var footTable = []; //left table foot
 var addVal = "";
 var getIndexPar ="";
-
+//页面一加载就获取焦点
+$("#searchBarcode").focus();
 //增加table的paddiing
 function addPaddingBottom(pbClass){
   $("."+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
@@ -20,22 +22,24 @@
 	  if(selections == null || selections.length == 0){
 		  return ;
 	  }
+	 
 	  for(var tousseIndex=0;tousseIndex<selections.length;++tousseIndex){
 		  var tousseNode = selections[tousseIndex];
+		  
 			 var pTousseName = tousseNode.tousseName;
 			 var haveIDCard = tousseNode.haveIDCard;
 			 // 跳过有标识牌的器械包
-			 if(haveIDCard){
+			/* if(haveIDCard){
 				 continue;
-			 }
+			 }*/
 			 //器械包装配数量
 			 var packingAmount = tousseNode.amount;
 			 if(packingAmount <= 0){
 			    	continue;
 			 }
 			 
         
-        var taskIdArray = [];
+		var taskIdArray = [];
         var scannedBasketBarcodes = [];
         var basketBarcode;
         var tousseName;
@@ -48,14 +52,17 @@
         var department;
         var departmentArray = [];
         var status;
+        var urgentAmount;
         //遍历器械包下的每条装配任务数据
         var children = tousseNode.children;
         for(var taskIndex=0;taskIndex<children.length;++taskIndex){
       	  var task = children[taskIndex];
+      	  //console.log("task"+task);
 				tousseName = task.tousseName;
 				status = task.status;
 				basketBarcode = task.basketBarcode;
-            	var taskId = task。taskId;
+				urgentAmount = task.urgentAmount;
+            	var taskId = task.taskId;
             	
             	var amount = task.amount;
             	if(amount > packingAmount){
@@ -76,12 +83,12 @@
             	department = task.department;
             	departmentArray.push(department);
             	
-            	if(status == '待确认'){
+            	/*if(status == '待确认'){
 					showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
 					return;
-				}
+				}*/
             	
-            	if(!allowPackingWhenUnSupplementMaterial){
+            /*	if(!allowPackingWhenUnSupplementMaterial){
             		if(errors != null && errors.length > 0){
                 		showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
                        return;
@@ -90,153 +97,174 @@
                    	showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
                        return;
                    }
-            	}
+            	}*/
+            	taskIdArray.push(taskId);
+              /* if(packingAmount > 0){
                
-               if(packingAmount > 0){
-               	taskIdArray.push(taskId);
                	scannedBasketBarcodes.push(basketBarcode);
                	packingAmount -= amount;
                	
-               }
+               }*/
+            	
 			 };
-			 if(packingAmount > 0){
+			/* if(packingAmount > 0){
 				 showResult(tousseName + "需装配数量已超过该器械包所有装配任务数量之和." , null , sstsConfig.messagePauseTimeOnPackingPage);
 				 delBasketItems.splice(dl,1);//删除
 				 return;
-			 }
-			 alert(taskIdArray.join(";"))
+			 }*/
+			
 			 //请求后台装配方法
+			 taskIdArray = taskIdArray.join(";");
 //			 packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
-		}
-	  
-	/*var taskPar = $("#dataPar_index"+0).data('taskPar');
-	
-	var taskChild = $("#"+getIndexPar+"datachild_index"+0).data('taskChild');
-	var taskArray =[];
-	  console.log("taskPar............",taskPar);
-	  console.log("taskChild............",taskChild);
-	  var footParTrLen = $("#assemblyTaskleftFootTable>tbody>tr");
-	  //console.log("footLen"+footLen);
-	  for(var i=0;i < footParTrLen.length; i++){
-		  var taskId = $(footParTrLen[i]).find("td:eq(2)").children("span").attr("id");
-		  taskArray.push(taskId);
-		  console.log("111",taskArray);
-		  
-		  var footParCheck = $(footParTrLen[i]).find("td:eq(1)").children();
-		  for(var j=0;j<footParCheck.length;j++){
-			 // console.log($(footParCheck[j]).attr('checked'));
-			  if($(footParCheck[j]).is(':checked')){
-				  
-				  return;
-			  }else{
-				  alert(false);
-			  }
-		  }
-		  if($footParTd.is(':checked')){
-			  alert("选择");
-		  }
-		  console.log("footParTd.............",footParTd);
-	  }*/
-	
-	/*var taskIdsArray = [];
-	// //装配数量
-	var packAmount = 1;
-	$("#assemblyTaskleftFootTable tbody tr").each(function(index, ele){
-		var tempInput = $(this).find("td:eq(1) input[name='btSelectItem']");
-		if($(tempInput).is(':checked')) {
-			var datajson = unescape($(tempInput).parent().next().find("span").attr("datajson"));
-			$(JSON.parse(datajson).children).each(function(childIndex, childEle){
-				taskIdsArray.push(childEle.taskId);
-			});
-			packAmount += parseInt($(tempInput).parent().next().next().find("input").val());
-		}
-	});
-	var taskIds = taskIdsArray.join(";");
-	//检查人
-	var inspector = $("#inspectorInput").val();
-	// 检查人工号
-	var inspectorCode = $("#inspectorCodeInput").val();
-	
-	//配包人
-	var operator = $("#operator").val();
-	var operatorCode = $("#operatorCode").val();
-	//审核人
-	var reviewer = $("#reviewer").val();
-	var reviewerCode = $("#reviewerCode").val();
-	//灭菌人
-	var sterileUserName = $("#sterileUserName").val();
-	var sterileUserCode = $("#sterileUserCode").val();
-	//包装人
-	var wrapper = $("#wrapper").val();
-	var wrapperCode = $("#wrapperCode").val();
-	
-	//包装类型
-	var packageType = $("#packageType option:selected").val();
-	//灭菌程序
-	var sterilingType = $("#sterilingType option:selected").val();
-	//灭菌日期
-	var sterileDate = $("#determineDate").val();
-	
-	//任务组
-	
-	//外来器械拆包信息  splitPackage
-	//篮筐条码
-	//扫描的篮筐条码 scannedBasketBarcodes
-	//标识牌实例id  idCardInstanceID
-	//标识牌定义id   idCardDefinitionId
-	//炉次 
-	var frequency =$("#frequency").val();
-	console.log("taskGroup..."+taskGroup);
-	//确认继续 confirmContinue
-	//urgentAmount 加急数量
-	var urgentAmount = 0;
-	//tousseWeight 器械包重量
-	//remark 备注 
-	var remark = $("#remark").val();
-	
-	var params = {
-			"taskIds":taskIds,
-	    	"inspector":inspector,
-	    	"inspectorCode":inspectorCode,
-	    	"operator":operator,
-	    	"operatorCode":operatorCode,
-	    	"reviewer":reviewer,
-	    	"reviewerCode":reviewerCode,
-	    	"sterileUserName":sterileUserName,
-	    	"sterileUserCode":sterileUserCode,
-	    	"wrapper":wrapper,
-	    	"wrapperCode":wrapperCode,
-	    	"packageType":packageType,
-	    	"sterilingType":sterilingType,
-	    	"sterileDate": new Date(sterileDate).getTime(),
-	    	"packAmount":packAmount,
-	    	"taskGroup":taskGroup,
-	    	"frequency":frequency,
-	    	"urgentAmount":urgentAmount,
-	    	"remark":remark
-		};
-	//alert("remark"+remark);
-	return;
-	console.log(JSON.stringify(params));
-	$.ajax({
-	    url:"/disinfectSystem/packingController/packingTousse.mhtml",
-	    dataType: "json", 
-	    type: "POST", 
-	    data:{
-	    	"packingParams": JSON.stringify(params)
-	    },
+			    //var taskIds = taskIdsArray.join(";");
+				//检查人
+				var inspector = $("#inspectorInput").val();
+				// 检查人工号
+				var inspectorCode = $("#inspectorCodeInput").val();
+				
+				//配包人
+				var operator = $("#operator").val();
+				var operatorCode = $("#operatorCode").val();
+				//审核人
+				var reviewer = $("#reviewer").val();
+				var reviewerCode = $("#reviewerCode").val();
+				//灭菌人
+				var sterileUserName = $("#sterileUserName").val();
+				var sterileUserCode = $("#sterileUserCode").val();
+				//包装人
+				var wrapper = $("#wrapper").val();
+				var wrapperCode = $("#wrapperCode").val();
+				
+				//包装类型
+				var packageType = $("#packageType option:selected").val();
+				//灭菌程序
+				var sterilingType = $("#sterilingType option:selected").val();
+				//灭菌日期
+				var sterileDate = $("#determineDate").val();
+				
+				//外来器械拆包信息  splitPackage
+				//篮筐条码
+				//扫描的篮筐条码 scannedBasketBarcodes
+				//标识牌实例id  idCardInstanceID
+				//标识牌定义id   idCardDefinitionId
+				
+				//炉次 
+				var frequency =$("#frequency").val();
+				console.log("taskGroup..."+taskGroup);
+				//确认继续 confirmContinue
+				//tousseWeight 器械包重量
+				
+				//remark 备注 
+				var remark = $("#remark").val();
+				//装配数量
+				var inputId = '#input_'+tousseNode.tousseID;
+				var inputAmount = $(inputId).val();
+				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": new Date(sterileDate).getTime(),
+				    	"packAmount":inputAmount,
+				    	"taskGroup":taskGroup,
+				    	"frequency":frequency,
+				    	"urgentAmount":urgentAmount,
+				    	"remark":remark
+					};
+				$.ajax({
+				    url:"/disinfectSystem/packingController/packingTousse.mhtml",
+				    dataType: "json",
+				    async:false,
+				    type: "POST", 
+				    data:{
+				    	"packingParams": JSON.stringify(params)
+				    },
+				    success:function(result){
+				    	//console.log("result...",result);
+				    	//$("#item_table").bootstrapTable('refresh', opt);
+				    	if(result.success == true){
+				    		reloadPackingTasks();
+				    		//alert("!!");
+				    		//刷新
+				    		//console.log("chengg....",result.message);
+				    		alert(result.message);
+				    		/*if($("#assemblyTaskleftFootTable").bootstrapTable("refresh"))
+				    		{
+				    			console.log("已经刷新");
+				    		}*/
+				    	   // $("#assemblyTaskleftFootTable").bootstrapTable('refresh', {url:"/disinfectSystem/packingController/getPackingTaskList.mhtml"});
+				    		
+				    	}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);
+				     }
+				    	
+				 }
+				});
+	  }
+});
+
+//补充丢弃器械和报损按钮的数字
+$.ajax({  
+	    url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml",
+	   // url:"/disinfectSystem/packing/getErrorAndDamageCount.mhtml",
+	    type: "get", 
+	    async:true,
 	    success:function(result){
-	    	console.log("1111111111111111"+JSON.stringify(result));
+	    	
 	    	if(result.success == true){
-	    		
+	    		/*$("#addLose b").text(result.errorCount);
+		    	$("#addBreakage b").text(result.damageCount);*/
 	    	}else{
-	    		// alert(result.message);
+	    		//alert(result.message);
 	    	}
 	    	
 	    }
-	});*/
+	  /*  error:function(msg){
+	    	console.log(msg.message);
+	    }*/
 });
-
+Mock.mock(
+	      'http://shenheren', 
+	      {
+	    	  "success": true,
+	    	  "name":"张三"
+	      }
+);
+//审核人条码
+$("#reviewerCode").keydown(function(e){
+//var reviewer = $("#reviewer").val();
+    if (e.keyCode == 13) {
+    	$.ajax({
+    		url:"http://shenheren",
+    		 dataType: "json", 
+		     async: false, 
+		     data: {}, 
+		     type: "GET", 
+		     success:function(result){
+		    	 console.log("...",result.name);
+		    	 $("#reviewer").val(result.name);
+		    	 $("#reviewerCode").val("");
+		    	 $("#wrapperCode").focus();
+		    	 //console.log(".....",$("#reviewer").parent().parent().next().children().children());
+		     }
+    	})
+    }
+})
 $(function(){
   //补充丢失器械按钮弹框
   $("#addLose").click(function(){
@@ -413,9 +441,7 @@
         }
   ]; 
    /*在篮筐中输入条码*/
-  
-  
-  $("#searchBarcode").keydown(function(e){
+    $("#searchBarcode").keydown(function(e){
       if (e.keyCode == 13) {
          //console.log(11);
     	  var searchBarcodeVal = $("#searchBarcode").val();
@@ -551,7 +577,6 @@
             sortOrder: "desc",//排序方式
             sortName: 'appTime',//排序字段
             showColumns: true,//删选列按钮
-            showRefresh: false,//刷新按钮
             silent: true,  //刷新事件必须设置  
             formatLoadingMessage: function () {  
               return "请稍等，正在加载中...";  
@@ -665,7 +690,18 @@
           field : 'amount',
           align : 'center',
           sortable:true,
-          switchable: false
+          switchable: false,
+          formatter:function(v,record){
+        	  var inputId = 'input_'+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 : '加急数量',
@@ -720,74 +756,51 @@
            sortable:true
         }
   ]; 
+  function reloadPackingTasks(){
+	  $("#assemblyTaskleftFootTable").bootstrapTable("destroy");
+	  loadPackingTasks();
+  }
+  window.reloadPackingTasks = reloadPackingTasks;
+  function loadPackingTasks(){
+	  $.ajax({
+		    url: "/disinfectSystem/packingController/getPackingTaskList.mhtml",
+		    dataType: "json", 
+		    async: true, 
+		    data: {"taskGroup":taskGroup}, 
+		    type: "post", 
+		    beforeSend: function() {
+		        //console.log('start');
+		    },
+		    success: function(result) {
+		    	 result2 = result;
+		    	if(result.success == true){
+		    		var mapParent = {};
+		    	      for(var i=0;i<result.data.length;i++){
+		    	        var list = result.data[i];
+		    	      }
+		    		  var assemblyTaskleftFootTable = "<table id='assemblyTaskleftFootTable' class='table table-striped table-bordered table-hover cleanPadding' data-height='" + resultHFoot + "' data-toggle data-toggle='table'></table>";                  
+		    		  $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable);
+		    		  assemblyTaskLeftFootload(result.data,assemblyTaskleftFootTable_columns);
+		    		  $("#assemblyTaskleftFootTable").bootstrapTable("refresh");
+		    		  $("#assemblyTaskleftFootTable").css({"min-width": "1100px"});
+		    		  $("#assemblyTaskleftFootTable th,#assemblyTaskleftFootTable td").css({
+		    		    "padding-bottom":"2px",
+		    		    "padding-top":"2px"
+		    		  })
+		    		  $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"56px"});
+		    		  subText("assemblyTaskleftFootTable");  
+		    		  
+		    	}else{
+		    		alert("错误");
+		    	}
+		    }
+		  });
+  }
   
-  $.ajax({
-    url: "/disinfectSystem/packingController/getPackingTaskList.mhtml",
-    dataType: "json", 
-    async: true, 
-    data: {"taskGroup":taskGroup}, 
-    type: "post", 
-    beforeSend: function() {
-        //console.log('start');
-    },
-    success: function(result) {
-    	if(result.success == true){
-    		var mapParent = {};
-    	      for(var i=0;i<result.data.length;i++){
-    	        var list = result.data[i];
-    	        var tempListJSON = escape(JSON.stringify(list));
-    	        list.amount = "<div class='input-group spinner'>"
-	                             + "<input type='text' class='form-control showNum_"+list.tousseID+"' value='" + list.amount + "' tousseName='"+list.tousseName+"'  max-value='" + list.amount +"'/>"
-	                             + "<div class='input-group-btn-vertical'>"
-	                             + "<button class='btn btn-default ' type='button' onclick='addNum(this)'><i class='fa fa-caret-up'></i></button>"
-	                             + "<button class='btn btn-default ' type='button' onclick='reduceNum(this)'><i class='fa fa-caret-down'></i></button>"
-	                             + "</div>"
-	                             + "</div>"; 
-    	        //list.tousseName = "<span datajson=" + tempListJSON + ">"+list.tousseName+"</span>";
-//    	        console.log("tempListJSON", tempListJSON);
-    	        
-    	        //list.rowIndex = i;
-    	       /* var taskIds = "";
-    	        for(var j = 0; j <list.children.length; j++){
-    	        	taskIds += list.children[j].taskId + ";";
-    	        }*/
-    	        
-    	        
-    	        //list.tousseName = "<span id='dataPar_index"+i+"'>"+list.tousseName+"</span>";
-    	        //console.log()
-    	        //mapParent['dataPar_index'+i] =  list;
-    	        //console.log("tasj..", map['data_index'+i]);
-    	        //list.tousseName = "<span taskid='"+taskIds+"' >"+list.tousseName+"</span>";
-    	      }
-    		  var assemblyTaskleftFootTable = "<table id='assemblyTaskleftFootTable' class='table table-striped table-bordered table-hover cleanPadding' data-height='" + resultHFoot + "' data-toggle data-toggle='table'></table>";                  
-    		  $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable);
-    		  assemblyTaskLeftFootload(result.data,assemblyTaskleftFootTable_columns);
-    		  $("#assemblyTaskleftFootTable").css({"min-width": "1100px"});
-    		  $("#assemblyTaskleftFootTable th,#assemblyTaskleftFootTable td").css({
-    		    "padding-bottom":"2px",
-    		    "padding-top":"2px"
-    		  })
-    		  $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"56px"});
-    		  //assemblyTaskLeftFootTableCon = req;
-    		  subText("assemblyTaskleftFootTable");   
-    		/*  for(var p in mapParent){
-    			  if(p.indexOf('dataPar_index') != -1){
-    				  $("#"+p).data("taskPar",mapParent[p]);
-    			  }
-//    			  console.log("map[p]=",map[p]);
-//    			 console.log("pp...",$("#"+p).data('task'));
-    		 }*/
-    		  
-    	}else{
-    		alert("错误");
-    	}
-    }
-  });
+  loadPackingTasks();
   
   
-  
   function assemblyTaskLeftFootload(tableDate,columns){
-	 // console.log("tableDate"+tableDate);
     $("#assemblyTaskleftFootTable").bootstrapTable(
         {   
             data:tableDate,
@@ -807,9 +820,9 @@
             sortOrder: "desc",//排序方式
             sortName: 'appTime',//排序字段
             showColumns: true,//删选列按钮
-            showRefresh: false,//刷新按钮
-            silent: true,  //刷新事件必须设置  
-            clickToSelect: true,
+            showRefresh: true,//刷新按钮
+          /*  silent: true,  //刷新事件必须设置  
+*/            clickToSelect: true,
             formatLoadingMessage: function () {  
               return "请稍等，正在加载中...";  
             },  
@@ -823,6 +836,15 @@
                     keyword : params.search
                 };
             },
+            onRefresh: function(params){
+            	if(params && params.type =='click'){
+            		add();
+            	}
+            },
+//           onRefresh:function(params){
+//            	//console.log("刷新。。",params);
+//            	$("#assemblyTaskleftFootTable").bootstrapTable("refresh");
+//            }, 
             idField : "id",
             columns : columns,//表头
             onExpandRow: function (index, row, $detail) {
@@ -888,23 +910,13 @@
                      +"<td width='"+($(thW[10]).width()+2)+"'>"+childrens[i].status+"</td>"
                      +"<td width='"+($(thW[11]).width()+1)+"'>"+childrens[i].dateTime+"</td>"
                     +"</tr>"
-                    
-                    //list.tousseName = "<span id='data_index"+i+"' >"+list.tousseName+"</span>";
-                   // mapChildren[getIndexPar+"datachild_index"+i] =  childrens[i];
             	}
                 table +="</table>";
                 $detail.html(table);
                 subText("assemblyTaskleftFootTableSub");
-                
-              /*  for(var p in mapChildren){
-      			  if(p.indexOf('datachild_index') != -1){
-      				  $("#"+p).data("taskChild",mapChildren[p]);
-      				 // console.log("pp222,...."+$("#"+p));
-      			  }
-      		 }*/
             },
-            onCheckSome:function(row){
-            	console.log("check:"+row);
+            onCheckSome:function(rows){
+            	console.log("check:"+rows);
             }
             /*onClickRow:function(row){
             	leftFootTableTrClickEvent(0, row);
@@ -914,7 +926,13 @@
         });
   }
   
- 
+ function add(){
+		/*$("#assemblyTaskleftFootTable").bootstrapTable("refresh");*/
+	 
+	 reloadPackingTasks();
+//	 assemblyTaskLeftFootload(result2.data,assemblyTaskleftFootTable_columns);
+	// $("#assemblyTaskleftFootTable").bootstrapTable("refresh");
+ }
   /*left foot table end*/
   //var tabH = documentHeight-39-122;
 
@@ -935,29 +953,8 @@
   })
  $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
   
-  //补充丢弃器械和报损按钮的数字
-  $.ajax({  
-	    url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml",
-	    type: "get", 
-	    async:false,
-	    success:function(result){
-	    	if(result.success == true){
-	    		//console.log("1111111111111111"+result);
-	    	}else{
-	    		//alert(result.message);
-	    	}
-	    	
-	    }
-  });
-  
-  //点击装配并打印
-  
-  
- 
-  
-  
-  
-    //补充器械模态框
+
+  //补充器械模态框
   var allModelication_columns=[ 
         {
           title : '序号',
@@ -1555,71 +1552,6 @@
     });
 }
 
-//left top table点击加号判断子菜单
-function addChildrenDataTop(that) {
-  var trId = $(that).attr("parentDataId");//父id
-  //console.log("sourceObjTrId:" + trId);
-  var allAppList = assemblyTaskLeftTopTableCon.list;
-  var subData = [];
-  //console.log(subData.length);
-  //比较相同的id拿到子菜单的数据
-  for (var i = 0; i < allAppList.length; i++) {
-    if (trId == allAppList[i].trId) {
-      subData = allAppList[i].subList;
-      break;
-    }
-  }
-
-  //如果没有子菜单，就不执行，也就是不出现减号及子菜单
-  if (subData == undefined || subData.length <= 0) {
-    subText("assemblyTaskleftTopTable");//调用截取
-    return;
-  };
-
-  var hasGlyphicon = $(that).hasClass("glyphicon-plus");
-  
-  if (hasGlyphicon) {//是加号的话，展示子菜单
-     
-    for (var j=0;j<subData.length;j++){
-      var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteTop()'/>"; 
-      //存一下父id，和自己的子id
-      var myTr = "<tr class='sub_" + trId + "' thisTrId='" + subData[j].trId + "'>"
-              + "<td style='text-align: center;' subparentId='"+ trId + "'></td>"
-              + "<td style='text-align: center;' subparentId='"+ trId + "'></td>"
-              + "<td style='text-align: center;' subparentId='"+ trId + "'>"+subData[j].itemName+"</td>"
-              + "<td style='text-align: center;' subparentId='"+ trId + "'>"+subData[j].itemNumber+"</td>"
-              + "<td style='text-align: center;' subparentId='"+ trId + "'>"+subData[j].urgentNum+"</td>"
-              + "<td style='text-align: center;' subparentId='"+ trId + "'>"+subData[j].urgentGrade+"</td>"
-              + "<td style='text-align: center;' subparentId='"+ trId + "'>"+subData[j].cleaningBasket+"</td>";
-
-
-            if(subData[j].isLosed == 1){
-              operateHtml += "<button type='button' class='btn btn-success cor' onclick='addBreakageTableBtnTop()'>报损</button>";
-            }
-            if(subData[j].isDamage == 1){
-              operateHtml += "<button type='button' class='btn btn-success cor' onclick='addLoseTableBtnTop()'>丢失</button>";
-            } 
-
-            myTr += "<td style='text-align: center;'>" + operateHtml + "</td>"
-              + "<td style='text-align: center;'>"+subData[j].applyDepartment+"</td>"
-              + "<td style='text-align: center;'><span class='assemblymanaged-date'>"+subData[j].recyTime+"</span></td>"
-              + "<td style='text-align: center;'>"+subData[j].substatus+"</td>"
-              + "<td style='text-align: center;'><span class='assemblymanaged-date'>"+subData[j].recyTime+"</span></td>"
-              + "</tr>";
-            $(that).parent().parent().after(myTr);
-            $(that).removeClass("glyphicon-plus").addClass("glyphicon-minus");
-    }
-
-    subText("assemblyTaskleftTopTable");//调用截取
-  } else {
-      $(that).parent().parent().nextAll(".sub_" + trId).remove();
-      $(that).removeClass("glyphicon-minus").addClass("glyphicon-plus");
-  }
-  $("#assemblyTaskLeftTopTable").bootstrapTable('resetView');//自适应宽度
-  //topTableRowClickEvent();
-}
-
-
 //left  top  table 删除按钮
 function confirmDeleteTop(){
   $('.deleteMsgModel').modal('show');
@@ -1675,7 +1607,7 @@
 　　todayHighlight: 1,
 　　startView: 2,//Number, String. 默认值：0, 'hour'，日期时间选择器所能够提供的最精确的时间选择视图。
 　　minView: 2,  
-　　clearBtn:true,//清除按钮
+　　//clearBtn:true,//清除按钮
 　　forceParse: 0,
     pickerPosition:direction
 　});
@@ -1737,8 +1669,15 @@
     success: function(req) {
       allBagName=req;
     }
-  });
-  selectPull("instrumentSetSelect",allBagName.list);//器械包名称
+  });*/
+	var allBagName = [{"id|1-100": 1, 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: '大器械骨科包' }]
+  selectPull("instrumentSetSelect",allBagName);//器械包名称
   function selectPull(selId,allData){
     $("#"+selId).select2({
       data:allData,
@@ -1751,17 +1690,17 @@
 
   }
   //科室
-  Mock.mock(
+  /*Mock.mock(
       'http://mockjsdepartmentame', 
       {
         'totalCount': 60,
           'list|10':[
             {"id|1-100": 1, text: '骨科1' }
          ]
       }
-  );
+  );*/
   $("#departmentsSelect").select2({
-    ajax: {
+	  /* ajax: {
       url: "http://mockjsdepartmentame",
       contentType:'application/json;charset=utf-8',
       dataType: 'json',
@@ -1784,7 +1723,7 @@
               };
           },
           cache: true
-      },
+      },*/
     language: "zh-CN",
     placeholder:'关键词搜素',
     allowClear:true,
@@ -1793,7 +1732,7 @@
   })
 
   //报损科室
-  Mock.mock(
+   /*Mock.mock(
       'http://mockjsdeparent', 
       {
         'totalCount': 60,
@@ -1802,9 +1741,9 @@
             {"id|1-100": 1, text: '心理科' }
          ]
       }
-  );
+  );*/
  $("#breakageDeparent").select2({
-    ajax: {
+	 /*ajax: {
       url: "http://mockjsdeparent",
       contentType:'application/json;charset=utf-8',
       dataType: 'json',
@@ -1827,15 +1766,15 @@
               };
           },
           cache: true
-      },
+      },*/
     language: "zh-CN",
     placeholder:'关键词搜素',
     allowClear:true,
     minimumInputLength: 1,
     maximumSelectionLength:1
   })
   //报损环节
-  Mock.mock(
+ /* Mock.mock(
       'http://mockjslink', 
       {
         'totalCount': 60,
@@ -1929,9 +1868,9 @@
             {"id|1-100": 1, text: '器械包' }
          ]
       }
-  );
+  );*/
   $("#materialsName").select2({
-      ajax: {
+  /*    ajax: {
         url: "http://mockjsmaterialsName",
         contentType:'application/json;charset=utf-8',
         dataType: 'json',
@@ -1954,26 +1893,20 @@
                 };
             },
             cache: true
-        },
+        },*/
       language: "zh-CN",
       placeholder:'关键词搜素',
       allowClear:true,
       minimumInputLength: 1,
       maximumSelectionLength:1
-  })*/
+  })
 })
 //截取left foot table 文字
 function subText(subId){
-  //var leftFootTrs = $("#assemblyTaskleftFootTableWrapp table tr");
-  //var leftFootTrs = $("#"+subId).find("tr");
   var leftFootTrs = $("#" + subId + " tbody tr");
   if (subId == "assemblyTaskleftTopTable") {
     leftFootTrs = $("#assemblyTaskLeftTopTable tbody tr");
   }
-  // console.log($("#assemblyTaskLeftTopTableWrapp .fixed-table-body #assemblyTaskLeftTopTable tbody tr").length);
-  //console.log($("#assemblyTaskLeftTopTable tbody tr").length);
-  //console.log("trs:", leftFootTrs.length);
-  
   for (var i = 0;i < leftFootTrs.length; i++) {
     var leftFootTds = $(leftFootTrs[i]).find("td");
     //console.log("trtrt"+leftFootTds);
@@ -2313,7 +2246,7 @@
 }
 setInterval(function(){
 	$(".panel-tips").hide();
-},3000);
+},9000);
 
 function reduceNum(that){
  addVal = parseInt($(that).parent().siblings("input").val())-1;