Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29726 -r29730
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29726)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29730)
@@ -227,7 +227,7 @@
 			var id = tbs.rows[i].getAttribute('id');
 			var index = id.split('tousseItemsTr')[1];
 			var loadedAmount = parseInt($('#loadedAmount'+index).val());
-			if(tousseName == $('#showTousseName'+index).val() && loadedAmount == 0){
+			if(tousseName == $('#showTousseName'+index).text() && loadedAmount == 0){
 				arr3.push(tbs.rows[i]);
 				continue;
 			}
@@ -910,7 +910,7 @@
    			}
    		});
    	});
-   	var depart = $('#depart').val();
+   	var depart = $('#depart').text();
    	var recyclingTime = $('#recyclingTime').val();
    	var applicationAmount = $('#applicationAmount'+row).val();
    	var description = "ID=" + params_appId + ",科室[" + depart + "]的申请单在" + recyclingTime + "回收时删除[" + tousseName + "]" + applicationAmount + "个";
@@ -1648,7 +1648,7 @@
  */
 function checkSelectDepartBeforeAddTousse(){
 	if(sstsConfig.isLoadApplyTemplateForAddRecycleRecord == true){
-		var departName = document.getElementById('depart').value;
+		var departName = document.getElementById('depart').innerText;
 		var departCode = document.getElementById('departCode').value;
 		if(isUndefinedOrNullOrEmpty(departCode) || isUndefinedOrNullOrEmpty(departName)){
 			alertDiv("请选择科室");
@@ -1878,7 +1878,7 @@
 							if(exist){
 								alertDiv(barcode+",已入筐!");
 							}else{
-								var orgUnitName = $('#depart').val();
+								var orgUnitName = $('#depart').text();
 								var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
 							}							
 						}else{
@@ -1908,16 +1908,16 @@
 							};
 							addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
 							addErrorDamageRemark(ti,tmpRow);
-							var orgUnitName = $('#depart').val();
+							var orgUnitName = $('#depart').text();
 							addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle,true,ti.id,msg.isFixedBarcode);
 							//未补充的丢失报损
 							loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
 						}
 					}else{  //扫描标识牌实例条码
 						barcode = msg.idCardInstance.barcode;
-						var departValue = $('#depart').attr('value');
+						var departValue = $('#depart').text();
                     	if(departValue == ''){
-                            $('#depart').val(msg.tousseInstance.locationForDisplay)
+                            $('#depart').text(msg.tousseInstance.locationForDisplay)
                             $('#departCode').val(msg.tousseInstance.location)
 						}
                     	var tousseDepart = isUndefinedOrNullOrEmpty(msg.tousseInstance.locationForDisplay2)?msg.tousseInstance.locationForDisplay:msg.tousseInstance.locationForDisplay2;
@@ -1947,7 +1947,7 @@
 										}
 										shareDepartsMap.set(msg.idCardInstance.tousseName,msg.shareDeparts);
 									}else {
-										if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').attr('value') != tousseDepart && msg.tousseInstance.status != '已废弃'){
+										if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').text() != tousseDepart && msg.tousseInstance.status != '已废弃'){
 											alertDiv('该器械包不属于该科室。');
 											return;
 										}
@@ -1957,7 +1957,7 @@
 										})
 									}
 								}else {
-									if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').attr('value') != tousseDepart && msg.tousseInstance.status != '已废弃'){
+									if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').text() != tousseDepart && msg.tousseInstance.status != '已废弃'){
 										alertDiv('该器械包不属��该科室。');
 										return;
 									}
@@ -1966,7 +1966,7 @@
 										tousseDepart:tousseDepart
 									})
 								}
-                            	 var orgUnitName = $('#depart').val();
+                            	 var orgUnitName = $('#depart').text();
                             	 var addSuccess = false;
                             	 var idCardClassifyBasket = msg.idCardClassifyBasket;
                             	 if(idCardClassifyBasket){
@@ -2146,7 +2146,7 @@
     var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
 	var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
 	var errorRemark = $('#hiddenErrorRemark'+row).val();
-	var depart = $('#depart').val();
+	var depart = $('#depart').text();
 
   var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
 
@@ -2192,7 +2192,7 @@
 	var actualHeight = window.screen.availHeight;
 	var offsetTop = 100;
 	var heightExtra = 10;
-    var depart = $('#depart').val();
+    var depart = $('#depart').text();
     var departCode = $('#departCode').val();
     var damageRemark = $('#hiddenDamageRemark' + row).val();
     if(resolution == '1980'){
@@ -2948,7 +2948,7 @@
 				}else {
 					var key = -1;
 					$('#tousseItemTable').children().first().children().each(function(i,element){
-						var showTousseName = $('#showTousseName'+i).val();
+						var showTousseName = $('#showTousseName'+i).text();
 						if(showTousseName == tousseName){
 							key = i;
 						}
@@ -3144,7 +3144,7 @@
 		var basketName = basketsObj.basketName;
         var tousseName = $('#tousseName'+row).val();
         var tousseDefinitionID = $('#tousseDefinitionID'+row).val();
-        var showTousseName = $('#showTousseName'+row).val();
+		var showTousseName = $('#showTousseName'+row).text();
         var tousseType = $('#tousseType'+row).val();
         var isCleanedEntirely = $('#isCleanedEntirely'+row).val();
 		var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
@@ -3224,7 +3224,7 @@
 				return;
 			}
         }
-        var orgUnitName =  $('#depart').val();
+        var orgUnitName =  $('#depart').text();
         if(amount == 0){
             alertDiv('没有可以放入篮筐的器械包。');
         }else{
@@ -3298,8 +3298,6 @@
     }else{
         alertDiv('请先扫描篮筐条码。');
     }
-	$('#depart').focus();
-	
     
     return inputSuccess;
 }
@@ -3585,7 +3583,17 @@
         		 fontSize = "16px";
         	 }
         	 urgentAmountElement = '<div id="urgentAmountDiv'+row+'" class="divStyle" style="' + bgMsg + 'font-size:'+fontSize+';" onclick="openSetUrgentAmountPage('+row+');">'+msg+'</div>';
-         }
+		 }
+		var textWidth = textSize("26px","宋体",showTousseName).width || 0;
+		var lineHeight = '';
+		var fontSize = '';
+		if(textWidth > 335){
+			lineHeight = 31;
+			fontSize = 23;
+		}else {
+			lineHeight = 62;
+			fontSize = 26;
+		}
          var errorRemark =toussItem.errorRemark; //"注备注备注";
          var damageRemark = toussItem.damageRemark;//"备注备注";
          errorRemark = isUndefinedOrNullOrEmpty(errorRemark)?'':errorRemark;
@@ -3615,7 +3623,7 @@
                    '<input type="hidden" id="spelling'+row+'" name="spelling'+row+'" value="'+spelling+'"/>'+
                    '<div class="tousseDetailTable"><table id="tousseDetailTable'+row+'" border="0" cellpadding="0" cellspacing="0"><tr><td>' +
                    urgentAmountElement + '</td><td>' +
-                   '<input id="showTousseName'+row+'" name="showTousseName'+row+'" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" onclick="amendDisinfectionTousse('+row+');" value="'+showTousseName+'"/></td>'+
+                   '<button id="showTousseName'+row+'" name="showTousseName'+row+'" type="button" readonly="readonly"  onfocus="this.blur();" class="input-a" onclick="amendDisinfectionTousse('+row+');" style="overflow: hidden;line-height:'+lineHeight+'px;padding-left: 5px;text-align: left;font-size:'+fontSize+'px">'+showTousseName+'</button></td>'+
                    '<td><input id="applicationAmount'+row+'" name="applicationAmount'+row+'" type="text" onclick="setTousseRemark(' + row + ')" readonly="readonly" class="input-b" value="'+applicationAmount+'"/></td>'+
                    addButton +
                    '<td><input id="recycleAmount'+row+'" name="recycleAmount'+row+'" type="text" readonly="readonly" ' + onclickFun + ' onkeyup="validateNumber(this);" class="input-b" value="'+recycleAmount+'"/></td>'+
@@ -4003,7 +4011,7 @@
 	var isThereTousseItems = false;
     var isAllTousseInTheBasket = true;
     var urgentAmountError = false;
-    if($('#depart').val()== ''){
+    if($('#depart').text()== ''){
     	alertDiv('请先扫描科室条码。');
     	return false;
     }
@@ -4489,7 +4497,7 @@
 	var recyclingUser = document.getElementById('recyclingUser').value;
 	var departmentSender = document.getElementById('departmentSender').value;
 	var operator = document.getElementById('operator').value;
-	var depart = document.getElementById('depart').value;
+	var depart = document.getElementById('depart').innerText;
 	var recyclingTime = document.getElementById('recyclingTime').value || '';
 	var recyclingUserDefault = true;
 	if(sstsConfig.hasOwnProperty('recyclingUserDefault') && !sstsConfig.recyclingUserDefault){
@@ -4676,7 +4684,7 @@
 	var recyclingUser = document.getElementById('recyclingUser').value;
 	var departmentSender = document.getElementById('departmentSender').value;
 	var operator = document.getElementById('operator').value;
-	var depart = document.getElementById('depart').value;
+	var depart = document.getElementById('depart').innerText;
 	var recyclingTime = document.getElementById('recyclingTime').value;
 	var recyclingUserDefault = true;
 	if(sstsConfig.hasOwnProperty('recyclingUserDefault') && !sstsConfig.recyclingUserDefault){
@@ -4798,7 +4806,7 @@
 	var tousseNames;
 	var isCleanedEntirelys= false;//是否存在整包清洗
 	var allInstrumentBasket =true;//所有的器械包是否入筐，true是，false 否
-    if($('#depart').val()== ''){
+    if($('#depart').text()== ''){
         alertDiv('请先扫描科室条码。');
         return false;
     }
@@ -5318,7 +5326,7 @@
 	        	}
 	        }
 	        basketGroupBarcodeArray.sort();
-		    var orgUnitName = $('#depart').val();
+		    var orgUnitName = $('#depart').text();
 			for(var i = 0;i < materials.length;i++){
 				var item = materials[i];
 				var basketItem = {
@@ -5672,7 +5680,7 @@
 							var flag = false;
 							for (var m in departmentSenderHiddendData) {
 							    if (departmentSenderHiddendData[m].orgUnitNameCode == departCode) {
-									document.getElementById('depart').value = departmentSenderHiddendData[m].orgUnitName;
+									document.getElementById('depart').innerText = departmentSenderHiddendData[m].orgUnitName;
 									document.getElementById('departCode').value = departmentSenderHiddendData[m].orgUnitNameCode;
 									flag = true;
 									break;
@@ -5682,12 +5690,12 @@
 							if(!flag){
 								//清空科室
 								alertDiv('科室自送人与申请科室不一致!');	
-								document.getElementById('depart').value = "";
+								document.getElementById('depart').innerText = "";
 								document.getElementById('departCode').value = "";
 							}
 							
 						}else{							
-							document.getElementById('depart').value = departName;
+							document.getElementById('depart').innerText = departName;
 							document.getElementById('departCode').value = departCode;
 						}	
 						
@@ -5733,7 +5741,7 @@
     		}
         }
     }else{
-    	document.getElementById('depart').value = departName;
+    	document.getElementById('depart').innerText = departName;
         document.getElementById('departCode').value = departCode;
     }
 }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r29671 -r29730
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 29671)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 29730)
@@ -512,7 +512,7 @@
             <div class="name"><span style="margin-right:10px;font-size: 23px">回收人</span><input id="recyclingUser" name="recyclingUser" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);" style="margin-left: -2px;"/></div>
             <div class="operator"><span style="margin-right:10px;font-size: 23px">清点人</span><input id="operator" name="operator" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);"/></div>
             <div class="recyclingTime"><span style="margin-right:10px;font-size: 23px">回收时间</span><input id="recyclingTime" name="recyclingTime" type="text" readonly="readonly" class="input"/></div>
-            <div class="depart"><span style="margin-right:20px;font-size: 23px">科</span><span style="margin-right:10px;font-size: 23px">室</span><input id="depart" name="depart" type="text" class="input" readonly="readonly" onclick='openSelectDepart();' /></div>
+            <div class="depart"><span style="margin-right:20px;font-size: 23px">科</span><span style="margin-right:10px;font-size: 23px">室</span><button id="depart" name="depart" type="button" class="input" onclick='openSelectDepart();' style="width: 271px;height: 62px;line-height: 25px;text-align: left;overflow: hidden;"></button></div>
             <div class="appType"><span style="margin-right:20px;font-size: 23px">类</span><span style="margin-right:13px;font-size: 23px">型</span><input id="appType" name="appType" type="text" readonly="readonly" class="input"/></div>
             <div class="applyTime"><span style="margin-right:10px;font-size: 23px">申请时间</span><input id="applyTime" name="applyTime" type="text" readonly="readonly" class="input"/></div>
             <c:if test="${param.resolution != 1980}">