Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r40373 -r40413
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 40373)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 40413)
@@ -31,15 +31,45 @@
 var sessionIDCardBarcodes = new newMap();
 
 //ZSYY-385：新增可配置扩展字段(显示序号，当前待回收物品)
-var currentlyToBeRecycledBox = false;
-var serialNumberBox = false;
-if(sstsConfig.expandFieldsOfRecycle){
-	if(sstsConfig.expandFieldsOfRecycle.indexOf('currentlyToBeRecycled') >= 0){
-		currentlyToBeRecycledBox = true;
+//BJDXZLYY-64：统一用新配置项
+var currentlyToBeRecycledHidden = true;
+var serialNumberHidden = true;
+var tousseRemarkHidden = true;
+var lastRecyclingTimeHidden = true;
+var packageTypeSplitHidden = true;
+var pendinSsecondaryRecyclingHidden = true;
+
+var tousseRemarkName = '备注';
+var lastRecyclingTimeName = '回收时间';
+var packageTypeSplitName = '外来器械拆分小包';
+var pendinSsecondaryRecyclingName = '待二次回收';
+
+var expandFieldsConfigOfRecycling = sstsConfig.expandFieldsConfigOfRecycling;
+if(expandFieldsConfigOfRecycling.length > 0){
+	for(var i=0;i<expandFieldsConfigOfRecycling.length;i++){
+		if(expandFieldsConfigOfRecycling[i].fieldName == 'currentlyToBeRecycled'){
+			currentlyToBeRecycledHidden = false;
+		}
+		if(expandFieldsConfigOfRecycling[i].fieldName == 'serialNumber'){
+			serialNumberHidden = false;
+		}
+		if(expandFieldsConfigOfRecycling[i].fieldName == 'tousseRemark'){
+			tousseRemarkHidden = false;
+			tousseRemarkName = expandFieldsConfigOfRecycling[i].displayText;
+		}
+		if(expandFieldsConfigOfRecycling[i].fieldName == 'lastRecyclingTime'){
+			lastRecyclingTimeHidden = false;
+			lastRecyclingTimeName = expandFieldsConfigOfRecycling[i].displayText;
+		}
+		if(expandFieldsConfigOfRecycling[i].fieldName == 'packageTypeSplit'){
+			packageTypeSplitHidden = false;
+			packageTypeSplitName = expandFieldsConfigOfRecycling[i].displayText;
+		}
+		if(expandFieldsConfigOfRecycling[i].fieldName == 'pendinSsecondaryRecycling'){
+			pendinSsecondaryRecyclingHidden = false;
+			pendinSsecondaryRecyclingName = expandFieldsConfigOfRecycling[i].displayText;
+		}
 	}
-	if(sstsConfig.expandFieldsOfRecycle.indexOf('serialNumber') >= 0){
-		serialNumberBox = true;
-	}
 }
 //SZSDSRMYY-195：新增扩展字段配置
 function setListTab(tab){
@@ -59,6 +89,8 @@
 				html += '<td>'+recyclingDateDetails[i].recyclingDate+'</td>';
 				html += '<td>'+tousseName+'</td>';
 				html += '<td>'+recyclingDateDetails[i].amount+'</td>';
+				html += '<td>'+recyclingDateDetails[i].recyclingUser+'</td>';
+				html += '<td>'+recyclingDateDetails[i].operator+'</td>';
 				html += '</tr>';
 			}
 			$("#recycleTimeListTbody").html(html)
@@ -822,15 +854,6 @@
 
 //SZSDSRMYY-195:显示备注信息
 function showIDCardRemarks(remark, tousseRemarkObj, row){
-	var expandFieldsConfigOfRecycling = sstsConfig.expandFieldsConfigOfRecycling;
-	var tousseRemarkHidden = true;
-	if(expandFieldsConfigOfRecycling.length > 0){
-		for(var i=0;i<expandFieldsConfigOfRecycling.length;i++){
-			if(expandFieldsConfigOfRecycling[i].fieldName == 'tousseRemark'){
-				tousseRemarkHidden = false
-			}
-		}
-	}
 	if(tousseRemarkHidden){
 		return;
 	}
@@ -2868,29 +2891,16 @@
 	$("#recycleTimeList").dialog({
 		resizable: false,
 		height: 530,
-		width: 800,
+		width: 1000,
 		title: '回收时间列表',
 		modal: true,
 		open: function () {
 			$('#listRow').val(row);
 			$("#recycleTimeListBox").show()
-			var lastRecyclingTimeName = '';
-			var tousseRemarkName = '';
-			var expandFieldsConfigOfRecycling = sstsConfig.expandFieldsConfigOfRecycling;
-			if(expandFieldsConfigOfRecycling.length > 0){
-				for(var i=0;i<expandFieldsConfigOfRecycling.length;i++){
-					if(expandFieldsConfigOfRecycling[i].fieldName == 'lastRecyclingTime'){
-						lastRecyclingTimeName = expandFieldsConfigOfRecycling[i].displayText;
-					}
-					if(expandFieldsConfigOfRecycling[i].fieldName == 'tousseRemark'){
-						tousseRemarkName = expandFieldsConfigOfRecycling[i].displayText;
-					}
-				}
-			}
 
-			if(lastRecyclingTimeName !== ''){
+			if(!lastRecyclingTimeHidden){
 				setListTab(0)
-			}else if(tousseRemarkName !== ''){
+			}else if(!tousseRemarkHidden){
 				setListTab(1)
 			}
 		},
@@ -4510,7 +4520,7 @@
 
 //ZSYY-385：更新序号
 function updateTousseIndex(){
-	if(serialNumberBox || currentlyToBeRecycledBox){
+	if(!serialNumberHidden || !currentlyToBeRecycledHidden){
 		var sumRecycleAmount = 0;
 		var tousseIndexArr = [];
 		$('#tousseItemTable').children().first().children().each(function (row, element) {
@@ -4520,11 +4530,11 @@
 			}
 		})
 
-		if(currentlyToBeRecycledBox){
+		if(!currentlyToBeRecycledHidden){
 			$('#currentlyToBeRecycled').html(sumRecycleAmount);
 		}
 
-		if(serialNumberBox){
+		if(!serialNumberHidden){
 			for(var i=0;i<tousseIndexArr.length;i++){
 				$('#index' + tousseIndexArr[i]).html((i+1));
 			}
@@ -4715,29 +4725,12 @@
 			var arr = [row];
 			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="' + bgMsg + 'font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(\'' + arr.join(',') + '\',' + packed + ');">' + msg + '</div>';
 		}
-		var lastRecyclingTimeName = '';
-		var tousseRemarkName = '';
-		var packageTypeSplitName = '';
-		var expandFieldsConfigOfRecycling = sstsConfig.expandFieldsConfigOfRecycling || [];
-		if(expandFieldsConfigOfRecycling.length > 0){
-			for(var i=0;i<expandFieldsConfigOfRecycling.length;i++){
-				if(expandFieldsConfigOfRecycling[i].fieldName == 'lastRecyclingTime'){
-					lastRecyclingTimeName = expandFieldsConfigOfRecycling[i].displayText;
-				}
-				if(expandFieldsConfigOfRecycling[i].fieldName == 'tousseRemark'){
-					tousseRemarkName = expandFieldsConfigOfRecycling[i].displayText;
-				}
-				if(expandFieldsConfigOfRecycling[i].fieldName == 'packageTypeSplit'){
-					packageTypeSplitName = expandFieldsConfigOfRecycling[i].displayText;
-				}
-			}
-		}
 
-		if(lastRecyclingTimeName == ''){
+		if(!lastRecyclingTimeHidden){
 			document.getElementById('listTab0').style.display = 'none';
 		}
 
-		if(tousseRemarkName == ''){
+		if(!tousseRemarkHidden){
 			document.getElementById('listTab1').style.display = 'none';
 		}
 
@@ -4762,7 +4755,7 @@
 		var trStr = '';
 		trStr += '<tr id="tousseItemsTr' + row + '" data-taskGroup="' + taskGroup + '">';
 		trStr += '<td align="right">';
-		if(serialNumberBox){
+		if(!serialNumberHidden){
 			trStr += '<span class="tousseIndex" id="index' + row + '"></span>';
 		}
 		var splitToussesString = '';
@@ -4850,13 +4843,13 @@
 				deleteTousseItemArray.splice(i, 1);
 			}
 		}
-		if(lastRecyclingTimeName == '' || lastRecyclingDate == ''){
+		if(!lastRecyclingTimeHidden || lastRecyclingDate == ''){
 			$('#recycleTimeTr'+row).hide();
 		}
-		if(tousseRemarkName == '' || tousseRemark == ''){
+		if(!tousseRemarkHidden || tousseRemark == ''){
 			$('#tousseRemarkTr'+row).hide();
 		}
-		if((lastRecyclingTimeName !== '' && lastRecyclingDate !== '') && (tousseRemarkName !== '' && tousseRemark !== '')){
+		if((!lastRecyclingTimeHidden && lastRecyclingDate !== '') && (!tousseRemarkHidden && tousseRemark !== '')){
 			$('#recycleTime'+row + ' .btn').hide();
 		}
 		if(!sstsConfig.enablePackageTypeSplitPartialSecondaryRecyclingAndReturn || !sstsConfig.allowForeignToussePartiallyPacking || !sstsConfig.enableForeignToussePartRecycle){
@@ -5735,15 +5728,6 @@
 		});
 		//部分入筐提示
 		if (isPartIntheBasket) {
-			var packageTypeSplitName = '';
-			var expandFieldsConfigOfRecycling = sstsConfig.expandFieldsConfigOfRecycling || [];
-			if(expandFieldsConfigOfRecycling.length > 0){
-				for(var i=0;i<expandFieldsConfigOfRecycling.length;i++){
-					if(expandFieldsConfigOfRecycling[i].fieldName == 'packageTypeSplit'){
-						packageTypeSplitName = expandFieldsConfigOfRecycling[i].displayText;
-					}
-				}
-			}
 			if (sstsConfig.enablePartRecycle == true) {
 				if(tousseTypeName !== "外来器械包"){
 					dialogConfirm("还有部分器械包未装入篮筐，是否继续保存？", function () {
@@ -5756,7 +5740,7 @@
 						}
 					});
 				}else {
-					if(packageTypeSplitName !== '' && splitToussesStrings !== ''){
+					if(!packageTypeSplitHidden && splitToussesStrings !== ''){
 						var tousseIntoBasketInfo = getTousseIntoBasketInfo();
 						for(var i=0;i<tousseIntoBasketInfo.length;i++){
 							var tousseInstanceBarcode = tousseIntoBasketInfo[i].tousseInstanceBarcode;
@@ -5780,7 +5764,7 @@
 					}
 				}
 			} else if (tousseTypeisForeignTousseDefinition == true && (recyclingStatus == '部分接收' || recyclingStatus == '待接收' || recyclingStatus == '待回收' || recyclingStatus == '已接收')) {
-				if(packageTypeSplitName !== '' && splitToussesStrings !== ''){
+				if(!packageTypeSplitHidden && splitToussesStrings !== ''){
 					var tousseIntoBasketInfo = getTousseIntoBasketInfo();
 					for(var i=0;i<tousseIntoBasketInfo.length;i++){
 						var tousseInstanceBarcode = tousseIntoBasketInfo[i].tousseInstanceBarcode;
@@ -5811,7 +5795,7 @@
 					});
 				}
 			} else {
-				if(packageTypeSplitName !== '' && splitToussesStrings !== ''){
+				if(!packageTypeSplitHidden && splitToussesStrings !== ''){
 					var tousseIntoBasketInfo = getTousseIntoBasketInfo();
 					for(var i=0;i<tousseIntoBasketInfo.length;i++){
 						var tousseInstanceBarcode = tousseIntoBasketInfo[i].tousseInstanceBarcode;
@@ -8492,7 +8476,7 @@
 		}, 1000);
 	}
 
-	if(currentlyToBeRecycledBox){
+	if(!currentlyToBeRecycledHidden){
 		$('.currentlyToBeRecycled').show();
 	}
 })