Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r31264 -r33679
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 31264)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 33679)
@@ -143,6 +143,7 @@
 		store.baseParams['sterilingMethods'] = selectedSterilingMethods;
 		store.baseParams['appFormType'] = selectedAppFormType;
 		store.baseParams['tousseGroupIds'] = tousseGroupIds;
+		store.baseParams['invoiceType'] = invoiceType;
 		//刷新列表界面
 		store.load();
 	// }
@@ -240,21 +241,42 @@
  * @returns {Ext.form.ComboBox|Ext4.form.ComboBox}
  */
 function createAppFormCombo() {
-	var appFormModel = sstsConfig.appFormModel || [
-		['全部申请单', '']
-		,['通用申请单', '通用申请单']
-		,['器械包申请单', '器械包申请单']
-		,['回收申请单', '回收申请单']
-		,['一次性物品申请单', '一次性物品申请单']
-		,['消毒物品申请单', '消毒物品申请单']
-		,['外来器械包申请单', '外来器械包申请单']
-		,['自定义器械包申请单', '自定义器械包申请单']
-		,['借物单', '借物单']
-		,['代理灭菌单', '代理灭菌单']
-		,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单']
-	];
-	if(sstsConfig.enableGoodsReservateion){
-		appFormModel.push(['物品预约单', '物品预约单']);
+	var appFormModel = [];
+	if(invoiceType == TYPE_APPLICATION){
+		appFormModel = sstsConfig.appFormModel || [
+			['全部申请单', '']
+			,['通用申请单', '通用申请单']
+			,['器械包申请单', '器械包申请单']
+			,['回收申请单', '回收申请单']
+			,['一次性物品申请单', '一次性物品申请单']
+			,['消毒物品申请单', '消毒物品申请单']
+			,['外来器械包申请单', '外来器械包申请单']
+			,['自定义器械包申请单', '自定义器械包申请单']
+			,['代理灭菌单', '代理灭菌单']
+			,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单']
+		];
+		if(sstsConfig.enableGoodsReservateion){
+			appFormModel.push(['物品预约单', '物品预约单']);
+		}
+	}else if(invoiceType == TYPE_BORROWINGSINGLE){
+		appFormModel = [['借物单', '借物单']];
+	}else {
+		appFormModel = sstsConfig.appFormModel || [
+			['全部申请单', '']
+			,['通用申请单', '通用申请单']
+			,['器械包申请单', '器械包申请单']
+			,['回收申请单', '回收申请单']
+			,['一次性物品申请单', '一次性物品申请单']
+			,['消毒物品申请单', '消毒物品申请单']
+			,['外来器械包申请单', '外来器械包申请单']
+			,['自定义器械包申请单', '自定义器械包申请单']
+			,['借物单', '借物单']
+			,['代理灭菌单', '代理灭菌单']
+			,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单']
+		];
+		if(sstsConfig.enableGoodsReservateion){
+			appFormModel.push(['物品预约单', '物品预约单']);
+		}
 	}
 	var appFormStore = new Ext.data.SimpleStore({
 		data: appFormModel,
@@ -269,6 +291,11 @@
 		listeners: {
 			select: function (combo, record, index) {
 				refreshList();
+			},
+			render:function(){
+				if(invoiceType == '借物单发货'){
+					Ext.getCmp('appFormType').setValue('借物单');
+				}
 			}
 		}
 	};