Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r29020 -r29046
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29020)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29046)
@@ -91,11 +91,19 @@
 				store.proxy.extraParams.type = type;
 			},
 			load : function(store, records, eOpts){
-				if(top.Ext4.getCmp('depart').getValue() != ""){
-					top.Ext4.getCmp("departmentTemplate").setValue(records[0].data.id);//设置为全部模板
-					top.Ext4.getCmp("departmentTemplate").setRawValue(records[0].data.title);
+				if(top.Ext4.getCmp('depart').getValue() != "" && !sstsConfig.notLoadApplyTemplateWhenCreateDeptApplication){
+					if(store.data.items.length <= 1){
+						top.Ext4.getCmp("departmentTemplate").setValue(records[0].data.id);//设置为全部模板
+						top.Ext4.getCmp("departmentTemplate").setRawValue(records[0].data.title);
+					}else {
+						var items = store.data.items;
+						var ids = [];
+						for(var i=0;i<items.length;i++){
+							ids[i] = items[i].data.id;
+						}
+						top.Ext4.getCmp("departmentTemplate").setValue(ids);//设置为全部模板
+					}
 				}
-				
 			}
 		} 
 	});
@@ -1450,9 +1458,9 @@
 					top.Ext4.getCmp('unit').setValue(unit);
 					top.Ext4.getCmp('packageSpec').setValue(packageSpec);
 					var middlePackageUnit = record.data.middlePackageUnit;
-					var unitInfo = '  <font color=blue>单位:' + (isUndefinedOrNullOrEmpty(middlePackageUnit) ? unit : middlePackageUnit) + '</font>  ';
+					var unitInfo = '  <font color=blue>单位：' + (isUndefinedOrNullOrEmpty(middlePackageUnit) ? unit : middlePackageUnit) + '</font>  ';
 					if (packageSpec != null && packageSpec != ''){
-						unitInfo += '<font color=red>包装规格:' + packageSpec + '</font>';
+						unitInfo += '<font color=red>包装规格：' + packageSpec + '</font>';
 					}
 					top.Ext4.getCmp('unitInfoDisplayField').setValue(unitInfo);
 				}
@@ -1580,9 +1588,7 @@
 			xtype : 'urgent-level'
 		});
 	}
-    
-	
-
+	var selectValues = [];
     diposableTreeGridTbar.push({
 		text:"数量:"
 	},{
@@ -1671,32 +1677,114 @@
 			}
 		}
 	},{
-		text : '选择模板:',
-		//hidden:((type == comboApplicationForm || type == tousseApplicationForm || type == reservateionApplicationForm) ? true : (!isFirstSupplyRoomUser))
-		hidden:isShowAddTemplateBtn
+		hidden:true,
+		id:'departmentTemplateValue',
+		name:'departmentTemplateValue'
 	},{
-		xtype : 'combo',
+		xtype : 'combobox',
 		valueField : 'id',
 		displayField : 'title',
 		store : departmentTemplateTitleStore,
-		forceSelection : true,
+		emptyText : '选择模板',//下拉框初始显示字段
 	//	hidden:((type == comboApplicationForm || type == tousseApplicationForm || type == reservateionApplicationForm) ? true:(!isFirstSupplyRoomUser)),
 	    hidden:isShowAddTemplateBtn,
 		triggerAction : 'all',
 		name : "departmentTemplate",
 		id : "departmentTemplate",
-		width : 130,
-		//width : configWinWidth/6-10,
+		width : 230,
 		anchor : '95%',
-		//editable:false,
+		multiSelect : true,//设置是否为下拉多选
 		listeners : {
-			select : function(combo, records, index) {
+			select: function(combo, record, eOpts ){
+				combo.setValue(selectValues);
 				var par = {
-					templateId:records[0].data.id,
+					templateIds:selectValues.join(','),
 					reloadTemplate:top.Ext4.getCmp("departCoding").getValue()
 				}
 				loadProduction(par, true);
 			}
+		},
+		listConfig : {
+			itemTpl : Ext4.create('Ext4.XTemplate','<input type=checkbox>{[values.title]}'),
+			onItemSelect : function(record) {
+				var node = this.getNode(record);
+				if (node) {
+					Ext4.fly(node).addCls(this.selectedItemCls);
+					var checkboxs = node.getElementsByTagName("input");
+					if (checkboxs != null)
+						var checkbox = checkboxs[0];
+					checkbox.checked = true;
+				}
+			},
+			listeners : {
+				itemclick : function(view, record, item, index, e, eOpts) {
+					var AllCheckBox = {
+						id:"",
+						title:"全部模板"
+					};
+					var nodes = this.getNodes(record.store.data.items);
+					var check_boxs = [];
+					var checkAll_box = null;
+					Ext4.each(nodes, function(item) {
+						var check_box = item.getElementsByTagName("input");
+						check_boxs.push(check_box[0]);
+						if(item.innerText == AllCheckBox.title){
+							checkAll_box = check_box[0];
+						}
+					});
+					var isSelected = view.isSelected(item);
+					var isClickAll = false;
+					if(record.data.id == AllCheckBox.id){
+						isClickAll = true;
+					}
+					if(isClickAll && !isSelected){//点击全选框&&全选框没有选中
+						Ext4.each(check_boxs, function(item) {
+							item.checked = true;
+						});
+						var newValues = [];
+						Ext4.each(record.store.data.items, function(item) {
+							if(item.data.id !== 0 && item.data.id !== ''){
+								newValues.push(item.data.id);
+							}
+						});
+						selectValues = newValues;
+					}else if(isClickAll){//点击全选框&&全选框没有选中
+						Ext4.each(check_boxs, function(item) {
+							item.checked = false;
+						});
+						selectValues = [];
+					}else {//点击其它选择框
+						var dex = selectValues.indexOf(record.data.id);
+						if(dex >= 0){//检查全选框是否被选中-是
+							selectValues.splice(dex,1);
+							checkAll_box.checked = false;
+						}else{//否
+							if(!isSelected){
+								selectValues.push(record.data.id);
+							}else{
+								var cancel_dex = selectValues.indexOf(record.data.id);
+								if(cancel_dex >= 0){
+									selectValues.splice(cancel_dex,1);
+								}
+							}
+						}
+						var checkboxs = item.getElementsByTagName("input");
+						if (checkboxs != null) {
+							var checkbox = checkboxs[0];
+							if (!isSelected) {
+								checkbox.checked = true;
+							} else {
+								checkbox.checked = false;
+							}
+						}
+					}
+					if((selectValues.length + 1) == record.store.data.items.length && selectValues.indexOf(0) == -1){//检查是否是除全选框外的其它选择宽都被选中
+						selectValues.push(0);
+					}else if((selectValues.length - 1) == 0 && selectValues.indexOf(0) >= 0){
+						selectValues.splice(selectValues.indexOf(0),1)
+					}
+				}
+			}
 		}
 	},{
         xtype: 'displayfield',
@@ -1918,7 +2006,6 @@
 										}else{
 											departmentTemplateTitleStore.load();
 										}
-										
 										var paramete = {
 											handleDepartCoding: top.Ext4.getCmp("handleDepartCoding").getValue(),
 											reloadTemplate: departCode