Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15608 -r15632
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15608)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15632)
@@ -172,11 +172,18 @@
     return -1;
 }
 
+
 /**
  * 显示各个回收人员，及每个回收人员负责的部门
+ * @param shiftType 班次类型,如果打开的窗口默认选中对应的班次类型
+ * @returns {*}
  */
-function showSelectUser(){
-	return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectUser.jsp?allowNull=false&onlyOneOrg=true&resultType=code&tabType=orgUnit&sameLevel=yes&range=all", "选择回收员", "1000", "750");
+function showSelectUser(shiftType){
+	var url = WWWROOT+"/disinfectsystem/recyclingApplication/selectUser.jsp?allowNull=false&onlyOneOrg=true&resultType=code&tabType=orgUnit&sameLevel=yes&range=all";
+	if (!isUndefinedOrNullOrEmpty(shiftType)){
+		url += "&shiftType=" + shiftType;
+	}
+	return openModalWindow(url, "选择回收员", "1000", "750");
 }
 function sumTotal(store){
 	if(store.getCount()!=0){
@@ -3155,8 +3162,21 @@
 	return ids;
 }
 
+/**
+ * 从cookie中读取班次类型
+ * @returns {*}
+ */
+function getShiftTypeCookie() {
+	var cookie = CookieManager.getCookie("shiftType");
+	if (!isUndefinedOrNullOrEmpty(cookie)){
+		return encodeURI(cookie);
+	}
+	return null;
+}
+
 function bathPrint(){
-	var selectResult = showSelectUser();
+	var shiftType = getShiftTypeCookie()
+	var selectResult = showSelectUser(shiftType);
 	if(selectResult == null && selectResult == undefined){
 		return;
 	}
@@ -3181,16 +3201,16 @@
 			if (sstsConfig.isShowNoPrintList && obj.noPrintList){
 				showResult("如下科室未填写申请单：【" + obj.noPrintList + "】","",-1);
 			}
-			var newP = top.Ext.MessageBox.show({
-				title:'请等待',
-				msg:'打印中……',
-				width:350,
-				progress:true,
-				closable:false
-			});
-
-			formTypeOfPrinted = "invoicePlan";
-			printByJsonPrintObject(obj, newP,false,0,true);
+			// var newP = top.Ext.MessageBox.show({
+			// 	title:'请等待',
+			// 	msg:'打印中……',
+			// 	width:350,
+			// 	progress:true,
+			// 	closable:false
+			// });
+            //
+			// formTypeOfPrinted = "invoicePlan";
+			// printByJsonPrintObject(obj, newP,false,0,true);
     	}
     	else{
     		showResult(obj.error);