Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(revision 14017)
@@ -0,0 +1,1344 @@
+var foreignTousseStore;
+var foreignTousseForm;
+var foreignTousseApplyWindow;
+
+top.Ext4.define('foreignTousseTreeGrid',{
+    extend: 'top.Ext4.tree.Panel',
+    xtype: 'tree-grid',
+    useArrows: true,
+    rootVisible: false,
+    multiSelect: false,
+    columnLines: true,
+    animate:true,
+    rowLines: true,
+    cls: 'no-leaf-icons',
+    initComponent: function() {
+        this.cellEditing = new top.Ext4.grid.plugin.CellEditing({
+            clicksToEdit: 1,
+            listeners: {
+                beforeedit: function(editor, context, eOpts){
+                },
+				afteredit:function(editor, context, eOpts){
+				}
+            }
+        });
+        Ext4.apply(this, {
+        	plugins: [this.cellEditing]
+        });
+        this.superclass.initComponent.call(this);
+    }
+});
+
+Ext4.define('foreignTousseItemModel',{
+	extend : 'Ext4.data.Model',
+	idProperty: 'nodeId',
+	fields: [
+	{name : 'id'},
+	{name : 'tousseName'},
+	{name : 'supplierName'},
+	{name : 'amount'},
+	{name : 'includeImplant'},
+	{name : 'price'},
+	{name : 'type'},
+	{name : 'usedAmountOfIncludeImplant'},
+	{name : 'implantAmountOfUseRecord'},
+	{name : 'minDismantleAmount'}
+]});
+
+function showPatientInfo(patientInfo){
+	top.Ext4.getCmp('patient').setValue(patientInfo.patientName);
+	top.Ext4.getCmp('patientAge').setValue(patientInfo.patientAge);
+	if(patientInfo.patientSex == '男'){
+		top.Ext4.getCmp('patientSex').setValue('男');
+	}else if(patientInfo.patientSex == '女'){
+		top.Ext4.getCmp('patientSex').setValue('女');
+	}else{
+		top.Ext4.getCmp('patientSex').setValue('');
+	}
+	top.Ext4.getCmp('patientArea').setValue(patientInfo.patientArea);
+	top.Ext4.getCmp('roomNumber').setValue(patientInfo.roomNumber);
+	top.Ext4.getCmp('bedNumber').setValue(patientInfo.bedNumber);
+	top.Ext4.getCmp('doctor').setValue(patientInfo.doctorName);
+	top.Ext4.getCmp('surgery').setValue(patientInfo.operation);
+	top.Ext4.getCmp('operationTime').setValue(patientInfo.operationTime);
+	top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment);
+}
+
+function getSupplierName(){
+	var nodes = foreignTousseStore.getRootNode().childNodes;
+	if(nodes.length > 0){
+		return nodes[0].get("supplierName");
+	}
+}
+function getPrintGoodsInfo(){
+	var nodes = foreignTousseStore.getRootNode().childNodes;
+	var result = "";
+	for(var i = 0;i < nodes.length ; i++){
+		var n = nodes[i];
+		var materialNodes = n.childNodes;
+		
+		var tousseStr = n.get("tousseName") + "#&" + n.get("amount");
+		var materialStr = "";
+		for (var j=0; j < materialNodes.length; j++){
+			var materialNode = materialNodes[j];
+			if(materialStr.length > 0){
+				materialStr += "#@";
+            }
+			materialStr += ("&nbsp&nbsp&nbsp&nbsp<i>" + materialNode.get("tousseName") + "<i>#&" + materialNode.get("amount"));
+		}
+		tousseStr += "#@" + materialStr;
+		result = tousseStr;
+	}
+    return result;
+}
+
+function buildTousses(){
+	var tousses = [];
+	var nodes = foreignTousseStore.getRootNode().childNodes;
+	var result = "";
+	for(var i = 0;i < nodes.length ; i++){
+		var n = nodes[i];
+		var materials = [];
+    	var tools = [];
+    	var implants = [];
+    	var tousse = {
+			'tousseName':n.get("tousseName"),
+			'supplierName':n.get("supplierName"),
+			'amount':n.get("amount"),
+			'type':n.get("type"),
+			'price':n.get("price"),
+			'includeImplant':n.get("includeImplant"),
+			'tools':tools,
+			'implants':implants,
+			'materials':materials
+    	};
+    	tousses.push(tousse);
+		var materialNodes = n.childNodes;
+		for (var j=0; j < materialNodes.length; j++){
+             var material = {
+         			'tousseName':materialNodes[j].get("tousseName"),
+         			'supplierName':materialNodes[j].get("supplierName"),
+         			'amount':materialNodes[j].get("amount"),
+         			'minDismantleAmount': materialNodes[j].get("minDismantleAmount"),
+         			'type':materialNodes[j].get("type"),
+         			'price':materialNodes[j].get("price"),
+         			'includeImplant':materialNodes[j].get("includeImplant")
+         			};
+             if(material.includeImplant == '是'){
+             	implants.push(material);
+             }else{
+             	tools.push(material);
+             }
+             materials.push(material);
+		}
+		
+		tousse.includeImplantAmount = 0;
+        tousse.toolsAmount = 0;
+        tousse.materialsAmount = 0;
+        for(var i=0;i<materials.length;++i){
+        	tousse.materialsAmount += parseInt(materials[i].amount);
+        	if(materials[i].includeImplant == '是'){
+        		tousse.includeImplantAmount += parseInt(materials[i].amount);
+        	}else{
+        		tousse.toolsAmount += parseInt(materials[i].amount);
+        	}
+        }
+	}
+    return tousses;
+}
+
+function getStoreDepartCoding(store,deptName){
+	var deptCoding = "";
+	for(var i = 0;i < store.data.length;i++){
+		var record = store.getAt(i);
+		if(record.get('name') == deptName){
+			deptCoding = record.get('id');
+			break;
+		}
+	}
+	return deptCoding;
+}
+
+function printForeignTousseApplication_local(printType){
+    var title = "";
+    DWREngine.setAsync(false);
+    SupplyRoomConfigTableManager.getStartTimeObject(function(config){
+      if(config != null){
+        title = config.unitName;
+      }
+    });
+    DWREngine.setAsync(true);
+    var applicationId = top.Ext4.getCmp('id').getValue();
+    var applicant = top.Ext4.getCmp('applicant').getValue();
+    var applicationTime = top.Ext4.getCmp('applicationTime').getValue();
+    var depart = top.Ext4.getCmp('depart').getValue();
+    var remark =  top.Ext4.getCmp('remark').getValue();
+    var roomNumber =  top.Ext4.getCmp('roomNumber').getValue();
+    var bedNumber =  top.Ext4.getCmp('bedNumber').getValue();
+    var patient =  top.Ext4.getCmp('patient').getValue();
+    var patientAge =  top.Ext4.getCmp('patientAge').getValue();
+    var patientSex =  top.Ext4.getCmp('patientSex').getValue();
+    var hospitalNumber =  top.Ext4.getCmp('hospitalNumber').getValue();
+    var clinicNumber =  top.Ext4.getCmp('clinicNumber').getValue();
+    var doctor =  top.Ext4.getCmp('doctor').getValue();
+    var surgery =  top.Ext4.getCmp('surgery').getValue();
+    var operationTime = new Date(top.Ext4.getCmp('operationTime').getValue()).Format("yyyy-MM-dd hh:mm");
+    
+    var supplierName =  getSupplierName(); 
+    var goodsDetail = getPrintGoodsInfo();
+    if(goodsDetail == null || goodsDetail.length <= 0){
+        showResult("请填写申请的物品！");
+        return;
+    }
+    var tousses = buildTousses();
+    
+	formTypeOfPrinted = "foreignTousseAppliation";
+	
+	var config = printConfig.foreignTousseAppliation;
+	var printParams = getPrintJsonParams("print", applicationId , config);
+    printParams.printScope.rowsPerPage = printConfig.foreignTousseAppliation.rowsPerPage;
+    RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){
+    	var obj = JSON.parse(result);
+    	if (obj.success){
+        	var summary = obj.data[0];
+        	summary.pageIndex = 0;
+        	summary.title = title;
+        	summary.applicant = applicant;
+        	summary.applicationTime = applicationTime;
+        	summary.depart = depart;
+        	summary.remark = remark;
+        	summary.roomNumber = roomNumber;
+        	summary.bedNumber = bedNumber;
+        	summary.patient = patient;
+        	summary.patientAge = patientAge;
+        	summary.patientSex = patientSex;
+        	summary.hospitalNumber = hospitalNumber;
+        	summary.clinicNumber = clinicNumber;
+        	summary.surgery = surgery;
+        	summary.operationTime = operationTime;
+        	summary.doctor = doctor;
+        	summary.supplierName = supplierName;
+        	summary.goodsDetail = goodsDetail;
+        	summary.tousses = tousses;
+        	doPrintForeignTousseApplication(printType, summary);
+        	
+        	var isSupplyRoomUser = validateIsSupplyRoomUser();
+        	
+        	if (isSupplyRoomUser && printType == 0){
+                
+                RecyclingApplicationTableManager.updatePrintStatus(applicationId,function(result){
+                	//更新完打印状态之后,及时刷新页面
+        	        grid.dwrReload();
+                });
+                
+        	}
+    	}
+    });
+}
+
+function getForeignTousseInfo(){
+	var foreignTousseInfo = [];
+	var nodes = foreignTousseStore.getRootNode().childNodes;
+	var msg = "";
+	for (var i=0; i < nodes.length; i++){
+		var n = nodes[i];
+		if(n.get("amount") <= 0){
+			msg = "外来器械数量必须大于0！";
+			break;
+		}
+		var materialNodes = n.childNodes;
+		
+		var materials = [];
+		for (var j=0; j < materialNodes.length; j++){
+			var materialNode = materialNodes[j];
+			if(materialNode.get("amount") <= 0){
+				msg = "外来器械材料数量必须大于0！";
+				break;
+			}
+			if(materialNode.get("includeImplant") == ""){
+				msg = "外来器械材料必须填写是否植入物！";
+				break;
+			}
+			if(materialNode.get("tousseName") == ""){
+				msg = "外来器械材料必须填写名称！";
+				break;
+			}
+			materials.push({
+				materialInstanceId : materialNode.get("id"),
+				materialName : materialNode.get("tousseName"),
+				amount : materialNode.get("amount"),
+				includeImplant : materialNode.get('includeImplant'),
+				usedAmountOfIncludeImplant : materialNode.get('usedAmountOfIncludeImplant'),
+				minDismantleAmount : materialNode.get('minDismantleAmount')
+			});
+		}
+		foreignTousseInfo.push({
+			tousseItemId : n.get("id"),
+			tousseDefinitionId : n.get("tousseDefinitionId"),
+			tousseName : n.get("tousseName"),
+			supplierName : n.get("supplierName"),
+			amount : n.get("amount"),
+			price : n.get("price"),
+			materials : materials
+		});
+	}
+	if(msg == ""){
+		top.Ext4.getCmp('foreignTousseInfo').setValue(JSON.stringify(foreignTousseInfo));
+		return true;
+	}else{
+		showResult(msg);
+		return false;
+	}
+}
+
+function addForeignTousseMaterial(tousseDefinitionId){
+	var materialItem = Ext4.create('foreignTousseItemModel',{
+		id : 0,
+		tousseName: '',
+		supplierName : '',
+		amount : 0,
+		includeImplant : '',
+		price : 0.00,
+		type : 'material',
+		usedAmountOfIncludeImplant : 0,
+		implantAmountOfUseRecord : 0,
+		minDismantleAmount : 0,
+		leaf : true
+	});
+	
+	var rootNode = foreignTousseStore.getRootNode();
+	var clickNode = null;
+	rootNode.cascade(function(n) {
+		if(n.get('leaf') == false && n.get('tousseDefinitionId') == tousseDefinitionId){
+			clickNode =  n;
+		}
+	 });
+	if(clickNode != null){
+		clickNode.appendChild(materialItem);
+	}
+}
+
+function getExsistForeignTousseItem(treeStore, tousseName,supplierName){
+	var foundNode = null;
+	var rootNode = treeStore.getRootNode();
+	rootNode.cascade(function(n) {
+		if(n.get('tousseName') == tousseName && n.get('supplierName') == supplierName){
+			foundNode = n;
+		}
+	 });
+	return foundNode;
+}
+
+function submintForeignTousseForm(actionType){
+	
+	foreignTousseForm.form.submit({
+		 url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!saveForeignTousseApplication.do',
+	     method : 'POST',
+	     waitMsg : '正在保存数据，请稍候',
+	     waitTitle : '提交表单',
+	     params : {actionType : actionType},
+	     success : function(form, action) {
+	    	showResult(action.result.message);
+			grid.dwrReload();
+	    	foreignTousseApplyWindow.close();
+	     },
+	     failure : function(form, action) {
+	         showResult(action.result.message);
+	     }
+    });
+}
+
+function openForeignTousseForm(id,formType){
+	
+	var foreignTousseJsonStore = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getForeignTousseDefinitionNames.do',
+			reader : {
+				type : 'json',
+				root : 'data'
+			}
+		},
+		fields : [{name : 'id',mapping : 'id'}, 
+		  	    {name : 'spelling',mapping : 'spelling'}, 
+			    {name : 'name',mapping : 'name'}, 
+			    {name : 'displayName',mapping : 'displayName'}, 
+			    {name : 'amount',mapping : 'amount'},
+			    {name : 'suppler',mapping : 'suppler'},
+			    {name : 'includeImplant',mapping : 'includeImplant'},
+			    {name : 'materials',mapping : 'materials'}
+	     ]
+	});
+	
+	var foldersCompanyJsonStore = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/supplierAction!getCompanyList.do',
+			reader : {
+				type : 'json',
+				root : 'data'
+			}
+		},
+		fields : [{name : 'id',mapping : 'id'}, 
+		  	    {name : 'companyName',mapping : 'companyName'} 
+	     ]
+	});
+	
+	var forigntousseTbar = [];
+	
+	if(formType == 'apply'){
+		forigntousseTbar = [{
+			text: "器械包名称:"
+		},{
+			xtype : 'combo',
+			id : 'foreignTousseName1',
+			name : 'foreignTousseName1',
+			queryParam : 'spell',
+			minChars : 0,
+			valueField : 'id',
+			displayField : 'name',
+			width : 220,
+			listConfig: {width : 220},
+			matchFieldWidth: false,
+			store : foreignTousseJsonStore,
+			forceSelection : true,
+			lazyInit : true,
+			triggerAction : 'all',
+			hideTrigger : true,
+			typeAhead : false,
+			allowBlank : true,
+			listeners : {}
+		},{
+			text: "供应商:"
+		},{
+			xtype : 'combo',
+			id : 'suppler1',
+			name : 'suppler1',
+			queryParam : 'spell',
+			minChars : 0,
+			valueField : 'companyName',
+			displayField : 'companyName',
+			width : 200,
+			listConfig: {width : 200},
+			matchFieldWidth: false,
+			store : foldersCompanyJsonStore,
+			forceSelection : true,
+			lazyInit : true,
+			triggerAction : 'all',
+			hideTrigger : true,
+			typeAhead : false,
+			allowBlank : true,
+			listeners : {}
+		},{
+			xtype:'button',
+			id : 'addTousseBt',
+			iconCls : 'btn_ext_add',
+			handler : function() {
+				var foreignTousseName = top.Ext4.getCmp('foreignTousseName1').getRawValue();
+				var tousseDefinitionId =  top.Ext4.getCmp('foreignTousseName1').getValue();
+				var suppler = top.Ext4.getCmp('suppler1').getValue();
+				if(Ext4.isEmpty(foreignTousseName)){
+					var alertTips = "请选择器械包!";
+					showResult(alertTips);
+					top.Ext4.getCmp('foreignTousseName1').focus();
+					return false;
+				}else if(Ext4.isEmpty(suppler)){
+					showResult("请选择供应商！");
+					top.Ext4.getCmp('suppler1').focus();
+					return false;
+				}
+				if(foreignTousseStore.getRootNode().childNodes.length > 0){
+					showResult("只能申请一个外来器械包！");
+					return false;
+				}
+				var index = foreignTousseJsonStore.findExact("id",tousseDefinitionId);
+				var materials = [];
+				if(index != -1){
+					var materialsJson = foreignTousseJsonStore.getAt(index).get("materials");
+					if(materialsJson != undefined && materialsJson != ""){
+						for(var i = 0;i < materialsJson.length;i++){
+							materials.push({
+								id : materialsJson[i].id,
+								tousseName : materialsJson[i].materialName,
+								includeImplant : materialsJson[i].includeImplant,
+								amount : materialsJson[i].amount,
+								usedAmountOfIncludeImplant : 0,
+								implantAmountOfUseRecord  : 0,
+								minDismantleAmount :'',
+								type : 'material',
+								leaf : true
+							});
+						}
+					}
+				}
+				var item = getExsistForeignTousseItem(foreignTousseStore,foreignTousseName,suppler);
+				if(item == null){
+					var tousseItem = Ext4.create('foreignTousseItemModel',{
+						id : 0,
+						tousseDefinitionId : tousseDefinitionId,
+						tousseName: foreignTousseName,
+						supplierName : suppler,
+						amount : 1,
+						includeImplant : '',
+						price : 0.00,
+						type : 'tousse',
+						usedAmountOfIncludeImplant : 0,
+						implantAmountOfUseRecord : 0,
+						minDismantleAmount : 0,
+						leaf : false,
+						expanded : true,
+						children : materials 
+					});
+					var rootNode = foreignTousseStore.getRootNode();
+					rootNode.appendChild(tousseItem);
+					
+					top.Ext4.getCmp('foreignTousseName1').setValue("");
+					top.Ext4.getCmp('suppler1').setValue("");
+				}else{
+					showResult(foreignTousseName + ",已存在！");
+				}
+			}
+		}];
+	}else if(formType == 'recycle'){
+		forigntousseTbar = [{
+			text: "篮筐条码:"
+		},{
+			xtype : 'textfield',
+			maxLength : '50',
+			id : 'basketBarcode',
+			name : 'basketBarcode',
+			allowBlank : true,
+			width : 200,
+			listeners : {
+		    	specialkey : function(field, ee) {
+					if (ee.getKey() == Ext4.EventObject.ENTER) {
+						ContainerTableManager.getBasketByBarcodeAndProcedures(field.value,basketAllowProcedure,function(jsonStr){
+							var obj = Ext4.JSON.decode(jsonStr);
+							if(!obj.success){
+								showResult(obj.message);
+							}else{
+								var basketBarcodeField = top.Ext4.getCmp('barcodeStr');
+								var basketNameField = top.Ext4.getCmp('basketName');
+								basketBarcodeField.setValue(field.value);
+								basketNameField.setValue(obj.containerName);
+								top.Ext4.getCmp('basketBarcode').setValue('');
+							}
+						});
+					}
+				}
+		    }
+		},{
+			text: "篮筐名称:"
+		},{
+			xtype : 'textfield',
+			maxLength : '50',
+			id : 'basketName',
+			width : 200,
+			name : 'basketName',
+			allowBlank : true
+		}];
+	}
+	
+	var bbars = [];
+	var includeImplantUsedAmountHidden = false;
+	
+	if(formType == 'apply'){
+		includeImplantUsedAmountHidden = true;
+		bbars = [{
+			text : '打印预览',
+			handler : function() {
+				printForeignTousseApplication_local(1);
+			}
+		},{
+			text : '打印',
+			handler : function() {
+				printForeignTousseApplication_local(0);
+			}
+		},{
+			text : '提交',
+			hidden:(id != ""),
+			handler : function() {
+				if (!foreignTousseForm.getForm().isValid()) {
+					showResult('请正确填写表单各值');
+					return false;
+				}
+				if(foreignTousseStore.getRootNode().length == 0){
+					showResult('申请的物品不能为空！');
+					return false;
+				}
+				var success = getForeignTousseInfo();
+				if(success){
+					submintForeignTousseForm("");
+				}
+			}
+		},{
+			text : '取消',
+			handler : function() {
+				foreignTousseApplyWindow.close();
+			}
+		}]
+	}else if(formType == 'recycle'){
+		
+		var isReceive = false;
+		var isRecycling = false;
+		var isReturn = false;
+		var hideRecycling = true;
+		var hideReturn = true;
+		var status = '';
+		var hideUsedAmount = true;
+	  	DWREngine.setAsync(false);
+		ForeignTousseApplicationTableManager.findForeignTousseApplicationStatus(id,function(result){
+			if(result != null && result.length > 0){
+				status = result;
+				if(result == "待接收"){
+					isRecycling = true;
+					isReturn = true;
+					includeImplantUsedAmountHidden = true;
+				}else if(result == "已发货"){
+					isReceive = true;
+					isRecycling = false;
+					isReturn = true;
+					hideRecycling = false;
+					hideReturn = true;
+					hideUsedAmount = false;
+				}else if(result == "已归还"){
+					isReceive = true;
+					isRecycling = true;
+					isReturn = true;
+					hideRecycling = false;
+					hideReturn = false;
+					hideUsedAmount = false;
+				}else if(result == "已回收"){
+					isReceive = true;
+					isRecycling = true;
+					isReturn = false;
+					hideRecycling = false;
+					hideReturn = false;
+					hideUsedAmount = false;
+				}else{//已接收、未发货状态
+					isReceive = true;
+					isRecycling = true;
+					isReturn = true;
+					hideRecycling = true;
+					hideReturn = true;
+					
+				}
+			}
+		});
+		DWREngine.setAsync(true);
+		
+		bbars = [
+			{
+				text : '确认接收',
+				id : 'saveBtn',
+				disabled : isReceive,
+				handler : function(){
+					var b = this;
+					var classfyBasketName = top.Ext4.getCmp('basketName').getValue();
+					if(classfyBasketName == ""){
+						showResult("请扫描篮筐条码！");
+						return false;
+					}
+					
+					var success = getForeignTousseInfo();
+					if(success){
+						submintForeignTousseForm(actionType_confirmReceive);
+					}
+				}
+			},{
+				text : '确认回收',
+				id : 'recyclingBtn',
+				disabled : isRecycling,
+				handler : function(){
+					if(!foreignTousseForm.getForm().isValid()){
+						showResult('请正确填写表单各值');
+						b.enable();
+						return false;
+					}
+					var classfyBasketName = top.Ext4.getCmp('basketName').getValue();
+					if(classfyBasketName == ""){
+						showResult("请扫描篮筐条码！");
+						return false;
+					}
+					var success = getForeignTousseInfo();
+					if(success){
+						submintForeignTousseForm(actionType_confirmRecycle);
+					}
+				}
+			},{
+				text : '确认归还',
+				id : 'returnBtn',
+				disabled : isReturn,
+				handler : function(){
+					var b = this;
+					top.Ext4.MessageBox.confirm("请确认","是否提交"+entityName+"信息？",function(btn) {
+						if(btn=='yes') {
+							b.disable();
+							if(!foreignTousseForm.getForm().isValid()){
+								showResult('请正确填写表单各值');
+								return false;
+								b.enable();
+							}
+							var success = getForeignTousseInfo();
+							if(success){
+								submintForeignTousseForm(actionType_confirmReturn);
+							}
+						}
+					});
+				}
+			},{
+				text : '取消',
+				handler : function() {
+					foreignTousseApplyWindow.close();
+				}
+			}
+		]
+	}else if(formType == 'interfere'){
+		bbars = [{
+			text : '保存',
+			handler : function() {
+				if (!foreignTousseForm.getForm().isValid()) {
+					showResult('请正确填写表单各值');
+					return false;
+				}
+				if(foreignTousseStore.getRootNode().length == 0){
+					showResult('申请的物品不能为空！');
+					return false;
+				}
+				var success = getForeignTousseInfo();
+				if(success){
+					submintForeignTousseForm("");
+				}
+			}
+		},{
+			text : '取消',
+			handler : function() {
+				foreignTousseApplyWindow.close();
+			}
+		}]
+	}
+	
+	var foreignTousseColumns = [{
+		dataIndex : 'tousseDefinitionId',
+		hidden : true
+	},{
+    	header: '供应商',
+    	width : includeImplantUsedAmountHidden ? 200 : 170,
+        sortable: true,
+        xtype : 'treecolumn',
+        dataIndex: 'supplierName'
+    },{
+    	header: '器械包/材料名称',
+    	width : includeImplantUsedAmountHidden ? 200 : 170,
+    	align:'center',
+        sortable: true,
+        dataIndex: 'tousseName',
+        editor: {
+            xtype: 'textfield',
+            allowDecimals :false,
+            minValue: 0,
+            listeners  : {  
+                'focus':function(){  
+                    this.selectText();  
+                }  
+            }  
+        }
+    },{
+    	header: '是否植入物',
+    	width : 75,
+    	align:'center',
+        sortable: true,
+        dataIndex: 'includeImplant',
+        editor: {
+			xtype : 'combo',
+			id : 'isIncludeImplant',
+			name : 'isIncludeImplant',
+			width : 130,
+			valueField : 'yesOrNo',
+			displayField : 'yesOrNo',
+			store : new top.Ext4.data.SimpleStore( {
+				fields : [ 'yesOrNo' ],
+				data : [['是'],['否']]
+			}),
+			allowBlank: true,
+			forceSelection : true
+        }
+    },{
+    	header: '数量',
+    	width : 60,
+    	align:'center',
+        sortable: true,
+        dataIndex : 'amount',
+        editor: {
+            xtype: 'numberfield',
+            allowBlank: true,
+            allowDecimals :false,
+            minValue: 0,
+            listeners  : {  
+                'focus':function(){  
+                    this.selectText();  
+                }  
+            }  
+        }
+    },{
+    	header: '单价',
+    	width : 60,
+    	align:'center',
+        sortable: true,
+        dataIndex: 'price',
+        editor: {
+            xtype: 'numberfield',
+            allowBlank: true,
+            allowDecimals :true,
+            decimalPrecision: 2,
+            minValue: 0,
+            listeners  : {  
+                'focus':function(){  
+                    this.selectText();  
+                }  
+            }  
+        }
+    },{
+        header:'植入物使用数量',
+        width:100,
+        align:'center',
+        dataIndex:'usedAmountOfIncludeImplant',
+        hidden : includeImplantUsedAmountHidden,
+        editor: {
+            xtype: 'numberfield',
+            allowBlank: true,
+            allowDecimals :false,
+            minValue: 0,
+            listeners  : {  
+                'focus':function(){  
+                    this.selectText();  
+                }  
+            }  
+        }
+    },{
+    	header: '可拆卸数量',
+    	width : 80,
+    	align:'center',
+        sortable: true,
+        dataIndex: 'minDismantleAmount',
+        editor: {
+            xtype: 'numberfield',
+            allowBlank: true,
+            allowDecimals :false,
+            minValue: 0,
+            listeners  : {  
+                'focus':function(){  
+                    this.selectText();  
+                }  
+            }  
+        }
+    },{
+    	header: '图片',
+    	width : 50,
+    	align:'center',
+        sortable: true,
+        dataIndex: 'type',
+        renderer: function(v,p,record,rowIndex, columnIndex, store){
+        	var isLeaf = record.get('leaf');
+        	var tousseName = record.get('tousseName');
+        	if(!isLeaf){
+        		return "<img src=\""+WWWROOT+"/images/web/image_.gif\" onclick=\"getCurrentTab().showTousseImageWin('"+tousseName+"')\" >";
+        	}
+        }
+    }];
+	
+	foreignTousseStore = new Ext4.data.TreeStore({
+	    model: foreignTousseItemModel,
+	    proxy: {
+	        type: 'ajax',
+	        url: WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!loadForeignTousseItems.do'
+	    },
+	    listeners : {
+	        beforeload : function(store, operation) {  
+	            var params = {//参数  
+	            	applicationId : id 
+	            };
+	            Ext4.apply(store.proxy.extraParams, params);  
+	        }  
+	    },
+	    folderSort: true
+	});
+	
+	var settleDepartJsonStore = new Ext4.data.JsonStore({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
+			reader : {
+				type : 'json',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'id',mapping : 'id'},
+		    {name : 'name',mapping : 'name'}
+		  ]
+	});
+	settleDepartJsonStore.load();
+
+	var applyDepartJsonStore = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
+			reader : {
+				type : 'json',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'id',mapping : 'id'},
+		    {name : 'name',mapping : 'name'}
+		  ]
+	});
+	applyDepartJsonStore.load();
+	
+	var processTypeJsonStore = new Ext4.data.SimpleStore({
+		fields : [ 'typeName' ],
+		url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!getProcessType.do'
+	});
+	
+	foreignTousseForm = new top.Ext4.form.Panel({
+		id : 'foreignToussForm',
+		frame : true,
+		border : 0,
+		labelSeparator : '：',
+		bodyPadding : '5 5 0',
+		autoScroll : true,
+		buttonAlign : 'center',
+		buttons : bbars,
+		fieldDefaults : {
+			labelAlign : 'right'
+		},
+		layout : {
+			type : 'vbox'
+		},
+		items : [ 
+		    {
+				xtype : 'fieldset',
+				title : '基础信息',
+				collapsible : false,
+				height : 200,
+				width : '100%',
+				defaultType : 'textfield',
+				layout : {
+					type : 'vbox'
+				},
+				items : [
+				{
+					xtype : 'container',
+					width : 730,
+					layout : 'hbox',
+					flex : 1,
+					items : [
+						{
+							xtype : 'hidden',
+							name : 'id',
+							id : 'id'
+						},{
+							xtype : 'hidden',
+							name : 'departCoding',
+							id : 'departCoding'
+						},{
+							xtype : 'hidden',
+							name : 'settleAccountsDepartCoding',
+							id : 'settleAccountsDepartCoding'
+						},{
+							xtype : 'hidden',
+							name : 'foreignTousseInfo',
+							id : 'foreignTousseInfo'
+						},{
+							xtype : 'hidden',
+							name : 'barcodeStr',
+							id : 'barcodeStr'
+						},{
+							xtype : 'textfield',
+							fieldLabel : '申请人',
+							maxLength : '16',
+							id : 'applicant',
+							name : 'applicant',
+							allowBlank : false,
+							flex : 1,
+							readOnly : true,
+							value : $Id('userName').value,
+							readOnly : true,
+							fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+						},{
+							xtype : 'textfield',
+							fieldLabel : '申请时间',
+							id : 'applicationTime',
+							name : 'applicationTime',
+							editable:false,
+							flex : 1,
+							format : 'Y-m-d H:i',
+							fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+						},{
+							xtype : 'textfield',
+							fieldLabel : '流水号',
+							id : 'serialNumber',
+							name : 'serialNumber',
+							allowBlank : true,
+							readOnly:true,
+							flex : 1,
+							fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+						}
+					]
+				},{
+					xtype : 'container',
+					width : 730,
+					layout : 'hbox',
+					flex : 1,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : '申请科室',
+						id : 'depart',
+						name : 'depart',
+						queryParam : 'spell',
+						minChars : 0,
+						valueField : 'name',
+						displayField : 'name',
+						store : applyDepartJsonStore,
+						forceSelection : true,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : false,
+						flex : 1,
+						listeners:{
+							select:function(combo, record, index){
+								var depart = top.Ext4.ComponentQuery.query("#foreignToussForm #depart")[0].getValue();
+								var deptCoding = getStoreDepartCoding(applyDepartJsonStore,depart);
+								top.Ext4.ComponentQuery.query("#foreignToussForm #departCoding")[0].setValue(deptCoding);
+							},
+							focus : function(thiz){
+								thiz.selectText();
+							}
+						}
+					},{
+						xtype : 'combo',
+						fieldLabel : '结算科室',
+						id : 'settleAccountsDepart',
+						name : 'settleAccountsDepart',
+						queryParam : 'spell',
+						minChars : 0,
+						valueField : 'name',
+						displayField : 'name',
+						store : settleDepartJsonStore,
+						forceSelection : true,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : false,
+						flex : 1,
+						listeners:{
+							select:function(combo, record, index){
+								var settleAccountsDepart = top.Ext4.ComponentQuery.query("#foreignToussForm #settleAccountsDepart")[0].getValue();
+								var deptCoding = getStoreDepartCoding(applyDepartJsonStore,settleAccountsDepart);
+								top.Ext4.ComponentQuery.query("#foreignToussForm #settleAccountsDepartCoding")[0].setValue(deptCoding);
+							},
+							focus : function(thiz){
+								thiz.selectText();
+							}
+						}
+					},{
+							xtype : 'combo',
+							fieldLabel : '处理方式',
+							id : 'processType',
+							name : 'processType',
+							width : 130,
+							valueField : 'typeName',
+							displayField : 'typeName',
+							store : processTypeJsonStore,
+							allowBlank: true,
+							forceSelection : true,
+							triggerAction : 'all',
+							flex : 1
+				        }
+					]
+				  },{
+						xtype : 'container',
+						width : 730,
+						layout : 'hbox',
+						flex : 1,
+						items : [
+							{
+							    xtype : 'textfield',
+							    fieldLabel : '住院号',
+							    maxLength : '50',
+							    id : 'hospitalNumber',
+							    name : 'hospitalNumber',
+							    allowBlank : true,
+							    enableKeyEvents : true,
+							    listeners : {
+							    	specialkey : function(field, ee) {
+										if (ee.getKey() == Ext4.EventObject.ENTER) {
+											var jsonStr = "{\"patientNum\":\"" + field.value
+														+ "\",\"numType\":\"hospitalNum\",\"sourcePage\":\"0\"}";
+											loadPatientInfoByValAndType(jsonStr);
+										}
+									}
+							    },
+							    flex : 1
+							},{
+								xtype : 'textfield',
+								fieldLabel : '诊疗号',
+								maxLength : '100',
+								id : 'clinicNumber',
+								name : 'clinicNumber',
+								allowBlank : true,
+								enableKeyEvents : true,
+								listeners : {
+									specialkey : function(field, ee) {
+										if (ee.getKey() == Ext4.EventObject.ENTER) {
+											var jsonStr = "{\"patientNum\":\"" + field.value
+														+ "\",\"numType\":\"treatmentNum\",\"sourcePage\":\"0\"}";
+											loadPatientInfoByValAndType(jsonStr);
+										}
+									}
+								},
+								flex : 1
+							},{
+								xtype : 'textfield',
+								fieldLabel : '病区',
+								maxLength : '50',
+								id : 'patientArea',
+								name : 'patientArea',
+								allowBlank : true,
+								flex : 1
+							}
+						]
+				  },{
+						xtype : 'container',
+						width : 730,
+						layout : 'hbox',
+						flex : 1,
+						items : [
+							{
+								xtype : 'textfield',
+								fieldLabel : '病室',
+								maxLength : '50',
+								id : 'roomNumber',
+								name : 'roomNumber',
+								allowBlank : true,
+								flex : 1
+							},  {
+								xtype : 'textfield',
+								fieldLabel : '床位',
+								maxLength : '50',
+								id : 'bedNumber',
+								name : 'bedNumber',
+								allowBlank : true,
+								flex : 1
+							}, {
+								xtype : 'textfield',
+								fieldLabel : '病人姓名',
+								maxLength : '50',
+								id : 'patient',
+								name : 'patient',
+								allowBlank : true,
+								flex : 1
+							}
+						]
+					},{
+						xtype : 'container',
+						width : 730,
+						layout : 'hbox',
+						flex : 1,
+						items : [
+							{
+								xtype : 'numberfield',
+								fieldLabel : '年龄',
+								maxLength : '3',
+								id : 'patientAge',
+								name : 'patientAge',
+								allowDecimals : false,
+								allowNegative : false,
+								flex : 1
+							}, {
+								xtype : 'combo',
+								fieldLabel : '性别',
+								valueField : 'typeName',
+								displayField : 'typeName',
+								id : 'patientSex',
+								name : 'patientSex',
+								mode : 'local',
+								triggerAction : 'all',
+								forceSelection : true,
+								editable : false,
+								store : new top.Ext4.data.SimpleStore( {
+									fields : [ 'typeName' ],
+									data : [['男'],['女']]
+								}),
+								flex : 1
+							},{
+								xtype : 'textfield',
+								fieldLabel : '病人所属科室',
+								maxLength : '16',
+								id : 'ascriptionDepartment',
+								name : 'ascriptionDepartment',
+								allowBlank : true,
+								flex : 1
+							}
+						]
+				    },{
+						xtype : 'container',
+						width : 730,
+						layout : 'hbox',
+						flex : 1,
+						items : [
+							{
+								xtype : 'textfield',
+								fieldLabel : '手术名称',
+								id : 'surgery',
+								name : 'surgery',
+								allowBlank : true,
+								flex : 1
+							}, {
+								xtype : 'datefield',
+								fieldLabel : '手术时间',
+								id : 'operationTime',
+								name : 'operationTime',
+								editable : false,
+								selectOnFocus :true,
+								format : 'Y-m-d H:i',
+								allowBlank : true,
+								flex : 1
+							}, {
+								xtype : 'textfield',
+								fieldLabel : '医生',
+								maxLength : '16',
+								id : 'doctor',
+								name : 'doctor',
+								allowBlank : true,
+								flex : 1
+							}
+						]
+					},{
+						xtype : 'container',
+						width : 730,
+						layout : 'hbox',
+						flex : 1,
+						items : [
+							{
+								xtype : 'textfield',
+								fieldLabel : '备注',
+								id : 'remark',
+								name : 'remark',
+								flex : 1
+							}
+					    ]
+					}
+			   ]
+			} ,
+			{
+				flex : 1,
+				xtype : 'container',
+				layout : 'hbox',
+				items:[
+		            top.Ext4.create('foreignTousseTreeGrid', {
+		            	id : 'foreignTousseTreeGridForm',
+		            	columns : foreignTousseColumns,
+	                	flex : 1,
+	                	border : true,
+	                	tbar : forigntousseTbar,
+						store : foreignTousseStore,
+						width : 770,
+						height: 320,
+						listeners : {
+				            'itemcontextmenu' : function(menutree, record, items, index, e) {  
+				                e.preventDefault();  
+				                e.stopEvent();
+				                
+				                var menuArray = [];
+				                
+				                var leaf = record.get("leaf");
+				                
+				                if(leaf){
+				                	menuArray.push({  
+			                            text : "删除",
+			                            iconCls :'btn_ext_pause',
+			                            handler : function() {
+			                            	record.remove(record);
+			                            } 
+			                        });
+				                }else{
+				                	menuArray.push({  
+			                            text : "添加材料",
+			                            iconCls :'btn_ext_add',
+			                            handler : function() {
+			                            	addForeignTousseMaterial(record.get("tousseDefinitionId"));
+			                            } 
+			                        },{  
+			                            text : "删除",
+			                            hidden:(id != ''),
+			                            iconCls :'btn_ext_pause',
+			                            handler : function() {
+			                            	record.remove(record);
+			                            } 
+			                        });
+				                }
+				                var nodemenu = new top.Ext4.menu.Menu({  
+			                        items : menuArray
+				                });
+				                nodemenu.showAt(e.getXY()); 
+				            }
+						}
+					})
+				]
+	        }
+		]
+	});
+	
+	foreignTousseApplyWindow = new top.Ext4.window.Window({
+		id : 'foreignTousseApplicationWin',
+		title : '外来器械单信息',
+		width : 800,
+		height : 600,
+		resizable :false,
+		modal : true,
+		border : false,
+		plain : true,
+		layout : 'fit',
+		items : [ foreignTousseForm ]
+	});
+	
+	foreignTousseApplyWindow.show();
+	
+	if (id != '') {// 编辑
+		foreignTousseForm.form.load( {
+			url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!loadForeignTousseApplication.do',
+			method : 'GET',
+			waitMsg : '正在加载数据，请稍候',
+			success : function(form, action) {
+				var depart = action.result.data.depart;
+				var departComp = top.Ext4.ComponentQuery.query("#foreignToussForm #depart")[0];
+				departComp.forceSelection = false;
+				departComp.setValue(depart);
+				departComp.forceSelection = true;
+				var settleAccountsDepart = action.result.data.settleAccountsDepart;
+				var settleAccountsDepartComp = top.Ext4.ComponentQuery.query("#foreignToussForm #settleAccountsDepart")[0];
+				settleAccountsDepartComp.forceSelection = false;
+				settleAccountsDepartComp.setValue(settleAccountsDepart);
+				settleAccountsDepartComp.forceSelection = true;
+				var patientSex = action.result.data.patientSex;
+				top.Ext4.getCmp("patientSex").setValue(patientSex);
+				var processType = action.result.data.processType;
+				var processTypeComp = top.Ext4.ComponentQuery.query("#foreignToussForm #processType")[0];
+				processTypeComp.forceSelection = false;
+				processTypeComp.setValue(processType);
+				processTypeComp.forceSelection = true;
+			},
+			failure : function(form, action) {
+				showResult("加载失败，请联系管理员！");
+			},
+			params : {
+				id : id
+			}
+		});
+	}
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r13665 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 13665)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 14017)
@@ -305,8 +305,8 @@
 <!-- 外来器械包 -->
 <script type="text/javascript" src="../showTousseImage/showTousseIamge.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js"></script>
 <script type='text/javascript' src="${ctx}/dwr/interface/DataSynchronizationTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js"></script>
 
 <!-- 自定义器械包 -->
 <script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/tousse/customTousseForm.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r12599 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 12599)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 14017)
@@ -38,6 +38,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript">
 	var SSTS_ForeignTousseApplication_Create = true;
 	<operation:authorize ifAnyGranted="SSTS_ForeignTousseApplication_Create">
@@ -105,7 +106,7 @@
 <script src="${ctx}/disinfectsystem/common/cssdUtils.js"></script>
 
 <script type="text/javascript" src="foreignTousseApplicationView.js"></script>
-<script type="text/javascript" src="foreignTousseApplicationForm.js"></script>
+<script type="text/javascript" src="foreignTousseInfoForm.js"></script>
 
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r13962 -r14017
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 13962)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 14017)
@@ -317,7 +317,8 @@
 	hidden:SSTS_InterfereManagerView,
 	children:[
         {hidden :SSTS_InterfereSterilizationRecord_ViewMenu,text:"灭菌记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereSterilizationView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_InterfereSterilizationRecord_ViewMenu,text:"申请单干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereGoodsApplicationView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_InterfereRecyclingApplication_ViewMenu,text:"申请单干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereGoodsApplicationView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_InterfereForeigntousseApplication_ViewMenu,text:"外来器械干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"消毒供应中心物品领用",
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
===================================================================
diff -u -r13993 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js	(.../printConfig.js)	(revision 13993)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js	(.../printConfig.js)	(revision 14017)
@@ -1021,7 +1021,7 @@
 		{label : "", dataIndex : 'sterilingType', position : ["32mm","1mm","26mm","3mm"], type: 'html', beforeStr: "<div style='font-size:6;font-weight:bold;'>", afterStr: "</div>"},
 		// 器械包名称，水平居中
 		{label : "", dataIndex : 'nameWithoutPartInfo', position : ["2mm","0mm","RightMargin:0mm","5mm"], type: 'html', beforeStr: "<div style='font-size:15px;font-weight:bold;text-align:center'>", afterStr: "</div>"},
-		{label : "手术名称:", dataIndex : 'surgery', fontSize : 8, bold: 1, position : ["29mm","10mm","80mm","5mm"]},
+		//{label : "手术名称:", dataIndex : 'surgery', fontSize : 8, bold: 1, position : ["29mm","10mm","80mm","5mm"]},
 		{label : "供应商:", dataIndex : 'supplierName', fontSize : 8, bold: 1, position : ["9mm","10mm","60mm","5mm"]},
 		{label : "住院号:", dataIndex : 'hospitalNumber', fontSize :8, bold: 1, position : ["9mm","55mm","60mm","5mm"]},
 		{label : "包装总数:", dataIndex : 'splitPackagesAmount', fontSize : 8, bold: 1, position : ["14mm","10mm","30mm","5mm"]},
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp	(revision 14017)
@@ -0,0 +1,45 @@
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+<%
+    String userName = AcegiHelper.getLoginUser().getUserFullName();
+    request.setAttribute("userName",userName);
+    request.setAttribute("depart",AcegiHelper.getLoginUser().getCurrentOrgUnitName());
+    request.setAttribute("departCoding",AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig());
+%>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
+<script type="text/javascript" src="${ctx}/js/json3.min.js" /></script>
+<script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js" /></script>
+<script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/showTousseImage/showTousseIamge.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/interfere/interfereForeignTousseApplicationView.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js"></script>
+<script type='text/javascript' src="${ctx}/dwr/interface/DataSynchronizationTableManager.js"></script>
+
+
+<title>外来器械包申请单</title>
+</head>
+<body>
+<table height="100%;" width="100%" border="0" align="center"
+    cellpadding="0" cellspacing="0">
+    <tr height="100%;">
+        <td colspan="2">
+        <div id="gridDiv" style="height: 100%;"></div>
+        </td>
+    </tr>
+</table>
+<input type="hidden" id="userName" value="${userName}">
+<input type="hidden" id="depart" value="${depart}">
+<input type="hidden" id="departCoding" value="${departCoding}">
+</body>
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js	(revision 14017)
@@ -0,0 +1,98 @@
+var entityName = "外来器械申请单";
+var grid;
+
+function modify(v,data){
+	var records = grid.getSelectionModel().getSelections();
+
+	if (records.length == 0) {
+		showResult("请选择要修改的"+entityName+"！");
+		return false;
+	}else if(records.length != 1){
+		showResult("一次只能修改一个"+entityName+"！");
+		return false;
+	}
+	openForeignTousseForm(records[0].data.id,"interfere");
+}
+
+Ext.onReady(function(){
+	Ext.QuickTips.init();
+	var columns = [
+	     {header : "申请人",width : 60,dataIndex : 'applicant', renderer : modifyRecord}, 
+	     {header : "申请时间",width : 115,dataIndex : 'applicationTime', renderer : myDateFormatByMinute},
+	     {header : "申请科室",width : 100,dataIndex : 'depart'}, 
+	     {header : "器械包状态",width : 70,dataIndex : 'packageStatus'}, 
+	     {header : "住院号",width : 70,dataIndex : 'hospitalNumber'},
+	     {header : "病人姓名",width : 60,dataIndex : 'patient'},
+	     {header : "医生",width : 60,dataIndex : 'doctor'},
+	     {header : "外来器械包名称",width : 150,dataIndex : 'tousseName'},
+	     {header : "手术名称",width : 120,dataIndex : 'surgery'}, 
+	     {header : "接收人",width : 60,dataIndex : 'receiveMan'}, 
+	     {header : "接收时间",width : 120,dataIndex : 'receiveTime', renderer : myDateFormatByMinute},
+	     {header : "归还人",width : 60,dataIndex : 'returnMan'},
+	     {header : "归还时间",width : 120,dataIndex : 'returnTime', renderer : myDateFormatByMinute},
+	     {header: "备注", width : 400, dataIndex: 'remark'}
+	];
+
+	var readerDetail = [
+	     {name : 'id'}, 
+	     {name : 'applicant'}, 
+	     {name : 'applicationTime'},
+	     {name : 'depart'}, 
+	     {name : 'packageStatus'},
+	     {name : 'hospitalNumber'},
+	     {name : 'patient'},
+	     {name : 'doctor'},
+	     {name : 'tousseName'},
+	     {name : 'surgery'}, 
+	     {name : 'receiveMan'}, 
+	     {name : 'receiveTime'},
+	     {name : 'returnMan'},
+	     {name : 'returnTime'},
+	     {name : 'remark'}
+	];
+	
+	var filters = new Ext.grid.GridFilters({
+		filters:[
+			{type: 'string',  dataIndex: 'applicant'},
+			{type: 'date',  dataIndex: 'applicationTime'},
+			{type: 'string',  dataIndex: 'depart'},
+			{type: 'string',  dataIndex: 'clinicNumber'},
+			{type: 'string',  dataIndex: 'patient'},
+			{type: 'string',  dataIndex: 'doctor'},
+			{type: 'string',  dataIndex: 'surgery'},
+			{type: 'string',  dataIndex: 'tousseName'},
+			{type: 'string',  dataIndex: 'receiveMan'},
+			{type: 'date',  dataIndex: 'receiveTime'},
+			{type: 'string',  dataIndex: 'returnMan'},
+			{type: 'date',  dataIndex: 'returnTime'},
+			{type: 'string',  dataIndex: 'remark'}
+		]
+	});
+
+	grid = new Ext.ux.ForgonPageGrid( {
+		pageSize : 20,
+		defaultSortField : 'applicationTime',
+		defaultSortDirection : 'DESC',
+		isCheckboxSelectionModel : true,
+		rememberSelected : false,
+		isShowSearchField : true,
+		searchDisableIndexes : ['remark','status'],
+		columns : columns,
+		plugins: filters,
+		renderTo : 'gridDiv',
+		frame : false
+	}, 
+		readerDetail,
+		ForeignTousseApplicationTableManager.findForeignTousseApplicationTableList,
+		null
+	);
+	var viewport = new Ext.Viewport({
+		layout : 'border',
+		items : [{
+			region : 'center',
+			margins : '0 0 0 0',
+			layout : 'fit',
+			items : grid
+		}]
+	});
+})
\ No newline at end of file
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r13147 -r14017
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 13147)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 14017)
@@ -216,6 +216,8 @@
     
     <modelName modleName="��Ԥģ��">
       <operation operationId="SSTS_InterfereSterilizationRecord_ViewMenu" operationName="�����¼��Ԥ����"></operation>
+      <operation operationId="SSTS_InterfereRecyclingApplication_ViewMenu" operationName="���뵥��Ԥ����"></operation>
+      <operation operationId="SSTS_InterfereForeigntousseApplication_ViewMenu" operationName="������е��Ԥ����"></operation>
     </modelName>
     
     <modelName modleName="�˻���¼ģ��">
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r14007 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 14007)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 14017)
@@ -224,31 +224,6 @@
 				});
 			}
 		},'-',{
-			text : '转换病人',
-			iconCls : 'btn_ext_cog_go',
-			hidden : SSTS_HistoryPacking_Change_Patient,
-			handler : function() {
-				var record = rePrintGrid.getSelectionModel().getSelected();
-				if (typeof (record) == 'object') {
-					var tousseType = record.data['tousseType'];
-					if(tousseType == "外来器械包" || tousseType == "外来器械拆分小包"){
-						var tousseBarcode =  record.data['tousseBarcode'];
-						TousseInstanceTableManager.getForeignTousseAppIdByTousseBarcode(tousseBarcode,function(foreignTousseAppID){
-							if(foreignTousseAppID != null){
-								addAndEditForeignTousseApplication(foreignTousseAppID,true);
-							}else{
-								showResult("");
-							}
-						});
-					}else{
-						showResult("请选择外来器械包！");
-					}
-				}else{
-					showResult("请选择要转换的外来器械包！");
-				}
-				
-			}
-		},{
 			text : '打印',
 			iconCls : 'icon_print',
 			handler : function() {
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r12633 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 12633)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 14017)
@@ -1,36 +1,6 @@
 var entityName = "外来器械申请单";
 var grid;
 
-//结算科室Store
-var departJsonStoreExt2 = new Ext.data.Store({
-	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
-		method : 'POST'
-	}),
-	reader : new Ext.data.JsonReader({
-		root : 'data'
-	},[
-	    {name : 'id',mapping : 'id'}, 
-	    {name : 'name',mapping : 'name'}
-	  ]
-	)
-});
-
-//申请科室Store
-var appDepartJsonStoreExt2 = new Ext.data.Store({
-	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
-		method : 'POST'
-	}),
-	reader : new Ext.data.JsonReader({
-		root : 'data'
-	},[
-	    {name : 'id',mapping : 'id'}, 
-	    {name : 'name',mapping : 'name'}
-	  ]
-	)
-});
-
 // 删除
 function deleteForeignTousseApplication(grid) {
 	var records = grid.getSelectionModel().getSelections();
@@ -80,10 +50,9 @@
 		}
 	}
 	);
-	
 }
 
-function loadFormData(grid){
+function loadFormData(){
 	var records = grid.getSelectionModel().getSelections();
 
 	if (records.length == 0) {
@@ -93,7 +62,7 @@
 		showResult("一次只能修改一个"+entityName+"！");
 		return false;
 	}
-	addAndEditForeignTousseApplication(records[0].data.id);
+	openForeignTousseForm(records[0].data.id,"apply");
 }
 
 /**
@@ -102,160 +71,9 @@
  * 页面中需要定义 modify(v,data) 函数
  */
 function modify(v,data){
-	//loadFormData(grid);
-	addAndEditForeignTousseApplication(data.id);
+	loadFormData();
 }
-function formatDateYear(v, p, record) {
-	try {
-		return Ext.util.Format.date(new Date(v.time), 'Y-m-d');
-	} catch (e) {
-	}
-}
-//发货签收
-function sign() {
-	top.Ext.MessageBox.confirm("请确认","是否签收此发货单信息？",function(btn) {
-		if(btn=='yes') {
-			 var record = invoiceGrid.getSelectionModel().getSelected();
-			 var invoiceId = record==null?null:record.data.id;
-			
-			 if(invoiceId != null){
-				 DWREngine.setAsync(false);
-				 InvoiceTableManager.updateInvoiceStatus(invoiceId,function(){
-				 	 invoiceGrid.getStore().reload();
-					 grid.getStore().reload();
-					 showResult('签收保存成功！');
-				 });
-				 DWREngine.setAsync(true);
-			 }else{
-				 showResult("请选择待签收的发货单！");
-			 }
-		}
-	});
-}
-function showSignBtn(v, p, record) {
-	if(record.data['receiptor'] == ''){
-		return "<a href=\"#\" onclick=\"" +
-				"var currentTab = getCurrentTab();" +
-				"currentTab.sign();" +
-				"\"><img src=\""+WWWROOT+"/images/btn_enrol.gif\"></img></a>";
-	}
-	return '';
-}
 
-//发货单
-//发货单窗口
-function searchInvoice(id){
-	$Id('parm_s_recyclingApplicantID').value = id;
-	
-	var expander = new Ext.grid.RowExpander({
-		lazyRender : false,
-		enableCaching : false,
-        tpl : new Ext.Template(
-        	'<table width="200px"><tr><th><b>物品名称</b></th><th><b>发货数量</b></th></tr>{invoiceItems}</table>'
-        )
-    });
-	
-	var invoiceColumns = new Ext.grid.ColumnModel([expander,
-	    {header : "流水号",width : 120,dataIndex : 'serialNumber',menuDisabled:true},
-	    {header : "申请科室",width : 50,dataIndex : 'depart',menuDisabled:true},
-	    {header : "申请人",width : 50,dataIndex : 'applicant',menuDisabled:true},
-	    {header : "发货员",width : 50,dataIndex : 'sender',menuDisabled:true},
-	    {header : "发货时间",width : 100,dataIndex : 'sendTime',renderer : myDateFormatByMinute,menuDisabled:true},
-	    {header : "状态",width : 50,dataIndex : 'status',menuDisabled:true},
-	    {header : "签收人",width : 50,dataIndex : 'receiptor',menuDisabled:true},
-	    {header : "签收时间",width : 100,dataIndex : 'receiptingTime',renderer : myDateFormatByMinute,menuDisabled:true},
-	    {header : "签收",width : 100,dataIndex : '',renderer : showSignBtn,menuDisabled:true}
-	]);
-	
-	var rd = new Ext.data.JsonReader({
-		totalProperty : 'totalProperty',
-		root : 'root'
-	},[
-	 	{name : 'id'},
-	 	{name : 'serialNumber'},
-	 	{name : 'applicant'},
-	 	{name : 'depart'},
-	 	{name : 'sender'},
-	 	{name : 'sendTime'},
-	 	{name : 'status'},
-	 	{name : 'remark'},
-	 	{name : 'receiptor'},
-	 	{name : 'receiptingTime'},
-	 	{name : 'invoiceItems'}
-	]);
-	
-	var invoiceStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/invoiceAction!findInvoices.do',
-			method : 'POST'
-		}),
-		baseParams : { recyclingApplicantId: id },
-		reader : rd
-	});
-	invoiceStore.load();
-	
-	//发货单列表视图
-	invoiceGrid = new top.Ext.grid.EditorGridPanel( {
-		bodyStyle : 'border:1px solid #afd7af',
-		cm : invoiceColumns,
-		store : invoiceStore,
-		plugins: expander,
-		width : 835,
-		height : 400,
-		frame : false,
-		viewConfig: {
-            forceFit:true
-		},
-		border : false,
-		clicksToEdit : 1,// 设置点击几次才可编辑
-		selModel : new top.Ext.grid.RowSelectionModel({
-			singleSelect : false
-		})
-	});
-	
-	expander.on("expand",function(expander,r,body,rowIndex){
-		var record = invoiceStore.getAt(rowIndex);
-		var invoiceID = record.data.id;
-		Ext.Ajax.request( {
-			url : WWWROOT + '/disinfectSystem/invoiceAction!loadRecyclingApplicationByid.do',
-			method : 'GET',
-			params : { id : invoiceID },
-			waitMsg : '正在加载数据，请稍候',
-			success : function(response, options) {
-				var invoiceItems = '';
-				var result = response.responseText;
-				var jsonObject = eval('(' + result + ')');
-				for(var i=0;i<jsonObject.length;i++) {
-					var invoiceItem = jsonObject[i];
-					invoiceItems += '<tr><td>' + invoiceItem.name + '</td>';
-					invoiceItems += '<td>' + invoiceItem.count + '</td></tr>';
-				}
-				record.set('invoiceItems',invoiceItems);
-				record.commit(true);
-				expander.bodyContent[record.id] = expander.tpl.apply(record.data);
-			},
-			failure : function(form, action) {
-			}
-		});
-	});
-	
-	var invoiceWindow = new top.Ext.Window( {
-		id : 'invoiceWin',
-		layout : 'border',
-		title : '发货单列表',
-		width : 850,
-		autoHeight : false,
-		border : false,
-		height:400,
-		plain : true,
-		modal :true,
-		items : [{region:'center',
-		  width: '75%',
-          items:[invoiceGrid]
-        }]
-	});
-	invoiceWindow.show();
-}
 function renderColor(v, p, record){
 	var deliverStatus = record.data['deliverStatus'];
 	var packageStatus = record.data['packageStatus'];
@@ -266,15 +84,6 @@
 	return "<p style=\"background-color:"+color+"\">" + v + "</p>";
 }
 
-function formartTousseName(v,p,reocrd){
-	var index = v.indexOf("_");
-	if(index >= 0){
-		return v.substring(0,index);
-	}else{
-		return v;
-	}
-}
-
 Ext.onReady(function(){
 		Ext.QuickTips.init();
 	var columns = [
@@ -285,7 +94,7 @@
 	    {header : "住院号",width : 70,dataIndex : 'hospitalNumber'},
 	    {header : "病人姓名",width : 60,dataIndex : 'patient'},
 	    {header : "医生",width : 60,dataIndex : 'doctor'},
-	    {header : "外来器械包名称",width : 150,dataIndex : 'tousseName',renderer : formartTousseName}, 
+	    {header : "外来器械包名称",width : 150,dataIndex : 'tousseName'}, 
 	    {header : "手术名称",width : 120,dataIndex : 'surgery'}, 
 	    {header : "包状态",width : 50,dataIndex : 'packageStatus',renderer:renderColor}, 
 	    {header : "发货状态",width : 60,dataIndex : 'deliverStatus',renderer:renderColor},
@@ -296,13 +105,6 @@
 	    	}else{
 	    		return null;
 	    	}
-	    	/*if(invoiceStatus == ''){
-	    		return null;
-	    	}else if(invoiceStatus == '部分签收'){
-	    		return "<img height = '20' src=" + WWWROOT + '/images/btn_enrol.gif'+" onclick=\"searchInvoice('"+record.data.id+"') \">";
-	    	}else{
-	    		return "<img height = '20' src=" + WWWROOT + '/images/btn_draw.gif'+" onclick=\"searchInvoice('"+record.data.id+"') \">";
-	    	}*/
 	    }},
 	    {header : "接收人",width : 60,dataIndex : 'receiveMan'}, 
 	    {header : "接收时间",width : 120,dataIndex : 'receiveTime', renderer : myDateFormatByMinute},
@@ -356,7 +158,7 @@
 		iconCls : 'btn_ext_application_add',
 		hidden : SSTS_ForeignTousseApplication_Create,
 		handler : function() {
-			addAndEditForeignTousseApplication("");
+			openForeignTousseForm("","apply");;
 		}
 	}, '-', {
 		text : '修改',
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.jsp
===================================================================
diff -u -r12331 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 14017)
@@ -1,3 +1,5 @@
+<%@page import="com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication"%>
+<%@page import="com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
@@ -11,6 +13,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript">
 	var SSTS_ForeignTousseApplication_Create = true;
 	<operation:authorize ifAnyGranted="SSTS_ForeignTousseApplication_Create">
@@ -27,23 +30,26 @@
 	
 	//扫描篮筐允许的篮筐状态集合
 	var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
+	
+	var actionType_confirmReceive  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RECEIVE%>';
+	var actionType_confirmRecycle  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RECYCLE%>';
+	var actionType_confirmReturn  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>';
+	
 </script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js" /></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ContainerTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
-<script type="text/javascript" src="${ctx}/ext/treepanel/ColumnNodeUI.js"></script>
-<link rel="stylesheet" type="text/css" href="${ctx}/ext/treepanel/resources/css/column-tree.css" />
-<script type="text/javascript" src="../showTousseImage/showTousseIamge.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/showTousseImage/showTousseIamge.js"></script>
 <script type="text/javascript" src="foreignTousseApplicationView.js"></script>
-<script type="text/javascript" src="foreignTousseApplicationForm.js"></script>
-
-
-<!-- 日期控件引入 -->
-<link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
-<script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js"></script>
+<script type='text/javascript' src="${ctx}/dwr/interface/DataSynchronizationTableManager.js"></script>
 <title>外来器械包申请单</title>
 </head>
 <body>
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r13923 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 13923)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14017)
@@ -2601,7 +2601,7 @@
 	} else if (type==disinfectGoodsApplicationForm){//消毒物品申请单
 		cell = "<a href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==foreignTousseApplicationForm){//外来器械包申请单
-		cell = "<a href=\"#\" onclick=\"addAndEditForeignTousseApplication(" + record.data.id + ");return false;\">" + v + "</a>";
+		cell = "<a href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
 	} else if(type == tousseLeaseApplicationForm){
 		cell = "<a href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
 	} else {
@@ -2932,7 +2932,7 @@
 			iconCls : 'btn_ext_add_customTousse',
 			hidden : SSTS_ForeignTousseApplication_Create,
 			handler : function() {
-				addAndEditForeignTousseApplication("");
+				openForeignTousseForm("","apply");
 			}
 		},{
 			text : '申请自定义器械包',
Fisheye: Tag 14017 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.js
===================================================================
diff -u -r12633 -r14017
--- ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 12633)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 14017)
@@ -56,7 +56,7 @@
 		showResult("一次只能修改一个"+entityName+"！");
 		return false;
 	}
-	addAndEditForeignTousseApplication(records[0].data.id);
+	openForeignTousseForm(records[0].data.id,'recycle');
 }
 
 /**
@@ -65,8 +65,7 @@
  * 页面中需要定义 modify(v,data) 函数
  */
 function modify(v,data){
-	//loadFormData(grid);
-	addAndEditForeignTousseApplication(data.id);
+	openForeignTousseForm(data.id,'recycle');
 }
 
 function formartTousseName(v,p,reocrd){
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r13675 -r14017
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 13675)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 14017)
@@ -504,10 +504,20 @@
 
 var SSTS_InterfereSterilizationRecord_ViewMenu = true;
 <operation:authorize ifAnyGranted="SSTS_InterfereSterilizationRecord_ViewMenu">
-SSTS_InterfereSterilizationRecord_ViewMenu = false;
+	SSTS_InterfereSterilizationRecord_ViewMenu = false;
 </operation:authorize>
+
+var SSTS_InterfereRecyclingApplication_ViewMenu = true;
+<operation:authorize ifAnyGranted="SSTS_InterfereRecyclingApplication_ViewMenu">
+	SSTS_InterfereRecyclingApplication_ViewMenu = false;
+</operation:authorize>
+
+var SSTS_InterfereForeigntousseApplication_ViewMenu = true;
+<operation:authorize ifAnyGranted="SSTS_InterfereForeigntousseApplication_ViewMenu">
+	SSTS_InterfereForeigntousseApplication_ViewMenu = false;
+</operation:authorize>
 //干预管理模块
-var SSTS_InterfereManagerView = SSTS_InterfereSterilizationRecord_ViewMenu;
+var SSTS_InterfereManagerView = SSTS_InterfereSterilizationRecord_ViewMenu && SSTS_InterfereRecyclingApplication_ViewMenu && SSTS_InterfereForeigntousseApplication_ViewMenu;
 
 var SSTS_ReturnGoodsRecord_Menu = true;
 <operation:authorize ifAnyGranted="SSTS_ReturnGoodsRecord_Create,SSTS_ReturnGoodsRecord_Update,SSTS_ReturnGoodsRecord_Select,SSTS_ReturnGoodsRecord_Delete,SSTS_ReturnGoodsRecord_Sign">
Fisheye: Tag 14017 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationForm.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r14003 -r14017
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14003)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14017)
@@ -719,6 +719,21 @@
 			temp.put("isThereIdentificationCard", isThereIdCard);
 			temp.put("suppler", tousseDefinition.getSupplierName());
 			temp.put("includeImplant", tousseDefinition.getIncludeImplant());
+			if(TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tousseDefinition.getTousseType())){
+				List<MaterialInstance> materialInstances = tousseDefinition.getMaterialInstances();
+				if(materialInstances != null){
+					JSONArray materilas = new JSONArray();
+					for (MaterialInstance materialInstance : materialInstances) {
+						JSONObject obj = new JSONObject();
+						obj.put("id", materialInstance.getId());
+						obj.put("materialName", materialInstance.getMaterialName());
+						obj.put("amount", materialInstance.getCount());
+						obj.put("includeImplant", materialInstance.getIncludeImplant());
+						materilas.add(obj);
+					}
+					temp.put("materials", materilas);
+				}
+			}
 			mapList.add(temp);
 		}
 		Map<String, Object> map = new HashMap<String, Object>();