Index: ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js
===================================================================
diff -u -r21404 -r26620
--- ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js	(.../expressInvoiceView.js)	(revision 21404)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js	(.../expressInvoiceView.js)	(revision 26620)
@@ -1,7 +1,4 @@
 var grid;
-var INVOICE_FORM_OPEN_MODE_CLICKITEM = 'clickItem';
-var INVOICE_FORM_OPEN_MODE_SCANBARCODE = 'barcode';
-var INVOICE_FORM_OPEN_MODE_CLICKRETURNRECORD = 'clickReturnRecord';
 /**
  * 刷新列表
  * @param isSetDateValue 是否要设置开始时间和结束时间
@@ -75,107 +72,39 @@
 
 
 /**
- * 修改记录
+ * 打开某一个物品的记录
  * modifyRecord函数 触发modify函数调用，并传入当前列的值以及record.data对象
  * 页面中需要定义 modify(v,data) 函数
  */
 function callModifyFunction(){
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
-		showResult("请选择发货计划单！");
+		showResult("请选择快速发货的物品！");
 		return false;
 	}
 	if (records.length > 1) {
-		showResult("一次只能修改一个发货计划单！");
+		showResult("一次只能打开一个物品！");
 		return false;
 	}
-	var departCode = records[0].data['departCode'];
-	var depart = records[0].data['depart'];
-	openMode = INVOICE_FORM_OPEN_MODE_CLICKITEM;
+
 	selTousseDefinitionId = records[0].data['tousseDefinitionId'];
 	selDisposableGoodsId = records[0].data['disposableGoodsId'];
 	tousseName = records[0].data['tousseName'];
 	var departCodingSet = records[0].data['departCodingSet'];
-	addAndEditInvoicePlan(departCodingSet.join(';'),depart);
+	addAndEditInvoicePlan(departCodingSet.join(';'));
 }
-/**
- * 通过扫描条码打开发货计划单。条码可以是科室条码(不是科室编码)，也可以是单号
- */
-var openMode = INVOICE_FORM_OPEN_MODE_CLICKITEM;
-var invoicePlanOpening = false;
-var v_callback_yes = null;
-var v_callback_no = null;
-function globalOnKeyDownProcessor(barcode){
-	if(barcode == BARCODE_ACTION_YES){
-		if(v_callback_yes){
-			v_callback_yes();
-		}
-		return;
-	}else if(barcode == BARCODE_ACTION_NO){
-		if(v_callback_no){
-			v_callback_no();
-		}
-		return;
-	}
-	openInvoicePlanByBarcode(barcode);
-}
-function openInvoicePlanByBarcode(barcode){
-	return;
-	if(isUndefinedOrNullOrEmpty(barcode)){
-		showResult("请扫描科室条码或申请单条码");
-		return;
-	}
-	if(invoicePlanOpening){
-		showResult("申请单正在打开，请勿扫描太快!");
-		return;
-	}
-	invoicePlanOpening =  true;
-	var store = grid.getStore();
-	var departCode = store.baseParams['departCode'];
-	var applyDate = store.baseParams['applyDate'];
-	var tousseType = store.baseParams['tousseType'];
-	Ext.Ajax.request({
-		url : WWWROOT + '/disinfectSystem/invoicePlanAction!getScanResult.do',
-		params : {barcode : barcode,departCode:departCode,applyDate:applyDate,tousseType:tousseType},
-		success : function(response, options) {
-			invoicePlanOpening =  false;
-			var result = Ext.decode(response.responseText);
-			if(result){
-				if(result.success){
-					openMode = INVOICE_FORM_OPEN_MODE_SCANBARCODE;
-					addAndEditInvoicePlan(result.data.departCode,result.data.depart,result.data.invoicePlanId);
-					showResult(result.data.depart + "的发货单");
-				}else{
-					showResult(result.message);
-				}
-			}
-		},
-		failure : function(form, action) {
-			invoicePlanOpening =  false;
-			if(action.result && action.result.message){
-				showResult(action.result.message);
-			}
-		}
-	});
-}
 
 /**
  * 创建申请单下拉框
  * @returns {Ext.form.ComboBox|Ext4.form.ComboBox}
  */
 function createAppFormCombo() {
 	var appFormModel = sstsConfig.appFormModel || [
-		['全部申请单', '']
+		['通用申请单', '通用申请单']
 		,['一次性物品申请单', '一次性物品申请单']
 		,['器械包申请单', '器械包申请单']
 		,['消毒物品申请单', '消毒物品申请单']
-		,['外来器械包申请单', '外来器械包申请单']
-		,['自定义器械包申请单', '自定义器械包申请单']
-		,['借物单', '借物单']
-		,['代理灭菌单', '代理灭菌单']
-		,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单']
 		,['回收申请单', '回收申请单']
-		,['手术预约申请单', '手术预约申请单']
 	];
 	var appFormStore = new Ext.data.SimpleStore({
 		data: appFormModel,
@@ -221,9 +150,6 @@
 }
 Ext.onReady(function() {
 	Ext.QuickTips.init();
-	if(!isUndefinedOrNullOrEmpty(param_openMode)){
-		openMode = param_openMode;
-	}
 	function renderCallModifyFunction(v, p, record){
 		return "<a href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
 	}
@@ -440,7 +366,6 @@
 					refreshList();
 		        }
 			}
-				
 	});
 
 	var viewport = new Ext.Viewport({
@@ -454,8 +379,5 @@
             items:grid
         }]
     });
-	g_stopDefault = false;
-	//globalOnKeyDown(globalOnKeyDownProcessor);
-	globalOnKeyDown(openInvoicePlanByBarcode);
     window.focus();
 });
\ No newline at end of file