Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r36011 -r36018
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 36011)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 36018)
@@ -561,7 +561,6 @@
         min-height:100px;
         max-height: 300px;
         background-color:white;
-        right: -128px;
         z-index: 100;
     }
     #selectDiv div {
@@ -670,11 +669,6 @@
                 <div class="add2" id="customIntoBasketDiv" onclick="openCustomIntoBasketPage();"></div>
                 <div class="addQM"><a href="javascript:void(0);" id="add-QM" onclick="addQM();" style="${recycleAddQualityMonitoring}"></a></div>
                 <div class="add2 add3" id="openPortBtn" style="display:none" onclick="connectRFIDFun();">连接FRID设备</div>
-                <div class="taskGroup">
-                    <select id="taskGroup" multiple="multiple">
-                    
-                    </select>
-                </div>
                 <div class="departmentTemplate" style="right: 365px;">
                     <label>选择模板:</label>
                     <input class="checkbox" type="text" id="departmentTemplate" onclick="showSelectDiv();" readonly="true" value="选择模板">
@@ -684,6 +678,11 @@
                         <!-- <option value ="0">全部</option> -->
                     <!-- </select> -->
                 </div>
+                <div class="taskGroup">
+                    <select id="taskGroup" multiple="multiple">
+                    
+                    </select>
+                </div>
             </div>
         </form>
         <div id="divElement"></div>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r36017 -r36018
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 36017)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 36018)
@@ -7644,7 +7644,7 @@
 	if (sstsConfig.enableRFIDTousseIdCard && !isIE()) {
 		connectRFIDFun();
 	}
-	if (sstsConfig.isShowTaskGroupOfRecyclingModule) {
+	if (sstsConfig.isShowTaskGroupOfRecyclingModule && params_recordType !== 'history') {
 		PackingTableManager.getAllTaskGroup(setTaskGroup);
 		function setTaskGroup(taskGroup) {
 			var html = '';
@@ -7654,7 +7654,8 @@
 			$('.taskGroup').show()
 			$('#taskGroup').html(html)
 			$('#taskGroup').multipleSelect({
-				"minimumCountSelected": 10,
+				minimumCountSelected: 1,
+				ellipsis: true,
 				onCheckAll: function (view) {
 					var taskGroups = $('#taskGroup').multipleSelect('getSelects');
 					$('#tousseItemTable').children().first().children().each(function (i, element) {