Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r19716 -r19992
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 19716)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 19992)
@@ -81,7 +81,7 @@
 	//设置打开表单的对象
     setOpenFormObj(tousseType, form, tousseGroups);
 	if (!isUndefinedOrNullOrEmpty(form)){
-		comboApplication(0,false,false,true,form, tousseGroups, false, '');
+		comboApplication(0,false,false,true,form, tousseGroups, false, '',false);
 	}
 }
 
@@ -577,10 +577,10 @@
 	
 	fields: [
 	{name : 'nodeId'},
-	{name : 'id'},
+	{name : 'id'},					//申请项的id
 	{name : 'tousseDefinitionID'},  //物品id
 	{name : 'name'},				//物品名称
-	{name : 'count'},
+	{name : 'count'},				//申请数量
 	{name : 'amout'},				//申请数量
 	{name : 'minUnit'},
 	{name : 'transferScale'},		//申领单位转换单位系数
@@ -1684,6 +1684,8 @@
 	}
 };
 
+//是否为干预操作
+var isInterveneAmount = false;
 /**
  * 根据返回的结果重置表单数据，并且打开对应的申请表单.
  * @param tempRecyclingApplication	申请单对象
@@ -1734,10 +1736,12 @@
 		
 		var status = recyclingApplication.status;
 		var type = recyclingApplication.type;
-		if(type == comboApplicationForm || type == recyclingCreateApplicationForm){
-			comboApplication(recyclingApplication.id,hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, '', recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding);
-		}else if(type == tousseApplicationForm || type == diposableGoodsApplicationForm || type == disinfectGoodsApplicationForm){
-			comboApplication(recyclingApplication.id,hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, '', recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding);
+		if(type == recyclingCreateApplicationForm
+				|| type == comboApplicationForm
+				|| type == tousseApplicationForm
+				|| type == diposableGoodsApplicationForm
+				|| type == disinfectGoodsApplicationForm){
+			comboApplication(recyclingApplication.id,hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, '', recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding,isInterveneAmount);
 		}
 		
 		//设置“申请单id”、“流水号”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“项目”10个属性
@@ -1779,11 +1783,18 @@
 			}
 		}
 		
-		if(recyclingApplication.editable == 'false'){//待发货
+		if(recyclingApplication.editable == 'false' || isInterveneAmount){  //不可编辑
+			departComp.setReadOnly(true);
+			top.Ext4.getCmp("settleAccountsDepart").setReadOnly(true);
+			top.Ext4.getCmp("handleDepart").setReadOnly(true);
+			top.Ext4.getCmp("remark").setReadOnly(true);
 			top.Ext4.getCmp('tempSaveBtn').disable();
 			top.Ext4.getCmp('package1').disable();
 			top.Ext4.getCmp('count1').disable();
+			top.Ext4.getCmp('urgentAmount').disable();
 			top.Ext4.getCmp('addTousseBt').disable();
+			top.Ext4.getCmp('departmentTemplate').disable();
+			isInterveneAmount = false;
 		}
 		
 		reloadGoodsComboStore();
@@ -2435,6 +2446,19 @@
     });
 }
 
+/**
+ * 干预申请数量
+ * @param id	申请单id
+ */
+function interfereApplyAmount(id, type) {
+	if (type == comboApplicationForm
+			|| type == tousseApplicationForm
+			|| type == diposableGoodsApplicationForm
+			|| type == disinfectGoodsApplicationForm){
+		isInterveneAmount = true;
+		RecyclingApplicationTableManager.getRecyclingApplicationAndVerifyEdit(id, setRecyclingApplicationForm);
+	}
+}
 
 Ext.onReady(function() {
 	Ext.QuickTips.init();
@@ -2524,6 +2548,20 @@
     	    	 return inoviceButton+returnButton+returnGoodsButton+viewReturnGoodsButton;
          	 }
 	     },
+	     {header : "干预申请数量",width : 120 * fontSizeScale,renderer: function(v,p,record){
+	    	 var data = record.data;
+	    	 var type = data.type;
+	    	 var recyclingStatus = data.recyclingStatus;
+	    	 var deliverStatus = data.deliverStatus;
+	    	 if ((type == comboApplicationForm
+	    				|| type == tousseApplicationForm
+	    				|| type == diposableGoodsApplicationForm
+	    				|| type == disinfectGoodsApplicationForm)
+	    				&& recyclingStatus != awaitRecycling
+	    				&& deliverStatus == awaitDeliver){
+	    		 return "<input type=\"button\" value=\"干预申请数量\" onclick=\"interfereApplyAmount('"+record.data.id+"','"+type+"')\">";
+	    	 }
+	     }},
 	     {header : "预回收人",width : 65 * fontSizeScale,dataIndex : 'prepareRecycleOperator',hidden : sstsConfig.hiddenRecyclingPeople},
          {header : "预回收确认人",width : 85 * fontSizeScale,dataIndex : 'prepareRecycleComfirmor',hidden : sstsConfig.hiddenPreRecyclingConfirmPeople},
          {header : "预回收时间",width : 130 * fontSizeScale,dataIndex : 'prepareRecycleDateTime',hidden : sstsConfig.hiddenPreRecyclingTime}