Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r34556 -r34635
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34556)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34635)
@@ -32,7 +32,7 @@
 	if (sstsConfig.isLoadApplyTemplateForAddRecycleRecord) {
 		$("#departmentTemplate").change(function () {
 			var requestParms = {};
-			requestParms.templateId = $('#departmentTemplate').val();
+			requestParms.templateIds = $('#departmentTemplate').val();
 			requestParms.orgUnitCoding = $("#departCode").val();
 			$.ajax({
 				type: 'get',
@@ -43,39 +43,36 @@
 					//if(dataArray.length > 0){	
 					//获取页面显示的每个包
 					var tousseItemsTable2 = $('#tousseItemTable').children().first().children();
+					var tousseItemsTable2length = tousseItemsTable2.length;
+
 					var hasCloumns = [];//存数量大于等于1的tousseDefinitionID
 					var hasCloumsObjs = [];//存数量大于等于1的对象
 
 					for (var j = 0; j < tousseItemsTable2.length; j++) {
-						var id = tousseItemsTable2[j].id || '';
-						if (id !== '') {
-							var index = id.split('tousseItemsTr')[1];
-							var tousseDefinitionID = $("#tousseDefinitionID" + index).val();
-							var recycleAmountVal = parseInt($('#recycleAmount' + index).val(), 10);
-							if (recycleAmountVal >= 1) {
-								hasCloumns.push(tousseDefinitionID);
+						var recycleAmountVal = parseInt($('#recycleAmount' + j).val(), 10);
+						if (recycleAmountVal >= 1) {
+							hasCloumns.push($('#tousseDefinitionID' + j).val());
 
-								var obj = {};
-								obj.tousseItemId = "";
-								obj.tousseName = $("#tousseName" + index).val();
-								obj.tousseDefinitionID = $("#tousseDefinitionID" + index).val();
-								obj.applicationAmount = $("#applicationAmount" + index).val();
-								obj.recycleAmount = recycleAmountVal;
-								obj.loadedAmount = $("#loadedAmount" + index).val();
-								obj.isCleanedEntirely = $("#isCleanedEntirely" + index).val();
-								obj.tousseType = $("#tousseType" + index).val();
-								obj.isThereIdentificationCard = $("#isThereIdentificationCard" + index).val();
-								obj.isApplyEntireTousse = $("#isApplyEntireTousse" + index).val();
-								obj.urgentAmount = $("#urgentAmount" + index).val();
-								obj.tousseRemark = $("#tousseRemark" + index).val();
-								obj.errorDamageQmKey = $("#hiddenErrorDamageQmKey" + index).val();
-								obj.spelling = $("#spelling" + index).val();
+							var obj = {};
+							obj.tousseItemId = "";
+							obj.tousseName = $("#tousseName" + j).val();
+							obj.tousseDefinitionID = $("#tousseDefinitionID" + j).val();
+							obj.applicationAmount = $("#applicationAmount" + j).val();
+							obj.recycleAmount = recycleAmountVal;
+							obj.loadedAmount = $("#loadedAmount" + j).val();
+							obj.isCleanedEntirely = $("#isCleanedEntirely" + j).val();
+							obj.tousseType = $("#tousseType" + j).val();
+							obj.isThereIdentificationCard = $("#isThereIdentificationCard" + j).val();
+							obj.isApplyEntireTousse = $("#isApplyEntireTousse" + j).val();
+							obj.urgentAmount = $("#urgentAmount" + j).val();
+							obj.tousseRemark = $("#tousseRemark" + j).val();
+							obj.errorDamageQmKey = $("#hiddenErrorDamageQmKey" + j).val();
+							obj.spelling = $("#spelling" + j).val();
 
-								hasCloumsObjs.push(obj);
+							hasCloumsObjs.push(obj);
 
-							}
-							$('#tousseItemsTr' + index).remove();
 						}
+						$('#tousseItemsTr' + j).remove();//把全部都删掉，后面挨个添加，先添加数量大于等于1，再添加接口返回的
 					}
 
 
@@ -89,13 +86,15 @@
 						}
 					}
 					//获取到大于等于1的数组的长度，后面每次加一下，就是新增加的包的row
+					var totalLength = hasCloumns.length - 1;
 					for (var i = 0; i < dataArray.length; i++) {
 						//没找到，就是数量大于等于1的id，在后台返回的数据中没有，这时候就需要直接取到后台数据，增加到页面上
 						if (hasCloumns.indexOf(dataArray[i].tousseDefinitionID + "") == -1) {
+							totalLength++;
 							var timeStr = new Date().getTime();
 							var errorDamageQmKey = dataArray[i].tousseDefinitionID + "_" + timeStr;
 							var toussItem = {
-								row: dataArray[i].tousseDefinitionID,
+								row: totalLength,
 								tousseItemId: '',
 								tousseName: dataArray[i].tousseName,
 								tousseDefinitionID: dataArray[i].tousseDefinitionID,
@@ -6340,7 +6339,7 @@
 									var timeStr = new Date().getTime();
 									var errorDamageQmKey = dataArray[i].tousseDefinitionID + "_" + timeStr;
 									var toussItem = {
-										row: dataArray[i].tousseDefinitionID,
+										row: i,
 										tousseItemId: '',
 										tousseName: dataArray[i].tousseName,
 										tousseDefinitionID: dataArray[i].tousseDefinitionID,
@@ -6729,149 +6728,95 @@
 function changeTemplate(obj) {
 	var checkboxs = document.getElementById('selectDiv').querySelectorAll('input.checkbox');
 	var tousseNameValue = [];
+	var requestParms = {};
+	requestParms.orgUnitCoding = $("#departCode").val();
 	if (obj.value == 0) {
 		for (var i = 0; i < checkboxs.length; i++) {
 			checkboxs[i].checked = obj.checked;
 		}
-		if (obj.checked) {
-			var requestParms = {};
-			requestParms.orgUnitCoding = $("#departCode").val();
-			$.ajax({
-				type: 'get',
-				url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadDepartmentAppTemplateForRecycle.do',
-				data: requestParms,
-				dataType: 'json',
-				success: function (dataArray) {
-					//获取页面显示的每个包
-					var tousseItemsTable2 = $('#tousseItemTable').children().first().children();
+		requestParms.templateIds = '';
+	} else {
+		var idsArr = [];
+		for (var i = 0; i < checkboxs.length; i++) {
+			if (checkboxs[i].checked && parseInt(checkboxs[i].value) !== 0) {
+				if (checkboxs[i].dataset) {
+					tousseNameValue.push(checkboxs[i].dataset.value)
+				} else if (checkboxs[i]['data-value']) {
+					tousseNameValue.push(checkboxs[i]['data-value'])
+				}
+				idsArr.push(checkboxs[i].value)
+			}
+		}
+		requestParms.templateIds = idsArr.join(',');
+	}
+	var layerShowLoad = layer.load(1, {
+		shade: [0.3, '#000'] //0.1透明度的白色背景
+	});
+	if (obj.checked || requestParms.templateIds !== '') {
+		$.ajax({
+			type: 'get',
+			url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadDepartmentAppTemplateForRecycle.do',
+			data: requestParms,
+			dataType: 'json',
+			success: function (dataArray) {
+				//获取页面显示的每个包
+				var tousseItemsTable2 = $('#tousseItemTable').children().first().children();
 
-					var hasCloumns = [];//存数量大于等于1的tousseDefinitionID
-					var hasCloumsObjs = [];//存数量大于等于1的对象
+				var hasCloumns = [];//存数量大于等于1的tousseDefinitionID
+				var hasCloumsObjs = [];//存数量大于等于1的对象
 
-					for (var j = 0; j < tousseItemsTable2.length; j++) {
-						var id = tousseItemsTable2[j].id || '';
-						if (id !== '') {
-							var index = id.split('tousseItemsTr')[1];
-							var tousseDefinitionID = $("#tousseDefinitionID" + index).val();
-							var recycleAmountVal = parseInt($('#recycleAmount' + index).val(), 10);
-							if (recycleAmountVal >= 1) {
-								hasCloumns.push(tousseDefinitionID);
+				for (var j = 0; j < tousseItemsTable2.length; j++) {
+					var id = tousseItemsTable2[j].id || '';
+					if (id !== '') {
+						var index = j;
+						var tousseDefinitionID = $("#tousseDefinitionID" + index).val();
+						var recycleAmountVal = parseInt($('#recycleAmount' + index).val(), 10);
+						if (recycleAmountVal >= 1) {
+							hasCloumns.push(tousseDefinitionID);
 
-								var obj = {};
-								obj.tousseItemId = "";
-								obj.tousseName = $("#tousseName" + index).val();
-								obj.tousseDefinitionID = $("#tousseDefinitionID" + index).val();
-								obj.applicationAmount = $("#applicationAmount" + index).val();
-								obj.recycleAmount = recycleAmountVal;
-								obj.loadedAmount = $("#loadedAmount" + index).val();
-								obj.isCleanedEntirely = $("#isCleanedEntirely" + index).val();
-								obj.tousseType = $("#tousseType" + index).val();
-								obj.isThereIdentificationCard = $("#isThereIdentificationCard" + index).val();
-								obj.isApplyEntireTousse = $("#isApplyEntireTousse" + index).val();
-								obj.urgentAmount = $("#urgentAmount" + index).val();
-								obj.tousseRemark = $("#tousseRemark" + index).val();
-								obj.errorDamageQmKey = $("#hiddenErrorDamageQmKey" + index).val();
-								obj.spelling = $("#spelling" + index).val();
+							var obj = {};
+							obj.tousseItemId = "";
+							obj.tousseName = $("#tousseName" + index).val();
+							obj.tousseDefinitionID = $("#tousseDefinitionID" + index).val();
+							obj.applicationAmount = $("#applicationAmount" + index).val();
+							obj.recycleAmount = recycleAmountVal;
+							obj.loadedAmount = $("#loadedAmount" + index).val();
+							obj.isCleanedEntirely = $("#isCleanedEntirely" + index).val();
+							obj.tousseType = $("#tousseType" + index).val();
+							obj.isThereIdentificationCard = $("#isThereIdentificationCard" + index).val();
+							obj.isApplyEntireTousse = $("#isApplyEntireTousse" + index).val();
+							obj.urgentAmount = $("#urgentAmount" + index).val();
+							obj.tousseRemark = $("#tousseRemark" + index).val();
+							obj.errorDamageQmKey = $("#hiddenErrorDamageQmKey" + index).val();
+							obj.spelling = $("#spelling" + index).val();
 
-								hasCloumsObjs.push(obj);
+							hasCloumsObjs.push(obj);
 
-							}
-							$('#tousseItemsTr' + index).remove();
 						}
+						$('#tousseItemsTr' + index).remove();
 					}
+				}
 
 
-					var addColumnArr = [];//用来增加的数据
-					if (hasCloumns.length > 0) {
-						//先获取到大于等于1的包的，循环拿到row，赋值给大于等于1的对象的row，保证这个id唯一和连续
-						for (var m = 0; m < hasCloumns.length; m++) {
-							var myObj = hasCloumsObjs[m];
-							myObj.row = m;
-							addColumnArr.push(myObj);
-						}
+				var addColumnArr = [];//用来增加的数据
+				if (hasCloumns.length > 0) {
+					//先获取到大于等于1的包的，循环拿到row，赋值给大于等于1的对象的row，保证这个id唯一和连续
+					for (var m = 0; m < hasCloumns.length; m++) {
+						var myObj = hasCloumsObjs[m];
+						myObj.row = m;
+						addColumnArr.push(myObj);
 					}
-					//获取到大于等于1的数组的长度，后面每次加一下，就是新增加的包的row
-					for (var i = 0; i < dataArray.length; i++) {
-						//没找到，就是数量大于等于1的id，在后台返回的数据中没有，这时候就需要直接取到后台数据，增加到页面上
-						if (hasCloumns.indexOf(dataArray[i].tousseDefinitionID + "") == -1) {
-							var timeStr = new Date().getTime();
-							var errorDamageQmKey = dataArray[i].tousseDefinitionID + "_" + timeStr;
-							var toussItem = {
-								row: dataArray[i].tousseDefinitionID,
-								tousseItemId: '',
-								tousseName: dataArray[i].tousseName,
-								tousseDefinitionID: dataArray[i].tousseDefinitionID,
-								applicationAmount: 0,
-								recycleAmount: 0,
-								loadedAmount: 0,
-								isCleanedEntirely: dataArray[i].isCleanedEntirely,
-								tousseType: dataArray[i].tousseType,
-								isThereIdentificationCard: dataArray[i].isThereIdentificationCard,
-								isApplyEntireTousse: dataArray[i].isApplyEntireTousse,
-								urgentAmount: 0,
-								tousseRemark: '',
-								errorDamageQmKey: errorDamageQmKey,
-								spelling: dataArray[i].spelling,
-								packed: dataArray[i].packed
-							};
-							addColumnArr.push(toussItem);
-						}
-					}
-
-					for (var i = 0; i < addColumnArr.length; i++) {
-						var addColumnObj = addColumnArr[i];
-						//统一增加的原因，是防止下次去拿数据的时候，拿到刚增加进去的数据
-						addToussItem(addColumnObj, true);
-					}
-
-					//恢复点击入筐后，回收数量和装配数量背景色的控制，因为前面删掉了全部的数据
-					if (hasCloumns.length > 0) {
-						for (var k = 0; k < hasCloumns.length; k++) {
-							setTousseItemLoadedAmountCss(k);
-						}
-					}
-
-					$('#departmentTemplate').val('全部模板');
 				}
-			})
-		} else {
-			var tousseItemsTable2 = $('#tousseItemTable').children().first().children();
-			for (var j = 0; j < tousseItemsTable2.length; j++) {
-				var id = tousseItemsTable2[j].id || '';
-				if (id !== '') {
-					var index = id.split('tousseItemsTr')[1];
-					$('#tousseItemsTr' + index).remove();
-				}
-			}
-			$('#departmentTemplate').val('选择模板');
-		}
-	} else {
-		for (var i = 0; i < checkboxs.length; i++) {
-			if (checkboxs[i].checked) {
-				if (checkboxs[i].dataset) {
-					tousseNameValue.push(checkboxs[i].dataset.value)
-				} else if (checkboxs[i]['data-value']) {
-					tousseNameValue.push(checkboxs[i]['data-value'])
-				}
-			}
-		}
-		if (obj.checked) {
-			var requestParms = {};
-			requestParms.templateId = obj.value;
-			requestParms.orgUnitCoding = $("#departCode").val();
-			$.ajax({
-				type: 'get',
-				url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadDepartmentAppTemplateForRecycle.do',
-				data: requestParms,
-				dataType: 'json',
-				success: function (dataArray) {
-					//获取页面显示的每个包
-					var addColumnArr = [];//用来增加的数据
-					for (var i = 0; i < dataArray.length; i++) {
+				//获取到大于等于1的数组的长度，后面每次加一下，就是新增加的包的row
+				var totalLength = hasCloumns.length - 1;
+				for (var i = 0; i < dataArray.length; i++) {
+					//没找到，就是数量大于等于1的id，在后台返回的数据中没有，这时候就需要直接取到后台数据，增加到页面上
+					if (hasCloumns.indexOf(dataArray[i].tousseDefinitionID + "") == -1) {
+						totalLength++;
 						var timeStr = new Date().getTime();
 						var errorDamageQmKey = dataArray[i].tousseDefinitionID + "_" + timeStr;
 						var toussItem = {
-							row: dataArray[i].tousseDefinitionID,
+							row: totalLength,
 							tousseItemId: '',
 							tousseName: dataArray[i].tousseName,
 							tousseDefinitionID: dataArray[i].tousseDefinitionID,
@@ -6890,44 +6835,43 @@
 						};
 						addColumnArr.push(toussItem);
 					}
-					for (var i = 0; i < addColumnArr.length; i++) {
-						var addColumnObj = addColumnArr[i];
-						//统一增加的原因，是防止下次去拿数据的时候，拿到刚增加进去的数据
-						addToussItem(addColumnObj, true);
-					}
-					$('#departmentTemplate').val(tousseNameValue.join(','));
 				}
-			})
-		} else {
-			var requestParms = {};
-			requestParms.templateId = obj.value;
-			requestParms.orgUnitCoding = $("#departCode").val();
-			$.ajax({
-				type: 'get',
-				url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadDepartmentAppTemplateForRecycle.do',
-				data: requestParms,
-				dataType: 'json',
-				success: function (dataArray) {
-					//获取页面显示的每个包
-					var tousseItemsTable2 = $('#tousseItemTable').children().first().children();
-					for (var j = 0; j < tousseItemsTable2.length; j++) {
-						var id = tousseItemsTable2[j].id || '';
-						if (id !== '') {
-							var index = id.split('tousseItemsTr')[1];
-							var tousseDefinitionID = $("#tousseDefinitionID" + index).val();
-							if (dataArray.length > 0) {
-								for (var k = 0; k < dataArray.length; k++) {
-									if (tousseDefinitionID == dataArray[k].tousseDefinitionID) {
-										$('#tousseItemsTr' + index).remove();
-									}
-								}
-							}
-							$('#departmentTemplate').val(tousseNameValue.join(','));
-						}
+
+				for (var i = 0; i < addColumnArr.length; i++) {
+					var addColumnObj = addColumnArr[i];
+					//统一增加的原因，是防止下次去拿数据的时候，拿到刚增加进去的数据
+					addToussItem(addColumnObj, true);
+				}
+
+				//恢复点击入筐后，回收数量和装配数量背景色的控制，因为前面删掉了全部的数据
+				if (hasCloumns.length > 0) {
+					for (var k = 0; k < hasCloumns.length; k++) {
+						setTousseItemLoadedAmountCss(k);
 					}
 				}
-			})
+				
+				if(requestParms.templateIds == ''){
+					$('#departmentTemplate').val('全部模板');
+				}else {
+					$('#departmentTemplate').val(tousseNameValue.join(','));
+				}
+
+				layer.close(layerShowLoad);
+				selectDivMousein();
+			}
+		})
+	} else {
+		var tousseItemsTable2 = $('#tousseItemTable').children().first().children();
+		for (var j = 0; j < tousseItemsTable2.length; j++) {
+			var id = tousseItemsTable2[j].id || '';
+			if (id !== '') {
+				var index = id.split('tousseItemsTr')[1];
+				$('#tousseItemsTr' + index).remove();
+			}
 		}
+		$('#departmentTemplate').val('选择模板');
+		layer.close(layerShowLoad);
+		selectDivMousein();
 	}
 }