Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r26527 -r26670
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 26527)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 26670)
@@ -1020,7 +1020,8 @@
 		minChars : 0,
 		valueField : 'name',
 		displayField : 'displayName',
-		width : configWinWidth/4,//200,
+	//	width : configWinWidth/4,//200,
+		width : 130,
 		matchFieldWidth: false,
 		listConfig: {width : 600},
 		store : comboGoodsStore,
@@ -1083,6 +1084,64 @@
 		}
     });
     
+	
+	top.Ext4.define('urgentAmountNumber', {
+		extend: 'top.Ext4.form.field.Number',
+		xtype: 'urgent-amount',
+		id : 'urgentAmount',
+		name : 'urgentAmount',
+		style : 'text-align: left',
+		hidden: !sstsConfig.enableUrgentFunction,
+		width :60,
+		maxValue: 9999,
+		minValue: 1,
+		allowNegative : false,
+		allowDecimals : false,
+		listeners : {
+			specialkey : function(field, ee) {
+				if (ee.getKey() == Ext.EventObject.ENTER) {
+					if(Ext.isEmpty(field.getValue())||field.getValue()<=0){
+						showResult("加急数量必须大于0");
+						field.focus();
+						return false;
+					}
+					addRecyclingApplicationItem();
+				}
+			},
+			blur:function(thiz, e, eOpts){
+				if(thiz.getValue() != null){//设置加急级别默认值
+					var urgentLevelData = top.Ext4.getCmp('urgentLevel').getStore().data.items;
+					for(var i = 0;i<urgentLevelData.length;i++){
+						var urgentDefaultValue = urgentLevelData[i].data.urgentDefaultValue;
+						if(urgentDefaultValue == "是"){
+							var urgentLevelVal = urgentLevelData[i].data.urgentLevel;
+							top.Ext4.getCmp("urgentLevel").setRawValue(urgentLevelVal);
+							top.Ext4.getCmp("urgentLevel").setValue(urgentLevelData[i].data.id);
+							break;
+						}						 
+					}
+				}				
+			}
+		}
+	})
+	
+	top.Ext4.define('urgentLevelValue', {
+		extend: 'top.Ext4.form.field.ComboBox',
+		xtype: 'urgent-level',
+		width : 60,
+		id : 'urgentLevel',
+		name : 'urgentLevel',
+		store : urgentLevelStore,
+		valueField : 'id',
+		displayField : 'urgentLevel',
+		hidden: !sstsConfig.enableUrgentFunction,
+		minChars : 0,
+		forceSelection : true,
+		lazyInit : true,
+		editable:true,
+		triggerAction : 'all',
+		typeAhead : false
+	})
     //申领物品的两个top.Ext4.tree.Panel
     var goodsTreeGrids = [];
     //右边的top.Ext4.tree.Panel的Tbar
@@ -1101,13 +1160,33 @@
 				text: "物品名称:"
 			},{
 				xtype : 'goods-combo'
+			},{
+				text:"加急数量:",
+				hidden: !sstsConfig.enableUrgentFunction
+			},{
+				xtype : 'urgent-amount'
+			},{
+				text:"加急级别:",
+				hidden: !sstsConfig.enableUrgentFunction
+			},{
+				xtype : 'urgent-level'
 			}]
 		});
 	} else {
 		diposableTreeGridTbar.push({
 			text: "物品名称:"
 		},{
 			xtype : 'goods-combo'
+		},{
+			text:"加急数量:",
+			hidden: !sstsConfig.enableUrgentFunction
+		},{
+			xtype : 'urgent-amount'
+		},{
+			text:"加急级别:",
+			hidden: !sstsConfig.enableUrgentFunction
+		},{
+			xtype : 'urgent-level'
 		});
 	}
     
@@ -1132,7 +1211,7 @@
 				}
 			}
 		}
-	},{
+	} ,/*{
 		text:"加急数量:",
 		hidden: !sstsConfig.enableUrgentFunction
 	},{
@@ -1141,7 +1220,7 @@
 		name : 'urgentAmount',
 		style : 'text-align: left',
 		hidden: !sstsConfig.enableUrgentFunction,
-		width : 60,
+		width :50,
 		maxValue: 9999,
 		minValue: 1,
 		allowNegative : false,
@@ -1172,13 +1251,12 @@
 				}				
 			}
 		}
-	},{
+	}, *//* {
 		text:"加急级别:",
 		hidden: !sstsConfig.enableUrgentFunction
 	},{
-		columnWidth :.5,
 		xtype : 'combo',
-		width : 70,
+		width : 60,
 		id : 'urgentLevel',
 		name : 'urgentLevel',
 		store : urgentLevelStore,
@@ -1191,7 +1269,7 @@
 		editable:true,
 		triggerAction : 'all',
 		typeAhead : false
-	},{
+	}, */{
 		xtype:'button',
 		id : 'addTousseBt',
 		text:"添加",
@@ -1214,7 +1292,8 @@
 		triggerAction : 'all',
 		name : "departmentTemplate",
 		id : "departmentTemplate",
-		width : configWinWidth/6-10,
+		width : 130,
+		//width : configWinWidth/6-10,
 		anchor : '95%',
 		editable:false,
 		listeners : {
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r26507 -r26670
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 26507)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 26670)
@@ -1,6 +1,7 @@
 var entityName = "申请";
 var configWinHeight = top.screen.height > 1000 ? 650 : 500;
-var configWinWidth = top.screen.width > 1280 ? 1024 : 760;
+//var configWinWidth = top.screen.width > 1280 ? 1024 : 760;
+var configWinWidth = 1024;
 //是否开启根据科室加载模板
 var isOpenLoadTemplateByUnit = sstsConfig.isOpenLoadTemplateByUnit;
 //是否隐藏住院号(只有config.js的配置为false时才不隐藏,否则都隐藏)