Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33431 -r33475
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33431)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33475)
@@ -23,21 +23,21 @@
 var idCardTaskNode = null;
 var MATERIAL_NAME_IDCARD = "器械包标识牌";
 var packingBtnText = "装配并打印标签";
-if(sstsConfig.printLabelWhenSterilizing  == true){
+if (sstsConfig.printLabelWhenSterilizing == true) {
 	packingBtnText = "装配无菌物品";
 }
-if (sstsConfig.printLabelWhenReviewing == true && !sstsConfig.printLabelWhenSterilizing){
+if (sstsConfig.printLabelWhenReviewing == true && !sstsConfig.printLabelWhenSterilizing) {
 	packingBtnText = "装配无菌物品";
 }
 var inspectorName = "检查人";
-if(sstsConfig.aliasNameOfInspectorField){
+if (sstsConfig.aliasNameOfInspectorField) {
 	inspectorName = sstsConfig.aliasNameOfInspectorField;
 }
 
 var reviewViewText;
-if(sstsConfig.nameSchemeOfReviewModule == 2){
+if (sstsConfig.nameSchemeOfReviewModule == 2) {
 	reviewViewText = "包装";
-}else{
+} else {
 	reviewViewText = "审核";
 }
 
@@ -47,7 +47,7 @@
 
 //SZSDSRMYY-54
 var responsibilityPart = '清洗消毒'
-if(sstsConfig.defaultResponsibilityPartInPackingModule){
+if (sstsConfig.defaultResponsibilityPartInPackingModule) {
 	responsibilityPart = sstsConfig.defaultResponsibilityPartInPackingModule;
 }
 
@@ -64,54 +64,54 @@
 var filterDepartmentsWithoutToussesStore = new Ext4.data.Store({
 	//limit参数，每页显示条数，默认为25
 	pageSize: isIE6OrIE7 ? 15 : 50,
-	autoLoad:false,
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/packingAction!filterDepartmentsWithoutTousses.do',
-		reader : {
-			type : 'json',
-			totalProperty : 'totalCount',
-			root : 'data'
+	autoLoad: false,
+	proxy: {
+		type: 'ajax',
+		url: WWWROOT + '/disinfectSystem/packingAction!filterDepartmentsWithoutTousses.do',
+		reader: {
+			type: 'json',
+			totalProperty: 'totalCount',
+			root: 'data'
 		},
-		actionMethods: {  
-            create : 'POST',  
-            read   : 'POST', // by default GET  
-            update : 'POST',  
-            destroy: 'POST'  
-        }
+		actionMethods: {
+			create: 'POST',
+			read: 'POST', // by default GET  
+			update: 'POST',
+			destroy: 'POST'
+		}
 	},
-	fields : [
-	    {name : 'id',mapping : 'id'},
-	    {name : 'name',mapping : 'name'}
+	fields: [
+		{ name: 'id', mapping: 'id' },
+		{ name: 'name', mapping: 'name' }
 	]
 });
 var appDepartJsonStore = new Ext4.data.Store({
-	autoLoad:false,
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
-		reader : {
-			type : 'json',
-			totalProperty : 'totalCount',
-			root : 'data'
+	autoLoad: false,
+	proxy: {
+		type: 'ajax',
+		url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
+		reader: {
+			type: 'json',
+			totalProperty: 'totalCount',
+			root: 'data'
 		}
 	},
-	fields : [
-	    {name : 'id',mapping : 'id'},
-	    {name : 'name',mapping : 'name'}
+	fields: [
+		{ name: 'id', mapping: 'id' },
+		{ name: 'name', mapping: 'name' }
 	],
-	listeners:{
-		beforeload : function( store, options ){
+	listeners: {
+		beforeload: function (store, options) {
 			var departmentGroupOption = top.Ext4.getCmp('departmentGroupOption');
-			if(departmentGroupOption){
-				var departmentGroupOptionName = (departmentGroupOption.getValue() == '全部')?'':departmentGroupOption.getValue();
+			if (departmentGroupOption) {
+				var departmentGroupOptionName = (departmentGroupOption.getValue() == '全部') ? '' : departmentGroupOption.getValue();
 				store.proxy.extraParams.departmentGroupOptionType = '审核科室分组';
 				store.proxy.extraParams.limit = '';
 				store.proxy.extraParams.departmentGroupOptionName = departmentGroupOptionName;
 			}
 		},
-		load:function(store){
-			if(store.data.keys.length > 0){
+		load: function (store) {
+			if (store.data.keys.length > 0) {
 				filterDepartmentsWithoutToussesStore.proxy.extraParams.departCodes = store.data.keys.join(';');
 				filterDepartmentsWithoutToussesStore.load();
 			}
@@ -120,112 +120,112 @@
 });
 //申请科室Store
 var appDepartJsonStoreExt2 = new Ext4.data.Store({
-	proxy : new Ext4.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
-		method : 'POST'
+	proxy: new Ext4.data.HttpProxy({
+		url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
+		method: 'POST'
 	}),
-	reader : new Ext4.data.JsonReader({
-		root : 'data'
-	},[
-	    {name : 'id',mapping : 'id'}, 
-	    {name : 'name',mapping : 'name'}
-	  ]
+	reader: new Ext4.data.JsonReader({
+		root: 'data'
+	}, [
+		{ name: 'id', mapping: 'id' },
+		{ name: 'name', mapping: 'name' }
+	]
 	)
 });
 //结算科室Store
 var departJsonStoreExt2 = new Ext4.data.Store({
-	proxy : new Ext4.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
-		method : 'POST'
+	proxy: new Ext4.data.HttpProxy({
+		url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
+		method: 'POST'
 	}),
-	reader : new Ext4.data.JsonReader({
-		root : 'data'
-	},[
-	    {name : 'id',mapping : 'id'}, 
-	    {name : 'name',mapping : 'name'}
-	  ]
+	reader: new Ext4.data.JsonReader({
+		root: 'data'
+	}, [
+		{ name: 'id', mapping: 'id' },
+		{ name: 'name', mapping: 'name' }
+	]
 	)
 });
-function reflushWaitPackingTreeGrid(){
+function reflushWaitPackingTreeGrid() {
 	var tabTitle = parent.currentActiveTabTitle;
-	var taskGroup = getURLParameter("taskGroup","") + "装配";
+	var taskGroup = getURLParameter("taskGroup", "") + "装配";
 	// 只有当装配界面是处于活动的Tab时，才刷新，以避免刷新后的界面为空白的问题
-//	alert(tabTitle+','+taskGroup)
-	if (tabTitle == taskGroup){
+	//	alert(tabTitle+','+taskGroup)
+	if (tabTitle == taskGroup) {
 		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-		if (waitPackingTreeGrid != null && waitPackingTreeGrid.isVisible() == true){
+		if (waitPackingTreeGrid != null && waitPackingTreeGrid.isVisible() == true) {
 			waitPackingTreeGrid.getStore().reload();
 		}
 	}
 
 	getErrorAndDamgeCount();
 }
 
-function reflushWaitPackingTreeGridImmediately(){
+function reflushWaitPackingTreeGridImmediately() {
 	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	if (waitPackingTreeGrid != null && waitPackingTreeGrid.isVisible() == true){
+	if (waitPackingTreeGrid != null && waitPackingTreeGrid.isVisible() == true) {
 		waitPackingTreeGrid.getStore().reload();
 	}
 }
 
-function getErrorAndDamgeCount(){
+function getErrorAndDamgeCount() {
 	Ext4.Ajax.request({
-		url : WWWROOT + '/disinfectSystem/packingAction!getErrorAndDamageCount.do',
-		success : function(response, options) {
+		url: WWWROOT + '/disinfectSystem/packingAction!getErrorAndDamageCount.do',
+		success: function (response, options) {
 			var result = Ext4.decode(response.responseText);
-			Ext4.getCmp("addErrorMaterial").setText("补充丢失器械(<span style=\"color:red;font-weight: bold;font-size: 12px;\">"+result.errorCount+"</span>)");
-			Ext4.getCmp("addDamageMaterial").setText("补充报损器械(<span style=\"color:red;font-weight: bold;font-size: 12px;\">"+result.damageCount+"</span>)");
+			Ext4.getCmp("addErrorMaterial").setText("补充丢失器械(<span style=\"color:red;font-weight: bold;font-size: 12px;\">" + result.errorCount + "</span>)");
+			Ext4.getCmp("addDamageMaterial").setText("补充报损器械(<span style=\"color:red;font-weight: bold;font-size: 12px;\">" + result.damageCount + "</span>)");
 		},
-		failure : function(response, options) {
+		failure: function (response, options) {
 			var result = Ext4.decode(response.responseText);
-			showResult(result.cause , null , sstsConfig.messagePauseTimeOnPackingPage);
+			showResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage);
 		}
 	});
 }
 
-function reflushGrid(){
+function reflushGrid() {
 	Ext4.getCmp('basketTreeGrid').getStore().reload();
 	reflushWaitPackingTreeGrid();
 	getErrorAndDamgeCount();
 }
 
-function checkedAllNode(checked){
+function checkedAllNode(checked) {
 	var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode();
-	if(rootNode != null){
+	if (rootNode != null) {
 		var count = 0;
-		Ext4.each(rootNode.childNodes, function(pNode){
-			pNode.set('checked',checked);
-			if(checked){
+		Ext4.each(rootNode.childNodes, function (pNode) {
+			pNode.set('checked', checked);
+			if (checked) {
 				count++
-			}else {
+			} else {
 				count = 0
 			}
-			if(pNode.childNodes && pNode.childNodes.length > 0){
-				Ext4.each(pNode.childNodes, function(lastNode){
-					lastNode.set('checked',checked)
+			if (pNode.childNodes && pNode.childNodes.length > 0) {
+				Ext4.each(pNode.childNodes, function (lastNode) {
+					lastNode.set('checked', checked)
 				});
 			}
 		});
-		if(count <= 1){
+		if (count <= 1) {
 			Ext4.getCmp('sterilingType').enable();
 			Ext4.getCmp('packageType').enable();
-	   }else {
+		} else {
 			Ext4.getCmp('sterilingType').disable();
 			Ext4.getCmp('packageType').disable();
-	   }
+		}
 	}
-	
+
 	Ext4.getCmp('basketTreeGrid').getView().refresh();
 }
 
-function checkAllWaitPackingTaskNode(checked){
+function checkAllWaitPackingTaskNode(checked) {
 	var rootNode = Ext4.getCmp('waitPackingTreeGrid').getRootNode();
-	if(rootNode != null){
-		Ext4.each(rootNode.childNodes, function(pNode){
-			pNode.set('checked',checked);
-			if(pNode.childNodes && pNode.childNodes.length > 0){
-				Ext4.each(pNode.childNodes, function(lastNode){
-					lastNode.set('checked',checked)
+	if (rootNode != null) {
+		Ext4.each(rootNode.childNodes, function (pNode) {
+			pNode.set('checked', checked);
+			if (pNode.childNodes && pNode.childNodes.length > 0) {
+				Ext4.each(pNode.childNodes, function (lastNode) {
+					lastNode.set('checked', checked)
 				});
 			}
 		});
@@ -234,51 +234,51 @@
 }
 
 //配包教学视频
-function watchVideoModel(objectId){
+function watchVideoModel(objectId) {
 	if (objectId !== '') {
 		var params = {
 			objectId: objectId
 		}
 		openModalWindowForExt(WWWROOT + "/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp", params, "配包教学视频", "800", "390");
-	}else {
-		showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage);
+	} else {
+		showResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage);
 	}
 }
 
-function additionalMaterialCallback(success,type,packingTaskId){
-	if(packingTaskId != ""){
+function additionalMaterialCallback(success, type, packingTaskId) {
+	if (packingTaskId != "") {
 		var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode();
-		rootNode.cascade(function(n) {
-			if(n.get('leaf') && n.get('taskId') == packingTaskId){
-				if(type == type_lost){
-					n.set('errors',new Array());
-				}else{
-					n.set('damages',new Array());
+		rootNode.cascade(function (n) {
+			if (n.get('leaf') && n.get('taskId') == packingTaskId) {
+				if (type == type_lost) {
+					n.set('errors', new Array());
+				} else {
+					n.set('damages', new Array());
 				}
 				//广东省人民医院珠海医院GDSRMYZHYY-15,装配页面丢失器械补充完成后物品黄色底色没有消失
-				if(n.get('errors') == "" && n.get('damages') == ""){
-					n.set('replenishMaterils',false);
+				if (n.get('errors') == "" && n.get('damages') == "") {
+					n.set('replenishMaterils', false);
 					var nodes = n.parentNode.childNodes;
-					if(nodes.length > 0){
+					if (nodes.length > 0) {
 						var flag = true;
-						Ext4.Array.each(nodes, function(node){
+						Ext4.Array.each(nodes, function (node) {
 							var replenishMaterils = node.get("replenishMaterils");
-							if(replenishMaterils == true){
+							if (replenishMaterils == true) {
 								flag = false;
 								return true;
 							}
 						})
-						
-						if(flag){
-							n.parentNode.set("replenishMaterils",false);
+
+						if (flag) {
+							n.parentNode.set("replenishMaterils", false);
 						}
 					}
 				}
-				if(n.get('errors') == ""){
+				if (n.get('errors') == "") {
 					Ext4.getCmp('remark').setValue('');
 					Ext4.getCmp('errorMaterialsTip').setValue('');
 					Ext4.getCmp('errorRemark').setValue('');
-				}else {
+				} else {
 					Ext4.getCmp('remark').setValue('');
 					Ext4.getCmp('damageMaterialsTip').setValue('');
 					Ext4.getCmp('damageRemark').setValue('');
@@ -290,6027 +290,6031 @@
 	}
 	clearInputedIDCardInfo();
 }
-function clearInputedIDCardInfo(){
+function clearInputedIDCardInfo() {
 	idCardBarcode = '';
 	idCardInstanceID = '';
 	idCardInfo = null;
 	idCardTaskNode = null;
 	Ext4.getCmp('idCardBarcode').setValue();
 	Ext4.getCmp('idCardName').setValue();
 	Ext4.getCmp('idCardUseAmount').setValue();
-	
+
 	showOrHideErrorAndDamageBtn();
 }
-function showOrHideErrorAndDamageBtn(){
-	if(!idCardTaskNode){
+function showOrHideErrorAndDamageBtn() {
+	if (!idCardTaskNode) {
 		hideErrorAndDamageBtn();
 		return;
 	}
-    if(haveLost(idCardTaskNode)){
-    	Ext4.getCmp('lostBtn').show();
-    }else{
-    	Ext4.getCmp('lostBtn').hide();
-    }
-    if(haveDamages(idCardTaskNode)){
-    	Ext4.getCmp('damageBtn').show();
-    }else{
-    	Ext4.getCmp('damageBtn').hide();
-    }
+	if (haveLost(idCardTaskNode)) {
+		Ext4.getCmp('lostBtn').show();
+	} else {
+		Ext4.getCmp('lostBtn').hide();
+	}
+	if (haveDamages(idCardTaskNode)) {
+		Ext4.getCmp('damageBtn').show();
+	} else {
+		Ext4.getCmp('damageBtn').hide();
+	}
 }
-function haveLost(record){
+function haveLost(record) {
 	var supplent = true;
-    var errors = record.get('errors');
-    for(var i = 0;i < errors.length ; i++) {
-        if(errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
-            supplent = false;
-        }
-    }
-    if(!supplent){
-    	return true;
-    }
-    return false;
+	var errors = record.get('errors');
+	for (var i = 0; i < errors.length; i++) {
+		if (errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
+			supplent = false;
+		}
+	}
+	if (!supplent) {
+		return true;
+	}
+	return false;
 }
-function haveDamages(record){
-    var damages = record.get('damages');
-    if(damages.length > 0){
-    	return true;
-    }
-    return false;
+function haveDamages(record) {
+	var damages = record.get('damages');
+	if (damages.length > 0) {
+		return true;
+	}
+	return false;
 }
-function showErrorAndDamageBtn(){
+function showErrorAndDamageBtn() {
 	Ext4.getCmp('lostBtn').show();
-    Ext4.getCmp('damageBtn').show();
+	Ext4.getCmp('damageBtn').show();
 }
-function hideErrorAndDamageBtn(){
+function hideErrorAndDamageBtn() {
 	Ext4.getCmp('lostBtn').hide();
-    Ext4.getCmp('damageBtn').hide();
+	Ext4.getCmp('damageBtn').hide();
 }
 
-function addTaskNode(params){
+function addTaskNode(params) {
 	var leaf = false;
-	if(params.taskId != ''){
+	if (params.taskId != '') {
 		leaf = true;
 	}
 
 	var newParams = params;
 
 	newParams.tousseType = params.tousseType1;
-	var node = Ext4.create('cModel',newParams);
-	node.set("checked" ,false);
+	var node = Ext4.create('cModel', newParams);
+	node.set("checked", false);
 	return node;
 }
 
-Ext4.onReady(function() {
+Ext4.onReady(function () {
 	taskGroupObj = getTaskGroupObjByName(taskGroup);
-	packingPageAutoSetSterilizationProgramAfterSelectTousse = getBoolValueFromJs('sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse',true);
-	allowForeignToussePartiallyPacking = getBoolValueFromJs('sstsConfig.allowForeignToussePartiallyPacking',false);
+	packingPageAutoSetSterilizationProgramAfterSelectTousse = getBoolValueFromJs('sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse', true);
+	allowForeignToussePartiallyPacking = getBoolValueFromJs('sstsConfig.allowForeignToussePartiallyPacking', false);
 	Ext4.QuickTips.init();
 	Ext4.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
 
 	Ext4.tip.QuickTipManager.init();
 	Ext4.apply(Ext4.tip.QuickTipManager.getQuickTip(), {
-	    dismissDelay: 0,
-	    showDelay: 0
+		dismissDelay: 0,
+		showDelay: 0
 	});
-	
+
 	top.Ext4.tip.QuickTipManager.init();
 	top.Ext4.apply(top.Ext4.tip.QuickTipManager.getQuickTip(), {
-	    dismissDelay: 0,
-	    showDelay: 0
+		dismissDelay: 0,
+		showDelay: 0
 	});
-	
+
 	Ext4.define('packingRecordData', {
-	    extend: 'Ext4.data.Model',
-	    fields: [
-	           {name: 'id',type: "int" },
-	           {name: 'packTimeStr'},
-			   {name: 'sterilingMode'},
-	           {name: 'orgUnitName'},
-	           {name: 'depart'},
-	           {name: 'packer'},
-	           {name: 'tousseName'},
-			   {name: 'inspector'},
-	           {name: 'reviewer'},
-	           {name: 'supplierName'},
-			   {name: 'doctor'},
-			   {name: 'packageType'},
-	           {name: 'foreignMaterialsAmount'},
-	           {name: 'splitTousseName'},
-			   {name: 'isTran'},
-	           {name: 'amount'}
-	    ]
+		extend: 'Ext4.data.Model',
+		fields: [
+			{ name: 'id', type: "int" },
+			{ name: 'packTimeStr' },
+			{ name: 'sterilingMode' },
+			{ name: 'orgUnitName' },
+			{ name: 'depart' },
+			{ name: 'packer' },
+			{ name: 'tousseName' },
+			{ name: 'inspector' },
+			{ name: 'reviewer' },
+			{ name: 'supplierName' },
+			{ name: 'doctor' },
+			{ name: 'packageType' },
+			{ name: 'foreignMaterialsAmount' },
+			{ name: 'splitTousseName' },
+			{ name: 'isTran' },
+			{ name: 'amount' }
+		]
 	});
 	var readerDetail = [
-	           {name: 'id',type: "int" },
-	           {name: 'packTimeStr'},
-			   {name: 'sterilingMode'},
-	           {name: 'orgUnitName'},
-	           {name: 'depart'},
-	           {name: 'packer'},
-			   {name: 'inspector'},
-			   {name: 'wrapper'},
-			   {name: 'sterileUser'},
-	           {name: 'tousseName'},
-	           {name: 'reviewer'},
-	           {name: 'supplierName'},
-			   {name: 'doctor'},
-			   {name: 'packageType'},
-			   {name: 'isTran'},
-	           {name: 'foreignMaterialsAmount'},
-	           {name: 'splitTousseName'},
-			   {name: 'patient'},
-	           {name: 'amount'}
-       	];
-	           	
-   	var filters = new Ext.grid.GridFilters({
-   		filters:[
-   			{type: 'string',  dataIndex: 'reviewer'}
-   		]
-   	});
+		{ name: 'id', type: "int" },
+		{ name: 'packTimeStr' },
+		{ name: 'sterilingMode' },
+		{ name: 'orgUnitName' },
+		{ name: 'depart' },
+		{ name: 'packer' },
+		{ name: 'inspector' },
+		{ name: 'wrapper' },
+		{ name: 'sterileUser' },
+		{ name: 'tousseName' },
+		{ name: 'reviewer' },
+		{ name: 'supplierName' },
+		{ name: 'doctor' },
+		{ name: 'packageType' },
+		{ name: 'isTran' },
+		{ name: 'foreignMaterialsAmount' },
+		{ name: 'splitTousseName' },
+		{ name: 'patient' },
+		{ name: 'amount' }
+	];
 
-	 //是否一级供应室用户
+	var filters = new Ext.grid.GridFilters({
+		filters: [
+			{ type: 'string', dataIndex: 'reviewer' }
+		]
+	});
+
+	//是否一级供应室用户
 	var isFirstRoomPeople = false;
 	DWREngine.setAsync(false);
 	//验证当前登录用户属于一级供应室还是二级供应室
-	UserTableManager.checkForSupplyType(function(data){
+	UserTableManager.checkForSupplyType(function (data) {
 		var result = Ext.decode(data);
-		if(result.result){//一级供应室
+		if (result.result) {//一级供应室
 			isFirstRoomPeople = true;
-		}else{//二级供应室
+		} else {//二级供应室
 			isFirstRoomPeople = false;
 		}
 	});
 	DWREngine.setAsync(true);
-   	
-   var	columns =[
-			{header: '科室', dataIndex: 'depart',width: 200,sortable:false}, 
-			{header: '供应商', dataIndex: 'supplierName',width: 150,sortable:false},
-			{header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName,sortable:false},
-			{header: '拆包名称', dataIndex: 'splitTousseName',width: 200,sortable:false},
-			{header: '数量', dataIndex: 'amount',sortable:false},
-			{header: '配包人', dataIndex: 'packer',sortable:false},
-			{header: ''+reviewViewText+'人', dataIndex: 'reviewer',width: 100,hidden:sstsConfig.hideReviewerField,sortable:false},
-			{header: '包装人', dataIndex: 'wrapper',width: 100,hidden:!sstsConfig.showWrapperField,sortable:false},
-			{header: inspectorName, dataIndex: 'inspector',hidden:!sstsConfig.showInspectorField,sortable:false},
-			{header: '灭菌人', dataIndex: 'sterileUser',hidden:!sstsConfig.showSterileField,sortable:false},
-			{header: '包装类型', dataIndex: 'packageType',sortable:false},
-			{header: '装配时间', dataIndex: 'packTimeStr',width: 150},
-			{header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople),sortable:false},
-			{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople),sortable:false},
-			{header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200,sortable:false},
-			{header: '医生', dataIndex: 'doctor',width: 100,sortable:false},
-			{header: '患者姓名', dataIndex: 'patient',width: 100,sortable:false}
-			]
-	
-    var packingRecordStore = Ext4.create('Ext4.data.Store', {
-        //分页大小
-        pageSize: 20,
-        model: 'packingRecordData',
-        proxy: {
-            type: 'ajax',
-            url: WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do',
-            extraParams : {taskGroup : taskGroup},
-            reader: { root: 'items', totalProperty: 'total' }
-        },
-        sorters: [{
-            property: 'id',
-            direction: 'desc'
-        }]
-    })
-    function getParamsJsonObj(exports){
-	   if(Ext4.getCmp('startTimeSearch') == null){
+
+	var columns = [
+		{ header: '科室', dataIndex: 'depart', width: 200, sortable: false },
+		{ header: '供应商', dataIndex: 'supplierName', width: 150, sortable: false },
+		{ header: '器械包', dataIndex: 'tousseName', width: 200, renderer: filterUnderScoreName, sortable: false },
+		{ header: '拆包名称', dataIndex: 'splitTousseName', width: 200, sortable: false },
+		{ header: '数量', dataIndex: 'amount', sortable: false },
+		{ header: '配包人', dataIndex: 'packer', sortable: false },
+		{ header: '' + reviewViewText + '人', dataIndex: 'reviewer', width: 100, hidden: sstsConfig.hideReviewerField, sortable: false },
+		{ header: '包装人', dataIndex: 'wrapper', width: 100, hidden: !sstsConfig.showWrapperField, sortable: false },
+		{ header: inspectorName, dataIndex: 'inspector', hidden: !sstsConfig.showInspectorField, sortable: false },
+		{ header: '灭菌人', dataIndex: 'sterileUser', hidden: !sstsConfig.showSterileField, sortable: false },
+		{ header: '包装类型', dataIndex: 'packageType', sortable: false },
+		{ header: '装配时间', dataIndex: 'packTimeStr', width: 150 },
+		{ header: '灭菌方式', dataIndex: 'sterilingMode', width: 120, hidden: !(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople), sortable: false },
+		{ header: '已生成代理灭菌单', dataIndex: 'isTran', width: 120, hidden: !(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople), sortable: false },
+		{ header: '材料汇总', dataIndex: 'foreignMaterialsAmount', width: 200, sortable: false },
+		{ header: '医生', dataIndex: 'doctor', width: 100, sortable: false },
+		{ header: '患者姓名', dataIndex: 'patient', width: 100, sortable: false }
+	]
+
+	var packingRecordStore = Ext4.create('Ext4.data.Store', {
+		//分页大小
+		pageSize: 20,
+		model: 'packingRecordData',
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do',
+			extraParams: { taskGroup: taskGroup },
+			reader: { root: 'items', totalProperty: 'total' }
+		},
+		sorters: [{
+			property: 'id',
+			direction: 'desc'
+		}]
+	})
+	function getParamsJsonObj(exports) {
+		if (Ext4.getCmp('startTimeSearch') == null) {
 			return {
-				taskGroup : taskGroup
+				taskGroup: taskGroup
 			};
 		}
-    	var tousseName = Ext4.getCmp('tousseName').getValue();
+		var tousseName = Ext4.getCmp('tousseName').getValue();
 		var orgUnit = Ext4.getCmp('orgUnit').getValue();
 		var barcode = Ext4.getCmp('scanTousseBarcode').getValue();
 		var q_packer = Ext4.getCmp('q_packer').getValue();
 		var startTimeSearch = Ext4.getCmp('startTimeSearch').getRawValue();
-    	var endTimeSearch = Ext4.getCmp('endTimeSearch').getRawValue();
+		var endTimeSearch = Ext4.getCmp('endTimeSearch').getRawValue();
 		var direction = Ext4.getCmp('direction').getValue();
-    	
+
 		var params = {
 			tousseName: tousseName,
 			orgUnit: orgUnit,
 			tousseBarcode: barcode,
 			packer: q_packer,
 			startTimeSearch: startTimeSearch,
 			endTimeSearch: endTimeSearch,
-			direction:direction
+			direction: direction
 		}
-		if(exports){
+		if (exports) {
 			params.taskGroups = taskGroup;
-		}else {
+		} else {
 			params.taskGroup = taskGroup;
 		}
 		return params;
-    }
+	}
 
-	function reloadReport(){
+	function reloadReport() {
 		var jasperreportName = 'packingRecordReport.jasper';
 		var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSourceForOnlyPrint.do';
-	
+
 		var params = getParamsJsonObj(true);
 		params.jasperreportName = jasperreportName;
 		params.reportName = 'packingRecordReport';
 		params.queryToday = true;
-		searchReport(url,params);
+		searchReport(url, params);
 	}
-	
+
 	//定时器，查询后导出
-	function timeOut(){
-		var time = setTimeout(function(){
+	function timeOut() {
+		var time = setTimeout(function () {
 			var html = document.getElementById('thisIframe').contentWindow.document.body.innerHTML;
-			if(html.indexOf('table') > -1){
+			if (html.indexOf('table') > -1) {
 				clearTimeout(time);
 				location.href = WWWROOT + "/jasperRtp/exportReport.jsp";
-			}else {
+			} else {
 				timeOut();
 			}
 		}, 1000);
 	}
-   
-   function isQueryParamsValid(){
+
+	function isQueryParamsValid() {
 		var startTimeSearchCmp = Ext4.getCmp('startTimeSearch');
 		var endTimeSearchCmp = Ext4.getCmp('endTimeSearch');
-		if(startTimeSearchCmp == null){
+		if (startTimeSearchCmp == null) {
 			return true;
 		}
 		var startTimeSearch = Ext4.getCmp('startTimeSearch').getValue();
 		var endTimeSearch = Ext4.getCmp('endTimeSearch').getValue();
-		if(!startTimeSearchCmp.isValid()){
-			showResult('开始时间格式不对!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		if (!startTimeSearchCmp.isValid()) {
+			showResult('开始时间格式不对!', null, sstsConfig.messagePauseTimeOnPackingPage);
 			return false;
 		}
-		if(!endTimeSearchCmp.isValid()){
-			showResult('结束时间格式不对!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		if (!endTimeSearchCmp.isValid()) {
+			showResult('结束时间格式不对!', null, sstsConfig.messagePauseTimeOnPackingPage);
 			return false;
 		}
-		if(!isUndefinedOrNullOrEmpty(startTimeSearch) && !isUndefinedOrNullOrEmpty(endTimeSearch)){
-			if(startTimeSearch > endTimeSearch){
-				showResult('开始时间不能大于结束时间!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		if (!isUndefinedOrNullOrEmpty(startTimeSearch) && !isUndefinedOrNullOrEmpty(endTimeSearch)) {
+			if (startTimeSearch > endTimeSearch) {
+				showResult('开始时间不能大于结束时间!', null, sstsConfig.messagePauseTimeOnPackingPage);
 				return false;
 			}
 		}
 		return true;
-   }
-    function initQueryValueAndReload() {
-    	if(!isQueryParamsValid()){
-    		return;
-    	}
-    	var store = Ext4.getCmp("todayHisPackingRecordPanel").getStore();    	
-    	store.reload();
-//		packingRecordStore .load({
-//			params: getParamsJsonObj()});
 	}
+	function initQueryValueAndReload() {
+		if (!isQueryParamsValid()) {
+			return;
+		}
+		var store = Ext4.getCmp("todayHisPackingRecordPanel").getStore();
+		store.reload();
+		//		packingRecordStore .load({
+		//			params: getParamsJsonObj()});
+	}
 
-// 从树种查找标识牌的装配任务
-function findIDCardPackingTask(store,idCard){
-	var existTask = false;
-	var taskList = idCard.packingTaskInfo;
-	var rootNode = store.getRootNode();
-	rootNode.eachChild(function(node){
-		if (!node.isLeaf()){
-		node.eachChild(function(node2){
-			var taskID = node2.get('taskId');
-			if(!isUndefinedOrNullOrEmpty(taskList)){
-				for(var i=0;i<taskList.length;++i){
-					if(taskList[i].id == taskID){
-						existTask = true;
-						idCardTaskNode = node2;
-						return false;
+	// 从树种查找标识牌的装配任务
+	function findIDCardPackingTask(store, idCard) {
+		var existTask = false;
+		var taskList = idCard.packingTaskInfo;
+		var rootNode = store.getRootNode();
+		rootNode.eachChild(function (node) {
+			if (!node.isLeaf()) {
+				node.eachChild(function (node2) {
+					var taskID = node2.get('taskId');
+					if (!isUndefinedOrNullOrEmpty(taskList)) {
+						for (var i = 0; i < taskList.length; ++i) {
+							if (taskList[i].id == taskID) {
+								existTask = true;
+								idCardTaskNode = node2;
+								return false;
+							}
+						}
 					}
+				});
+				if (existTask) {
+					return false;
 				}
 			}
-		}); 
-		if(existTask){
-			return false;
-		}}
-	});
-	return existTask;
-}
-function uncheckAllExceptCurrentIDCardPackingTask(){
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	Ext4.each(basketTree.getView().getChecked(), function(pNode){
-		if(pNode.childNodes.length !== 1 && idCardTaskNode.get('tousseName') != pNode.get('tousseName')){
-			pNode.set("checked", false);
-		}
-	});
-	Ext4.each(waitPackingTreeGrid.getView().getChecked(), function(pNode){
-		if(idCardTaskNode.get('tousseName') != pNode.get('tousseName')){
-			pNode.set("checked", false);
-		}
-	});
-}
+		});
+		return existTask;
+	}
+	function uncheckAllExceptCurrentIDCardPackingTask() {
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		Ext4.each(basketTree.getView().getChecked(), function (pNode) {
+			if (pNode.childNodes.length !== 1 && idCardTaskNode.get('tousseName') != pNode.get('tousseName')) {
+				pNode.set("checked", false);
+			}
+		});
+		Ext4.each(waitPackingTreeGrid.getView().getChecked(), function (pNode) {
+			if (idCardTaskNode.get('tousseName') != pNode.get('tousseName')) {
+				pNode.set("checked", false);
+			}
+		});
+	}
 
-/**
- * 根据灭菌程序设置灭菌方式的值
- * @sterilingType 灭菌程序
- */
-function setSterilingModeValueBySterilingType(sterilingType){
-	Ext4.getCmp('sterilingMode').setValue("");
-	Ext4.Ajax.request({
-		url : WWWROOT + "/disinfectSystem/baseData/sterilisationAction!getSterilizationModeBySterilingType.do",
-		method : "post",
-		params : {"sterilingType" : sterilingType},
-		success : function(response){
-			var result = Ext4.decode(response.responseText);
-			if(result && result.sterilingMode){
-				Ext4.getCmp('sterilingMode').setValue(result.sterilingMode);
+	/**
+	 * 根据灭菌程序设置灭菌方式的值
+	 * @sterilingType 灭菌程序
+	 */
+	function setSterilingModeValueBySterilingType(sterilingType) {
+		Ext4.getCmp('sterilingMode').setValue("");
+		Ext4.Ajax.request({
+			url: WWWROOT + "/disinfectSystem/baseData/sterilisationAction!getSterilizationModeBySterilingType.do",
+			method: "post",
+			params: { "sterilingType": sterilingType },
+			success: function (response) {
+				var result = Ext4.decode(response.responseText);
+				if (result && result.sterilingMode) {
+					Ext4.getCmp('sterilingMode').setValue(result.sterilingMode);
+				}
 			}
-		}
-	});
-}
+		});
+	}
 
-/**
- * 扫描条码(清洗篮筐条码或标识牌条码)
- * @param tempBarcode 条码
- * @param manualScan 扫标识牌条码时传true,篮筐条码传false
- */
-function loadIdCardByBarcode(tempBarcode,manualScan,autoSetIDCardBarcodeForPacking){
-    var barcode = tempBarcode;
-    PackingTableManager.getIDCardInfoForPackingView(barcode,function(resultJsonStr){
-    	var result = JSON.parse(resultJsonStr);
-    	if(isUndefinedOrNullOrEmpty(result.errorMsg)){
-    		barcode = result.idCard.barcode;
-    		var tousseName = result.idCard.tousseDefinition.name;
-    		var taskList = result.idCard.packingTaskInfo;
-			var existTask = findIDCardPackingTask(basketStore,result.idCard);
-    		// 在待装配任务里面选择标识牌的包可以装配
-    		if(!existTask){
-    			existTask = findIDCardPackingTask(waitPackingTaskStore,result.idCard);
-    		}
-    		
-    		if(!existTask){
-    			if(taskList.length > 0){
-        			// 后台有装配任务，前台没有，那么先刷新待装配任务列表
-        			var lastOptions = waitPackingTaskStore.lastOptions;
-        			lastOptions = Ext4.clone(lastOptions);
-        			lastOptions.callback = function(){
-    	    			loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan,autoSetIDCardBarcodeForPacking);
-    	    		};
-    	    		waitPackingTaskStore.reload(lastOptions);
-    	    		waitPackingTaskStore.lastOptions.callback = null;
-//    	    		waitPackingTaskStore.load(lastParams);
-	    			return;
-        		}
-    			showResult('不存在该标识牌对应的装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-    			return;
-    		}else{
-    			loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan,autoSetIDCardBarcodeForPacking);
-    		}
-    	}
-    	else
-    	{
-            showResult(result.errorMsg , null , sstsConfig.messagePauseTimeOnPackingPage);
-            Ext4.getCmp('idCardName').setValue();
-            Ext4.getCmp('idCardUseAmount').setValue();
-        }
-    });
-}
-//
-function loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan,autoSetIDCardBarcodeForPacking){
+	/**
+	 * 扫描条码(清洗篮筐条码或标识牌条码)
+	 * @param tempBarcode 条码
+	 * @param manualScan 扫标识牌条码时传true,篮筐条码传false
+	 */
+	function loadIdCardByBarcode(tempBarcode, manualScan, autoSetIDCardBarcodeForPacking) {
+		var barcode = tempBarcode;
+		PackingTableManager.getIDCardInfoForPackingView(barcode, function (resultJsonStr) {
+			var result = JSON.parse(resultJsonStr);
+			if (isUndefinedOrNullOrEmpty(result.errorMsg)) {
+				barcode = result.idCard.barcode;
+				var tousseName = result.idCard.tousseDefinition.name;
+				var taskList = result.idCard.packingTaskInfo;
+				var existTask = findIDCardPackingTask(basketStore, result.idCard);
+				// 在待装配任务里面选择标识牌的包可以装配
+				if (!existTask) {
+					existTask = findIDCardPackingTask(waitPackingTaskStore, result.idCard);
+				}
 
-	var tousseName = result.idCard.tousseDefinition.name;
-	var taskList = result.idCard.packingTaskInfo;
-	var errorDamageRemark = result.idCard.errorDamageRemark || '';
-	var errorDamageRemarkId = result.idCard.errorDamageRemarkId || '';
-	if(!existTask){
-		existTask = findIDCardPackingTask(basketStore,result.idCard);
+				if (!existTask) {
+					if (taskList.length > 0) {
+						// 后台有装配任务，前台没有，那么先刷新待装配任务列表
+						var lastOptions = waitPackingTaskStore.lastOptions;
+						lastOptions = Ext4.clone(lastOptions);
+						lastOptions.callback = function () {
+							loadIdCardByBarcode_bottomHalf(barcode, result, existTask, manualScan, autoSetIDCardBarcodeForPacking);
+						};
+						waitPackingTaskStore.reload(lastOptions);
+						waitPackingTaskStore.lastOptions.callback = null;
+						//    	    		waitPackingTaskStore.load(lastParams);
+						return;
+					}
+					showResult('不存在该标识牌对应的装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage);
+					return;
+				} else {
+					loadIdCardByBarcode_bottomHalf(barcode, result, existTask, manualScan, autoSetIDCardBarcodeForPacking);
+				}
+			}
+			else {
+				showResult(result.errorMsg, null, sstsConfig.messagePauseTimeOnPackingPage);
+				Ext4.getCmp('idCardName').setValue();
+				Ext4.getCmp('idCardUseAmount').setValue();
+			}
+		});
 	}
-	
-	// 在待装配任务里面选择标识牌的包可以装配
-	if(!existTask){
-		existTask = findIDCardPackingTask(waitPackingTaskStore,result.idCard);
-	}
-	
-	if(!existTask){
-		showResult('不存在该标识牌对应的装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-		return;
-	}
-	var taskType = idCardTaskNode.get('taskType');
-	// 是否已清洗
-	if((taskType!=taskType_returnGoods) && !idCardTaskNode.get('cleaned')){
-		showResult('装配任务未清洗完成或清洗完成时间未到!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-		return;
-	}
-	// 加载器械包信息
-	if(manualScan){
-		var tousseName = idCardTaskNode.get('tousseName');
-		var vedioName = idCardTaskNode.get('uuid_vedioNames');
-		var td_id = idCardTaskNode.get('tousseID');
-		var taskId = idCardTaskNode.get('taskId');
-		var isTraceable = idCardTaskNode.get('isTraceable');
-		var allowModifyPackageType = idCardTaskNode.get('allowModifyPackageType');
-		if(result.idCard.tousseDefinition.needInspectMaterials){
-			var tousseID = result.idCard.tousseDefinition.id+'+标识牌';
-			var tousseName = result.idCard.tousseDefinition.name;
-			var resultAmount = 1;
-			var arr = getPackingMaterialsForCheck.get(tousseID) || [];
-			arr[0] = tousseName;
-			arr[1] = resultAmount;
-			getPackingMaterialsForCheck.set(tousseID,arr);
+	//
+	function loadIdCardByBarcode_bottomHalf(barcode, result, existTask, manualScan, autoSetIDCardBarcodeForPacking) {
+
+		var tousseName = result.idCard.tousseDefinition.name;
+		var taskList = result.idCard.packingTaskInfo;
+		var errorDamageRemark = result.idCard.errorDamageRemark || '';
+		var errorDamageRemarkId = result.idCard.errorDamageRemarkId || '';
+		if (!existTask) {
+			existTask = findIDCardPackingTask(basketStore, result.idCard);
 		}
-		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable,taskId);
-		lastSelectTousseName = tousseName;
-		lastSelectimageTypeTousse = imageType_tousse;
-		lastSelectVedioName = vedioName;
-		lastSelectTdId = td_id;
-		var tousseType = idCardTaskNode.get('tousseType');
-   		var isPrint = idCardTaskNode.get('isPrint');
-   		var isReview = idCardTaskNode.get('isReview');
-		showPackButton(isPrint,isReview,tousseType);
-		if(allowModifyPackageType == '否'){
-			Ext4.getCmp('packageType').disable();
-		}else {
-			Ext4.getCmp('packageType').enable();
+
+		// 在待装配任务里面选择标识牌的包可以装配
+		if (!existTask) {
+			existTask = findIDCardPackingTask(waitPackingTaskStore, result.idCard);
 		}
-	}
-	// 取消选中所有的装配任务，只选中该标识牌的
-	uncheckAllExceptCurrentIDCardPackingTask();
-	currentIDCardInfo = result.idCard;
-	if(autoSetIDCardBarcodeForPacking){
-		Ext4.getCmp('idCardBarcode').setValue(barcode);
-		Ext4.getCmp('idCardName').setValue(tousseName + "（条码：" + barcode + "）");
-		Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount);
-		idCardBarcode = barcode;
-		idCardInstanceID = result.idCard.id;
-		idCardInfo = result.idCard;
-		Ext4.getCmp('operatorBarcode').focus();
-	}else {
-		Ext4.getCmp('idCardBarcode').focus();
-	}
-	var sterilingType = idCardTaskNode.get("sterilingMethod");
-	var packageType;
- 	if(sstsConfig.enableIdCardDefaultPackageType){//标识牌增加包装类型
-		packageType = result.idCard.idCardDefinition.packageType;
-	}else{
-		packageType = idCardTaskNode.get("packageType");
-	} 
-	
-	Ext4.getCmp('packageType').setValue(packageType);
-	Ext4.getCmp('sterilingType').setValue(sterilingType);
-	Ext4.getCmp('remark').setValue(errorDamageRemark);
-	Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemark);
-	Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
-	//根据灭菌程序设置灭菌方式的值
-	setSterilingModeValueBySterilingType(sterilingType);
-	
-//	alert(idCardInstanceID)
-	// 做保养器械包的处理
-	maintainTousse();
-	refreshErrorAndDamageRemark(idCardTaskNode);
-	refreshRecyclingItemRemark(idCardTaskNode);
 
-	// 显示丢失报损按钮
-	showOrHideErrorAndDamageBtn();
-	if(manualScan){
-		// 自动装配
-		packingView_autoPacking();
-	}
-}
+		if (!existTask) {
+			showResult('不存在该标识牌对应的装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage);
+			return;
+		}
+		var taskType = idCardTaskNode.get('taskType');
+		// 是否已清洗
+		if ((taskType != taskType_returnGoods) && !idCardTaskNode.get('cleaned')) {
+			showResult('装配任务未清洗完成或清洗完成时间未到!', null, sstsConfig.messagePauseTimeOnPackingPage);
+			return;
+		}
+		// 加载器械包信息
+		if (manualScan) {
+			var tousseName = idCardTaskNode.get('tousseName');
+			var vedioName = idCardTaskNode.get('uuid_vedioNames');
+			var td_id = idCardTaskNode.get('tousseID');
+			var taskId = idCardTaskNode.get('taskId');
+			var isTraceable = idCardTaskNode.get('isTraceable');
+			var allowModifyPackageType = idCardTaskNode.get('allowModifyPackageType');
+			if (result.idCard.tousseDefinition.needInspectMaterials) {
+				var tousseID = result.idCard.tousseDefinition.id + '+标识牌';
+				var tousseName = result.idCard.tousseDefinition.name;
+				var resultAmount = 1;
+				var arr = getPackingMaterialsForCheck.get(tousseID) || [];
+				arr[0] = tousseName;
+				arr[1] = resultAmount;
+				getPackingMaterialsForCheck.set(tousseID, arr);
+			}
+			loadTousseInfo(tousseName, imageType_tousse, vedioName, td_id, isTraceable, taskId);
+			lastSelectTousseName = tousseName;
+			lastSelectimageTypeTousse = imageType_tousse;
+			lastSelectVedioName = vedioName;
+			lastSelectTdId = td_id;
+			var tousseType = idCardTaskNode.get('tousseType');
+			var isPrint = idCardTaskNode.get('isPrint');
+			var isReview = idCardTaskNode.get('isReview');
+			showPackButton(isPrint, isReview, tousseType);
+			if (allowModifyPackageType == '否') {
+				Ext4.getCmp('packageType').disable();
+			} else {
+				Ext4.getCmp('packageType').enable();
+			}
+		}
+		// 取消选中所有的装配任务，只选中该标识牌的
+		uncheckAllExceptCurrentIDCardPackingTask();
+		currentIDCardInfo = result.idCard;
+		if (autoSetIDCardBarcodeForPacking) {
+			Ext4.getCmp('idCardBarcode').setValue(barcode);
+			Ext4.getCmp('idCardName').setValue(tousseName + "（条码：" + barcode + "）");
+			Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount);
+			idCardBarcode = barcode;
+			idCardInstanceID = result.idCard.id;
+			idCardInfo = result.idCard;
+			Ext4.getCmp('operatorBarcode').focus();
+		} else {
+			Ext4.getCmp('idCardBarcode').focus();
+		}
+		var sterilingType = idCardTaskNode.get("sterilingMethod");
+		var packageType;
+		if (sstsConfig.enableIdCardDefaultPackageType) {//标识牌增加包装类型
+			packageType = result.idCard.idCardDefinition.packageType;
+		} else {
+			packageType = idCardTaskNode.get("packageType");
+		}
 
-function onErrorDamageBtnClick2(type){
-	if(!idCardTaskNode){
-		return;
+		Ext4.getCmp('packageType').setValue(packageType);
+		Ext4.getCmp('sterilingType').setValue(sterilingType);
+		Ext4.getCmp('remark').setValue(errorDamageRemark);
+		Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemark);
+		Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
+		//根据灭菌程序设置灭菌方式的值
+		setSterilingModeValueBySterilingType(sterilingType);
+
+		//	alert(idCardInstanceID)
+		// 做保养器械包的处理
+		maintainTousse();
+		refreshErrorAndDamageRemark(idCardTaskNode);
+		refreshRecyclingItemRemark(idCardTaskNode);
+
+		// 显示丢失报损按钮
+		showOrHideErrorAndDamageBtn();
+		if (manualScan) {
+			// 自动装配
+			packingView_autoPacking();
+		}
 	}
-	if(type_lost == type){
-		if(!haveLost(idCardTaskNode)){
+
+	function onErrorDamageBtnClick2(type) {
+		if (!idCardTaskNode) {
 			return;
-	    }
-	}else{
-		if(!haveDamages(idCardTaskNode)){
-			return;
-	    }
+		}
+		if (type_lost == type) {
+			if (!haveLost(idCardTaskNode)) {
+				return;
+			}
+		} else {
+			if (!haveDamages(idCardTaskNode)) {
+				return;
+			}
+		}
+		var taskId = idCardTaskNode.get('taskId');
+		onErrorDamageBtnClick(type, taskId);
 	}
-	var taskId = idCardTaskNode.get('taskId');
-	onErrorDamageBtnClick(type,taskId);
-}
-function reSetParentNodeAmount(delNode){
-	if(delNode != null){
-		var amount = delNode.get("amount");
-		var pNode = delNode.parentNode;
-		var t_amount = pNode.get("amount");
-		var t_unPackingAmount = pNode.get("unPackingAmount");
-		if(t_amount == amount){
-			pNode.remove();
-		}else{
-			pNode.set("amount",t_amount-amount);
-			pNode.set('unPackingAmount',t_unPackingAmount?(t_unPackingAmount-amount):(t_amount-amount));
+	function reSetParentNodeAmount(delNode) {
+		if (delNode != null) {
+			var amount = delNode.get("amount");
+			var pNode = delNode.parentNode;
+			var t_amount = pNode.get("amount");
+			var t_unPackingAmount = pNode.get("unPackingAmount");
+			if (t_amount == amount) {
+				pNode.remove();
+			} else {
+				pNode.set("amount", t_amount - amount);
+				pNode.set('unPackingAmount', t_unPackingAmount ? (t_unPackingAmount - amount) : (t_amount - amount));
+			}
 		}
 	}
-}
-deletePackingTask = function(ids,tousseID,amount,notLossReport,rowId) {
-	top.Ext4.MessageBox.confirm("请确认","是否删除所选择的待装配任务？",
-			function(button, text) {
-		if ("yes" == button){
-			Ext4.Ajax.request({
-				url : WWWROOT + '/disinfectSystem/packingAction!deletePackingTask.do',
-				params : {
-					ids : ids,
-					tousseID:tousseID,
-					amount:amount,
-					notLossReport:notLossReport
-				},success : function(response, options) {
-					var result = Ext4.decode(response.responseText);
-					var success = result.success;
-					if (true != success) {
-						showResult(result.cause , null , sstsConfig.messagePauseTimeOnPackingPage);
-						return;
-					} else {
-						showResult('删除成功！' , null , sstsConfig.messagePauseTimeOnPackingPage);
-						
-						//删除扫描篮筐后出现的装配任务
-						var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode();
-						var tousseNodes = rootNode.childNodes;
-						if(tousseNodes.length > 0){
-							var idsArray = ids.split(";");
-							//for循环里面不能循环删除
-							var deleteNodes = new Array();
-							Ext4.Array.each(tousseNodes, function(pNode){
-								Ext4.Array.each(pNode.childNodes,function(cNode){
-									for(var i = 0;i < idsArray.length;i++){
-										if(cNode.get('taskId') == idsArray[i]){
-											if(rowId != null && rowId != cNode.id){
-												continue;
+	deletePackingTask = function (ids, tousseID, amount, notLossReport, rowId) {
+		top.Ext4.MessageBox.confirm("请确认", "是否删除所选择的待装配任务？",
+			function (button, text) {
+				if ("yes" == button) {
+					Ext4.Ajax.request({
+						url: WWWROOT + '/disinfectSystem/packingAction!deletePackingTask.do',
+						params: {
+							ids: ids,
+							tousseID: tousseID,
+							amount: amount,
+							notLossReport: notLossReport
+						}, success: function (response, options) {
+							var result = Ext4.decode(response.responseText);
+							var success = result.success;
+							if (true != success) {
+								showResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage);
+								return;
+							} else {
+								showResult('删除成功！', null, sstsConfig.messagePauseTimeOnPackingPage);
+
+								//删除扫描篮筐后出现的装配任务
+								var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode();
+								var tousseNodes = rootNode.childNodes;
+								if (tousseNodes.length > 0) {
+									var idsArray = ids.split(";");
+									//for循环里面不能循环删除
+									var deleteNodes = new Array();
+									Ext4.Array.each(tousseNodes, function (pNode) {
+										Ext4.Array.each(pNode.childNodes, function (cNode) {
+											for (var i = 0; i < idsArray.length; i++) {
+												if (cNode.get('taskId') == idsArray[i]) {
+													if (rowId != null && rowId != cNode.id) {
+														continue;
+													}
+													var le = deleteNodes.length;
+													deleteNodes[le] = cNode;
+												}
 											}
-											var le = deleteNodes.length;
-											deleteNodes[le] = cNode;
-										}
+										});
+									});
+									for (var i = 0; i < deleteNodes.length; i++) {
+										reSetParentNodeAmount(deleteNodes[i]);
+										deleteNodes[i].remove();
 									}
-								});
-							});
-							for(var i = 0;i < deleteNodes.length;i++){
-								reSetParentNodeAmount(deleteNodes[i]);
-								deleteNodes[i].remove();
+								}
+								// 刷新waitPackingTreeGrid
+								Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
 							}
+						},
+						failure: function (response, options) {
+							var result = Ext4.decode(response.responseText);
+							showResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage);
 						}
-						// 刷新waitPackingTreeGrid
-						Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
-					}
-				},
-				failure : function(response, options) {
-					var result = Ext4.decode(response.responseText);
-					showResult(result.cause , null , sstsConfig.messagePauseTimeOnPackingPage);
+					});
 				}
 			});
-		}
-	});
 
-}
+	}
 
-Ext4.define('cModel',{
-	extend : 'Ext4.data.Model',
-	idProperty: 'nodeId',
-	fields: [
-	{name : 'taskId'},
-	{name : 'tousseName'},
-	{name : 'tousseID'},
-	{name : 'invoicePlanId'},
-	{name : 'unPackingAmount'},
-	{name : 'amount'},
-	{name : 'urgentAmount'},
-	{name : 'tousseType'},
-	{name : 'packageType'},
-	{name : 'packageSize'},
-	{name : 'sterilingMethod'},
-	{name : 'washTime'},
-	{name : 'basketName'},
-	{name : 'basketBarcode'},
-	{name : 'status'},
-	{name : 'dateTime'},
-	{name : 'recyclingUser'},
-	{name : 'errors'},
-	{name : 'damages'},
-	{name : 'supplierName'},
-	{name : 'taskType'},
-	{name : 'department'},
-	{name : 'isTraceable'},
-	{name : 'isPrint'},
-	{name : 'isReview'},
-	{name : 'replenishMaterils'},
-	{name : 'packedPhotographed'},
-	{name : 'partPacking'},
-	{name : 'haveIDCard'},
-	{name : 'uuid_vedioNames'},
-	{name : 'isTimeout'},
-	{name : 'allowModifyPackageType'},
-	{name : 'errorRemark'},
-	{name : 'recyclingItemRemark'},
-	{name : 'damageRemark'},
-	{name : 'urgentLevel'},
-	{name : 'idCardBarcode'},
-	{name : 'customSplitBasketAmount'},
-	{name : 'serialNumber'},
-	{name : 'cleaned'},
-	{name : 'note'},
-	{name : 'maxAmount'},
-	{name : 'urgentLevelObj'},
-	{name : 'colorCode'},
-	{name : 'classifiedItemAmountInfo'},
-	{name : 'patient'},
-	{name : 'needInspectMaterials'},
-	{name : 'washRecordId'}
-]});
+	Ext4.define('cModel', {
+		extend: 'Ext4.data.Model',
+		idProperty: 'nodeId',
+		fields: [
+			{ name: 'taskId' },
+			{ name: 'tousseName' },
+			{ name: 'tousseID' },
+			{ name: 'invoicePlanId' },
+			{ name: 'unPackingAmount' },
+			{ name: 'amount' },
+			{ name: 'urgentAmount' },
+			{ name: 'tousseType' },
+			{ name: 'packageType' },
+			{ name: 'packageSize' },
+			{ name: 'sterilingMethod' },
+			{ name: 'washTime' },
+			{ name: 'basketName' },
+			{ name: 'basketBarcode' },
+			{ name: 'status' },
+			{ name: 'dateTime' },
+			{ name: 'recyclingUser' },
+			{ name: 'errors' },
+			{ name: 'damages' },
+			{ name: 'supplierName' },
+			{ name: 'taskType' },
+			{ name: 'department' },
+			{ name: 'isTraceable' },
+			{ name: 'isPrint' },
+			{ name: 'isReview' },
+			{ name: 'replenishMaterils' },
+			{ name: 'packedPhotographed' },
+			{ name: 'partPacking' },
+			{ name: 'haveIDCard' },
+			{ name: 'uuid_vedioNames' },
+			{ name: 'isTimeout' },
+			{ name: 'allowModifyPackageType' },
+			{ name: 'errorRemark' },
+			{ name: 'recyclingItemRemark' },
+			{ name: 'damageRemark' },
+			{ name: 'urgentLevel' },
+			{ name: 'idCardBarcode' },
+			{ name: 'customSplitBasketAmount' },
+			{ name: 'serialNumber' },
+			{ name: 'cleaned' },
+			{ name: 'note' },
+			{ name: 'maxAmount' },
+			{ name: 'urgentLevelObj' },
+			{ name: 'colorCode' },
+			{ name: 'classifiedItemAmountInfo' },
+			{ name: 'patient' },
+			{ name: 'needInspectMaterials' },
+			{ name: 'washRecordId' }
+		]
+	});
 
-var basketWidth = 72;
-if(!sstsConfig.disableIdCard){
-	basketWidth += 72;
-}
-if(sstsConfig.showBarcodeOfWashBasketInPackingTaskList){
-	basketWidth += 72;
-}
+	var basketWidth = 72;
+	if (!sstsConfig.disableIdCard) {
+		basketWidth += 72;
+	}
+	if (sstsConfig.showBarcodeOfWashBasketInPackingTaskList) {
+		basketWidth += 72;
+	}
 
-function getGridColumns(headerName,treeId){
-	if(headerName == '物品名称'){
-		var obj = {
-			header: '物品名称',
-			minWidth:200,
-		    sortable: true,
-		    xtype : 'treecolumn',
-		    dataIndex: 'tousseName',
-		    renderer: function(v,p,record,rowIndex, columnIndex, store,view){
-				p.style='word-wrap: break-word !important;';
-				var tousseName = record.get('tousseName');
-		    	var showName = '<font>' + tousseName + '</font>';
-		    	if(record.get('taskType') == taskType_application || record.get('taskType') == taskType_returnGoods
-		    			|| record.get('taskType') == taskType_qualityMonitor){
-		    		showName = '<img align="middle" src="' + WWWROOT + '/images/web/star.png">' + showName;
-		    	}
-		    	if(record.get('replenishMaterils')){
-		    		showName = '<font style=" background-color:yellow">' + showName + '</font>';
-		    	}
-		    	//根据器械包大小物品名称显示不同颜色
-		    	if(record.get('leaf') && sstsConfig.tousseSizeColor){
-		    		if(record.get("packageSize") == "超大包"){
-		    			showName = '<span class="superBigTousseColor">' + showName + '</span>';
-		    		}else if(record.get("packageSize") == "大包"){
-		    			showName = '<span class="bigTousseColor">' + showName + '</span>';
-		    		}else if(record.get("packageSize") == "中包"){
-		    			showName = '<span class="middleTousseColor">' + showName + '</span>';
-		    		}else if(record.get("packageSize") == "小包"){
-		    			showName = '<span class="smallTousseColor">' + showName + '</span>';
-		    		}
-				}
-				var resultName = '';
-				if(record.get('leaf') && record.get('patient') !== '' && record.get('tousseType') == '外来器械包'){
-					resultName = showName+'-'+ record.get('patient');
-				}else {
-					resultName = showName;
-				}
-				if(record.get('tousseType') == '外来器械包'){
-					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
-						if(record.get('partPacking') && !record.get('isTimeout')){
-							p.css = 'tousseName_background';
+	function getGridColumns(headerName, treeId) {
+		if (headerName == '物品名称') {
+			var obj = {
+				header: '物品名称',
+				minWidth: 200,
+				sortable: true,
+				xtype: 'treecolumn',
+				dataIndex: 'tousseName',
+				renderer: function (v, p, record, rowIndex, columnIndex, store, view) {
+					p.style = 'word-wrap: break-word !important;';
+					var tousseName = record.get('tousseName');
+					var showName = '<font>' + tousseName + '</font>';
+					if (record.get('taskType') == taskType_application || record.get('taskType') == taskType_returnGoods
+						|| record.get('taskType') == taskType_qualityMonitor) {
+						showName = '<img align="middle" src="' + WWWROOT + '/images/web/star.png">' + showName;
+					}
+					if (record.get('replenishMaterils')) {
+						showName = '<font style=" background-color:yellow">' + showName + '</font>';
+					}
+					//根据器械包大小物品名称显示不同颜色
+					if (record.get('leaf') && sstsConfig.tousseSizeColor) {
+						if (record.get("packageSize") == "超大包") {
+							showName = '<span class="superBigTousseColor">' + showName + '</span>';
+						} else if (record.get("packageSize") == "大包") {
+							showName = '<span class="bigTousseColor">' + showName + '</span>';
+						} else if (record.get("packageSize") == "中包") {
+							showName = '<span class="middleTousseColor">' + showName + '</span>';
+						} else if (record.get("packageSize") == "小包") {
+							showName = '<span class="smallTousseColor">' + showName + '</span>';
 						}
-						if(record.get('packedPhotographed') && !record.get('isTimeout')){
-							p.css = 'tousseName_background_1';
+					}
+					var resultName = '';
+					if (record.get('leaf') && record.get('patient') !== '' && record.get('tousseType') == '外来器械包') {
+						resultName = showName + '-' + record.get('patient');
+					} else {
+						resultName = showName;
+					}
+					if (record.get('tousseType') == '外来器械包') {
+						if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking) {
+							if (record.get('partPacking') && !record.get('isTimeout')) {
+								p.css = 'tousseName_background';
+							}
+							if (record.get('packedPhotographed') && !record.get('isTimeout')) {
+								p.css = 'tousseName_background_1';
+							}
+						} else if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !sstsConfig.allowForeignToussePartSplitWhenPacking) {
+							if (record.get('packedPhotographed') && !record.get('isTimeout')) {
+								p.css = 'tousseName_background_1';
+							}
+						} else if (!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking) {
+							if (record.get('partPacking') && !record.get('isTimeout')) {
+								p.css = 'tousseName_background';
+							}
 						}
-					}else if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !sstsConfig.allowForeignToussePartSplitWhenPacking){
-						if(record.get('packedPhotographed') && !record.get('isTimeout')){
-							p.css = 'tousseName_background_1';
+						return resultName;
+					} else {
+						return resultName;
+					}
+				}
+			}
+			return obj;
+		} else if (headerName == '数量') {
+			var obj = {
+				header: '数量',
+				width: 50,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'amount',
+				renderer: function (v, p, record, rowIndex, columnIndex, store, view) {
+					if (!sstsConfig.waitPackingTaskGrid_show_foreignTousse_customSplitBasketAmount) {
+						return v;
+					}
+					if ('basketTreeGrid' == treeId) {
+						return v;
+					}
+					if (record.get('leaf')) {
+						if (record.data.customSplitBasketAmount > 0) {
+							return v + '(' + record.data.customSplitBasketAmount + ')';
+						} else {
+							return v;
 						}
-					}else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
-						if(record.get('partPacking') && !record.get('isTimeout')){
-							p.css = 'tousseName_background';
+					} else {
+						if (record.data.customSplitBasketAmount > 0 && record.data.children.length <= 1) {
+							return v + '(' + record.data.customSplitBasketAmount + ')';
+						} else {
+							return v;
 						}
 					}
-					return resultName;
-				}else {
-					return resultName;
-				}
-		    }
-		}
-		return obj;
-	}else if(headerName == '数量'){
-		var obj = {
-			header: '数量',
-			width : 50,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'amount',
-		    renderer: function(v,p,record,rowIndex, columnIndex, store,view){
-		    	if(!sstsConfig.waitPackingTaskGrid_show_foreignTousse_customSplitBasketAmount){
-		    		return v;
-		    	}
-		    	if('basketTreeGrid' == treeId){
-		    		return v;
-		    	}
-		    	if(record.get('leaf')){
-		    		if(record.data.customSplitBasketAmount > 0){
-		    			return v+'('+record.data.customSplitBasketAmount+')';
-		    		}else{
-		    			return v;
-		    		}
-		    	}else{
-		    		if(record.data.customSplitBasketAmount > 0 && record.data.children.length <= 1){
-		    			return v+'('+record.data.customSplitBasketAmount+')';
-		    		}else{
-		    			return v;
-		    		}
-		    	}
-		    	
-		    	return v;
-		    },
-		    editor: {
-		        xtype: 'numberfield',
-		        allowBlank: true,
-		        allowDecimals :false,
-		        minValue: 0,
-		        listeners  : {  
-		            focus:function(that){  
-		                this.selectText();
-						if(sstsConfig.enablePackingMaterialsCheckFunction){
-							if('basketTreeGrid' == treeId){
-								setTimeout(function(){
-									var records = Ext4.getCmp(treeId).getSelectionModel().getSelection();
-									getPackingMaterialsForCheckFun(records[0],that.value)
-								}, 2000);
-							}else {
-								var records = Ext4.getCmp(treeId).getSelectionModel().getSelection();
-								if(records[0].data.tousseType == '敷料包' || records[0].data.taskType == 3){
-									setTimeout(function(){
-										getPackingMaterialsForCheckFun(records[0],that.value)
+
+					return v;
+				},
+				editor: {
+					xtype: 'numberfield',
+					allowBlank: true,
+					allowDecimals: false,
+					minValue: 0,
+					listeners: {
+						focus: function (that) {
+							this.selectText();
+							if (sstsConfig.enablePackingMaterialsCheckFunction) {
+								if ('basketTreeGrid' == treeId) {
+									setTimeout(function () {
+										var records = Ext4.getCmp(treeId).getSelectionModel().getSelection();
+										getPackingMaterialsForCheckFun(records[0], that.value)
 									}, 2000);
+								} else {
+									var records = Ext4.getCmp(treeId).getSelectionModel().getSelection();
+									if (records[0].data.tousseType == '敷料包' || records[0].data.taskType == 3) {
+										setTimeout(function () {
+											getPackingMaterialsForCheckFun(records[0], that.value)
+										}, 2000);
+									}
 								}
 							}
 						}
-		            }  
-		        }  
-		    }
-		}
-		return obj;
-	}else if(headerName == '操作'){
-		var obj = {
-			header: '操作',
-			width : 120,
-			align:'center',
-			sortable: true,
-		    renderer: function(v,p,record,rowIndex, columnIndex, store){
-				var str = '<div style="height: 20px;">';
-				if(record.get('leaf')){
-					var taskid = record.get('taskId');
-					var tousseName = record.get('tousseName');
-					var tousseID = record.get('tousseID');
-					var status = record.get('status');
-					var amount = record.get('amount');
-					var supplent = true;
-					var notLossReport = true;
-					if(status == '待装配'){
-			            var errors = record.get('errors');
-			            for(var i = 0;i < errors.length ; i++) {
-			                if(errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
-			                    supplent = false;
-			                    notLossReport = false;
-			                }
-			            }
-			            if(notLossReport){
-			            	var damages = record.get('damages');
-			            	if(damages.length > 0){
-			            		notLossReport = false;
-			            	}
-			            }
-			        }
-					if(!SSTS_PackingTask_Delete){
-						if(taskid != undefined && taskid != null){
-							str += "<img style='float: left;margin-top: 3px;' src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"deletePackingTask('" + taskid +"','" + tousseID +"','" + amount + "','" + notLossReport +"','" + record.id + "')\" >";
-						}
 					}
-			        if(status == '待装配'){
-			            var errorRemark = record.get('errorRemark');
-			            var damageRemark = record.get('damageRemark');
-			            if(!supplent){
-			            	str += "<input type='button' style='height:20px; width:40px;' value='丢失' onclick=\"onErrorDamageBtnClick('"+type_lost+"','"+taskid+"')\" >";
-			            }
-			            var damages = record.get('damages');
-			            if(damages.length > 0){
-			            	str += "<input type='button' style='height:20px; width:40px;' value='报损' onclick=\"onErrorDamageBtnClick('"+type_damage+"','"+taskid+"')\" >";
-			            }
-					}
-					if(record.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid'){
-			            var supplierName = record.get('supplierName');
-			            var basketBarcode = record.get('basketBarcode');
-			            var showName = tousseName;
-			            var invoicePlanId = record.get('invoicePlanId');
-			            var packageType = record.get('packageType');
-						var sterilingMethod = record.get('sterilingMethod');
-						var tousseID = record.get('tousseID');
-			            if(!allowForeignToussePartiallyPacking){
-			            	str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName+ "','"+showName+ "','"+invoicePlanId + "','"+amount+"','"+supplierName+"','"+basketBarcode+"','"+packageType+"','"+sterilingMethod+"','"+tousseID+"') \">";
-			            }
-			        }
 				}
-				str += '</div>';
-		        return str;
 			}
-		}
-		return obj;
-	}else if(headerName == '加急数量'){
-		var obj = {
-			header: '加急数量',
-			width : 80,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'urgentAmount',
-			hidden:!sstsConfig.enableUrgentFunction,
-		    renderer: function(v,p,record,rowIndex, columnIndex, store,view){
-		    	if(v > 0){
-					var urgentAmountColor = "";
-					if(sstsConfig.enableUrgentFunction){
-						if(record.get("leaf")){//子级
-							var urgentLevelObj = record.get("urgentLevelObj");
-							if(urgentLevelObj != null){
-								var colorCode = record.get("urgentLevelObj").colorCode;
-								if(colorCode != ""){//有加急的
-									urgentAmountColor = "<p style=\"background-color:"+colorCode+"\">" + v + "</p>";
+			return obj;
+		} else if (headerName == '操作') {
+			var obj = {
+				header: '操作',
+				width: 120,
+				align: 'center',
+				sortable: true,
+				renderer: function (v, p, record, rowIndex, columnIndex, store) {
+					var str = '<div style="height: 20px;">';
+					if (record.get('leaf')) {
+						var taskid = record.get('taskId');
+						var tousseName = record.get('tousseName');
+						var tousseID = record.get('tousseID');
+						var status = record.get('status');
+						var amount = record.get('amount');
+						var supplent = true;
+						var notLossReport = true;
+						if (status == '待装配') {
+							var errors = record.get('errors');
+							for (var i = 0; i < errors.length; i++) {
+								if (errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
+									supplent = false;
+									notLossReport = false;
 								}
 							}
-						}else{//父级
-							var parentColor = record.get("colorCode");
-							urgentAmountColor = "<p style=\"background-color:"+parentColor+"\">" +v + "</p>";
+							if (notLossReport) {
+								var damages = record.get('damages');
+								if (damages.length > 0) {
+									notLossReport = false;
+								}
+							}
 						}
+						if (!SSTS_PackingTask_Delete) {
+							if (taskid != undefined && taskid != null) {
+								str += "<img style='float: left;margin-top: 3px;' src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"deletePackingTask('" + taskid + "','" + tousseID + "','" + amount + "','" + notLossReport + "','" + record.id + "')\" >";
+							}
+						}
+						if (status == '待装配') {
+							var errorRemark = record.get('errorRemark');
+							var damageRemark = record.get('damageRemark');
+							if (!supplent) {
+								str += "<input type='button' style='height:20px; width:40px;' value='丢失' onclick=\"onErrorDamageBtnClick('" + type_lost + "','" + taskid + "')\" >";
+							}
+							var damages = record.get('damages');
+							if (damages.length > 0) {
+								str += "<input type='button' style='height:20px; width:40px;' value='报损' onclick=\"onErrorDamageBtnClick('" + type_damage + "','" + taskid + "')\" >";
+							}
+						}
+						if (record.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid') {
+							var supplierName = record.get('supplierName');
+							var basketBarcode = record.get('basketBarcode');
+							var showName = tousseName;
+							var invoicePlanId = record.get('invoicePlanId');
+							var packageType = record.get('packageType');
+							var sterilingMethod = record.get('sterilingMethod');
+							var tousseID = record.get('tousseID');
+							if (!allowForeignToussePartiallyPacking) {
+								str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName + "','" + showName + "','" + invoicePlanId + "','" + amount + "','" + supplierName + "','" + basketBarcode + "','" + packageType + "','" + sterilingMethod + "','" + tousseID + "') \">";
+							}
+						}
 					}
-		    		return urgentAmountColor;
-		    	}else{
-		    		return null;
-		    	}
-		    }
-		}
-		return obj;
-	}else if(headerName == '加急级别'){
-		var obj = {
-			header: '加急级别',
-			width: 80,
-			align: 'center',
-			sortable: true,
-			hidden:!sstsConfig.enableUrgentFunction,
-			dataIndex: 'urgentLevel',
-			renderer: function(v,p,record,rowIndex, columnIndex, store,view){
-				if(v != "" ){
-					var urgentLevel = "";
-					if(sstsConfig.enableUrgentFunction){
-						if(record.get("leaf")){//子级
-							var urgentLevelObj = record.get("urgentLevelObj");
-							if(urgentLevelObj != null){
-								var colorCode = record.get("urgentLevelObj").colorCode;
-								if(colorCode != ""){
-									urgentLevel = "<p style=\"background-color:"+colorCode+"\">" +v + "</p>";
+					str += '</div>';
+					return str;
+				}
+			}
+			return obj;
+		} else if (headerName == '加急数量') {
+			var obj = {
+				header: '加急数量',
+				width: 80,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'urgentAmount',
+				hidden: !sstsConfig.enableUrgentFunction,
+				renderer: function (v, p, record, rowIndex, columnIndex, store, view) {
+					if (v > 0) {
+						var urgentAmountColor = "";
+						if (sstsConfig.enableUrgentFunction) {
+							if (record.get("leaf")) {//子级
+								var urgentLevelObj = record.get("urgentLevelObj");
+								if (urgentLevelObj != null) {
+									var colorCode = record.get("urgentLevelObj").colorCode;
+									if (colorCode != "") {//有加急的
+										urgentAmountColor = "<p style=\"background-color:" + colorCode + "\">" + v + "</p>";
+									}
 								}
+							} else {//父级
+								var parentColor = record.get("colorCode");
+								urgentAmountColor = "<p style=\"background-color:" + parentColor + "\">" + v + "</p>";
 							}
-							
-						}else{//父级
-							var parentColor = record.get("colorCode");
-							urgentLevel = "<p style=\"background-color:"+parentColor+"\">" +v + "</p>";
 						}
+						return urgentAmountColor;
+					} else {
+						return null;
 					}
-					return urgentLevel;
-				}else{
-					return null;
 				}
 			}
-		}
-		return obj;
-	}else if(headerName == '清洗篮筐'){
-		var obj = {
-			header: '清洗篮筐',
-			width : basketWidth,
-			align:'center',
-		    sortable: true,
-			dataIndex: 'basketName',
-		    renderer:function (value, metaData, record, rowIdx, colIdx, store){
-				var html = value;
-				var classifiedItemAmountInfo = record.get('classifiedItemAmountInfo') || '';
-				if(classifiedItemAmountInfo !== '' && record.get('tousseType') == '外来器械包'){
-					html = classifiedItemAmountInfo;
+			return obj;
+		} else if (headerName == '加急级别') {
+			var obj = {
+				header: '加急级别',
+				width: 80,
+				align: 'center',
+				sortable: true,
+				hidden: !sstsConfig.enableUrgentFunction,
+				dataIndex: 'urgentLevel',
+				renderer: function (v, p, record, rowIndex, columnIndex, store, view) {
+					if (v != "") {
+						var urgentLevel = "";
+						if (sstsConfig.enableUrgentFunction) {
+							if (record.get("leaf")) {//子级
+								var urgentLevelObj = record.get("urgentLevelObj");
+								if (urgentLevelObj != null) {
+									var colorCode = record.get("urgentLevelObj").colorCode;
+									if (colorCode != "") {
+										urgentLevel = "<p style=\"background-color:" + colorCode + "\">" + v + "</p>";
+									}
+								}
+
+							} else {//父级
+								var parentColor = record.get("colorCode");
+								urgentLevel = "<p style=\"background-color:" + parentColor + "\">" + v + "</p>";
+							}
+						}
+						return urgentLevel;
+					} else {
+						return null;
+					}
 				}
-				metaData.style='white-space: normal !important;';
-				metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(html) + '"'; //在tips中展示列的全部内容.  
-				if(value !== '' && record.get('basketBarcode') !== '' && sstsConfig.showBarcodeOfWashBasketInPackingTaskList){
-					if(value.split(';').length > 1){
-						var resultValue = []
-						var basketBarcodes = record.get('basketBarcode');
-						for(var i=0;i<value.split(';').length;i++){
-							resultValue[i] =  value.split(';')[i] + '('+basketBarcodes.split(';')[i]+')';  
+			}
+			return obj;
+		} else if (headerName == '清洗篮筐') {
+			var obj = {
+				header: '清洗篮筐',
+				width: basketWidth,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'basketName',
+				renderer: function (value, metaData, record, rowIdx, colIdx, store) {
+					var html = value;
+					var classifiedItemAmountInfo = record.get('classifiedItemAmountInfo') || '';
+					if (classifiedItemAmountInfo !== '' && record.get('tousseType') == '外来器械包') {
+						html = classifiedItemAmountInfo;
+					}
+					metaData.style = 'white-space: normal !important;';
+					metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(html) + '"'; //在tips中展示列的全部内容.  
+					if (value !== '' && record.get('basketBarcode') !== '' && sstsConfig.showBarcodeOfWashBasketInPackingTaskList) {
+						if (value.split(';').length > 1) {
+							var resultValue = []
+							var basketBarcodes = record.get('basketBarcode');
+							for (var i = 0; i < value.split(';').length; i++) {
+								resultValue[i] = value.split(';')[i] + '(' + basketBarcodes.split(';')[i] + ')';
+							}
+							return resultValue.join(';');
+						} else {
+							return value + '(' + record.get('basketBarcode') + ')';
 						}
-						return resultValue.join(';');
-					}else {
-						return value+'('+record.get('basketBarcode')+')';  
+					} else {
+						return value;
 					}
-				}else {
-					return value;
 				}
-		      } 
+			}
+			return obj;
+		} else if (headerName == '申请科室') {
+			var obj = {
+				header: '申请科室',
+				width: 80,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'department'
+			}
+			return obj;
+		} else if (headerName == '清洗时间') {
+			var obj = {
+				header: '清洗时间',
+				width: 110,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'washTime'
+			}
+			return obj;
+		} else if (headerName == '回收人') {
+			var obj = {
+				header: '回收人',
+				width: 80,
+				align: 'center',
+				sortable: true,
+				hidden: !sstsConfig.showRecyclingPeopleColumnInPackingTasksList,
+				dataIndex: 'recyclingUser'
+			}
+			return obj;
+		} else if (headerName == '回收时间') {
+			var obj = {
+				header: '回收时间',
+				width: 110,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'dateTime'
+			}
+			return obj;
+		} else if (headerName == '状态') {
+			var obj = {
+				header: '状态',
+				width: 60,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'status'
+			}
+			return obj;
+		} else if (headerName == '序号') {
+			var obj = {
+				header: '序号',
+				width: 40,
+				align: 'center',
+				sortable: true,
+				hidden: !sstsConfig.enablePackingSerialNu,
+				dataIndex: 'serialNumber'
+			}
+			return obj;
 		}
-		return obj;
-	}else if(headerName == '申请科室'){
-		var obj = {
-			header: '申请科室',
-			width : 80,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'department'
-		}
-		return obj;
-	}else if(headerName == '清洗时间'){
-		var obj = {
-			header: '清洗时间',
-			width : 110,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'washTime'
-		}
-		return obj;
-	}else if(headerName == '回收人'){
-		var obj = {
-			header: '回收人',
-			width : 80,
-			align:'center',
-		    sortable: true,
-			hidden:!sstsConfig.showRecyclingPeopleColumnInPackingTasksList,
-		    dataIndex: 'recyclingUser'
-		}
-		return obj;
-	}else if(headerName == '回收时间'){
-		var obj = {
-			header: '回收时间',
-			width : 110,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'dateTime'
-		}
-		return obj;
-	}else if(headerName == '状态'){
-		var obj = {
-			header: '状态',
-			width : 60,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'status'
-		}
-		return obj;
-	}else if(headerName == '序号'){
-		var obj = {
-			header: '序号',
-			width : 40,
-			align:'center',
-		    sortable: true,
-			hidden:!sstsConfig.enablePackingSerialNu,
-		    dataIndex: 'serialNumber'
-		}
-		return obj;
 	}
-}
 
-function buildColumnTreeColumns(treeId){
-	var columns = [];
-	if(sstsConfig.columnConfigOfpackingTaskList && sstsConfig.columnConfigOfpackingTaskList.length > 0){
-		var columnConfigOfpackingTaskList = sstsConfig.columnConfigOfpackingTaskList;
-		for(var i=0;i<columnConfigOfpackingTaskList.length;i++){
-			if(getGridColumns(columnConfigOfpackingTaskList[i],treeId)){
-				columns.push(getGridColumns(columnConfigOfpackingTaskList[i],treeId));
+	function buildColumnTreeColumns(treeId) {
+		var columns = [];
+		if (sstsConfig.columnConfigOfpackingTaskList && sstsConfig.columnConfigOfpackingTaskList.length > 0) {
+			var columnConfigOfpackingTaskList = sstsConfig.columnConfigOfpackingTaskList;
+			for (var i = 0; i < columnConfigOfpackingTaskList.length; i++) {
+				if (getGridColumns(columnConfigOfpackingTaskList[i], treeId)) {
+					columns.push(getGridColumns(columnConfigOfpackingTaskList[i], treeId));
+				}
 			}
+		} else {
+			columns = [
+				getGridColumns('物品名称', treeId),
+				getGridColumns('数量', treeId),
+				getGridColumns('操作', treeId),
+				getGridColumns('序号', treeId),
+				getGridColumns('加急数量', treeId),
+				getGridColumns('加急级别', treeId),
+				getGridColumns('清洗篮筐', treeId),
+				getGridColumns('申请科室', treeId),
+				getGridColumns('清洗时间', treeId),
+				getGridColumns('回收人', treeId),
+				getGridColumns('回收时间', treeId),
+				getGridColumns('状态', treeId)
+			];
 		}
-	}else {
-		columns = [
-			getGridColumns('物品名称',treeId),
-			getGridColumns('数量',treeId),
-			getGridColumns('操作',treeId),
-			getGridColumns('序号',treeId),
-			getGridColumns('加急数量',treeId),
-			getGridColumns('加急级别',treeId),
-			getGridColumns('清洗篮筐',treeId),
-			getGridColumns('申请科室',treeId),
-			getGridColumns('清洗时间',treeId),
-			getGridColumns('回收人',treeId),
-			getGridColumns('回收时间',treeId),
-			getGridColumns('状态',treeId)
-		];
+		return columns;
 	}
-	return columns;
-}
 
-Ext4.define('columnTreeGrid',{
-    extend: 'Ext4.tree.Panel',
-    xtype: 'tree-grid',
-    useArrows: true,
-    rootVisible: false,
-    multiSelect: false,
-    columnLines: true,
-    rowLines: true,
-    cls: 'no-leaf-icons',
-    initComponent: function() {
-        this.cellEditing = new Ext4.grid.plugin.CellEditing({
-            clicksToEdit: 1,
-            listeners: {
-                beforeedit: function(editor, context, eOpts){
-					var record = context.record;
-                	if(record.data.errors.length > 0 || record.data.damages.length > 0){
-                		return false;
-                	}
-                },
-				afteredit:function(editor, context, eOpts){
-					var record = context.record;
-					if(context.value == 0){
-						showResult(record.get('tousseName') + "的数量不能为0", null , sstsConfig.messagePauseTimeOnPackingPage);
-						record.set('amount',context.originalValue);
-						return;
-					}
-					var parentUnPackingAmount;
-					var maxAmount;
-					var unPackingAmount;
-					if(context.grid.id == 'waitPackingTreeGrid'){
-						parentUnPackingAmount = record.parentNode.get('unPackingAmount');
-						maxAmount = record.raw.maxAmount; 
-						unPackingAmount = record.get('unPackingAmount');
-					}else {
-						parentUnPackingAmount = record.parentNode.get('maxAmount');
-						maxAmount = record.data.maxAmount; 
-						unPackingAmount = record.get('maxAmount');
-					}
-					if(record.get('leaf')){
-						var sum = 0;
-						Ext4.each(record.parentNode.childNodes, function(pNode) {
-							sum += parseInt(pNode.get('amount'));
-						});
-						if(context.value > maxAmount){
-							showResult(record.get('tousseName') + "的数量不能大于最大装配数量"+maxAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
-							record.set('amount',context.originalValue);
-							return;
+	Ext4.define('columnTreeGrid', {
+		extend: 'Ext4.tree.Panel',
+		xtype: 'tree-grid',
+		useArrows: true,
+		rootVisible: false,
+		multiSelect: false,
+		columnLines: true,
+		rowLines: true,
+		cls: 'no-leaf-icons',
+		initComponent: function () {
+			this.cellEditing = new Ext4.grid.plugin.CellEditing({
+				clicksToEdit: 1,
+				listeners: {
+					beforeedit: function (editor, context, eOpts) {
+						var record = context.record;
+						if (record.data.errors.length > 0 || record.data.damages.length > 0) {
+							return false;
 						}
-						if(sum > parentUnPackingAmount){
-							showResult(record.get('tousseName') + ",装配数量不能大于"+parentUnPackingAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
-							record.set('amount',context.originalValue);
+					},
+					afteredit: function (editor, context, eOpts) {
+						var record = context.record;
+						if (context.value == 0) {
+							showResult(record.get('tousseName') + "的数量不能为0", null, sstsConfig.messagePauseTimeOnPackingPage);
+							record.set('amount', context.originalValue);
 							return;
 						}
-					}else {
-						if(unPackingAmount !== '' && unPackingAmount < context.value){
-							showResult(record.get('tousseName') + ",装配数量不能大于"+unPackingAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
-							record.set('amount',unPackingAmount);
+						var parentUnPackingAmount;
+						var maxAmount;
+						var unPackingAmount;
+						if (context.grid.id == 'waitPackingTreeGrid') {
+							parentUnPackingAmount = record.parentNode.get('unPackingAmount');
+							maxAmount = record.raw.maxAmount;
+							unPackingAmount = record.get('unPackingAmount');
+						} else {
+							parentUnPackingAmount = record.parentNode.get('maxAmount');
+							maxAmount = record.data.maxAmount;
+							unPackingAmount = record.get('maxAmount');
 						}
+						if (record.get('leaf')) {
+							var sum = 0;
+							Ext4.each(record.parentNode.childNodes, function (pNode) {
+								sum += parseInt(pNode.get('amount'));
+							});
+							if (context.value > maxAmount) {
+								showResult(record.get('tousseName') + "的数量不能大于最大装配数量" + maxAmount, null, sstsConfig.messagePauseTimeOnPackingPage);
+								record.set('amount', context.originalValue);
+								return;
+							}
+							if (sum > parentUnPackingAmount) {
+								showResult(record.get('tousseName') + ",装配数量不能大于" + parentUnPackingAmount, null, sstsConfig.messagePauseTimeOnPackingPage);
+								record.set('amount', context.originalValue);
+								return;
+							}
+						} else {
+							if (unPackingAmount !== '' && unPackingAmount < context.value) {
+								showResult(record.get('tousseName') + ",装配数量不能大于" + unPackingAmount, null, sstsConfig.messagePauseTimeOnPackingPage);
+								record.set('amount', unPackingAmount);
+							}
+						}
 					}
 				}
-            }
-        });
-        Ext4.apply(this, {
-        	plugins: [this.cellEditing]
-        });
-        this.superclass.initComponent.call(this);
-    }
-});
+			});
+			Ext4.apply(this, {
+				plugins: [this.cellEditing]
+			});
+			this.superclass.initComponent.call(this);
+		}
+	});
 
-function loadUserByBarcode(barcodeField,userNameField,userCodeField,focusField){
-	
-	if(userNameField == null || userCodeField == null ||　barcodeField == null){
-		 showResult("参数错误，请联系管理员！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-		 return;
+	function loadUserByBarcode(barcodeField, userNameField, userCodeField, focusField) {
+
+		if (userNameField == null || userCodeField == null || barcodeField == null) {
+			showResult("参数错误，请联系管理员！", null, sstsConfig.messagePauseTimeOnPackingPage);
+			return;
+		}
+		var peopleOfBarcode = barcodeField.getValue();
+
+		if (peopleOfBarcode) {
+			UserTableManager.getUserByBarcode(peopleOfBarcode, function (responseText) {
+				if (responseText != null && responseText != "") {
+					var result = Ext4.decode(responseText);
+					if (!result.success) {
+						result.isNotSameOrgUnit ? showResult("不允许登记非本科室人员，请扫描本科室人员条码") : showResult("输入的条码有误！", null, sstsConfig.messagePauseTimeOnPackingPage);  //（cjr）
+						return;
+					}
+					userNameField.setValue(result.fullName);
+					userCodeField.setValue(result.name);
+					if (focusField != null) {
+						focusExtJSField(focusField);
+					}
+				} else {
+					showResult('找不到该条码所对应的人员信息', null, sstsConfig.messagePauseTimeOnPackingPage);
+					userNameField.setValue();
+				}
+			});
+		}
+		barcodeField.setValue();
 	}
-    var peopleOfBarcode = barcodeField.getValue();
-    
-    if(peopleOfBarcode){
-        UserTableManager.getUserByBarcode(peopleOfBarcode,function(responseText){
-            if(responseText != null && responseText != ""){
-                var result = Ext4.decode(responseText);
-                if(!result.success){
-                	result.isNotSameOrgUnit?showResult("不允许登记非本科室人员，请扫描本科室人员条码"):showResult("输入的条码有误！" , null , sstsConfig.messagePauseTimeOnPackingPage);  //（cjr）
-                    return;
-                }
-                userNameField.setValue(result.fullName);
-                userCodeField.setValue(result.name);
-                if(focusField != null){
-                	focusExtJSField(focusField);
-                }
-            }else{
-                showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnPackingPage);
-                userNameField.setValue();
-            }
-        });
-    }
-    barcodeField.setValue();
-}
-var imagePanel = new Ext4.Panel({
-	id : 'imagePanel',
-	colspan: 2,
-	columnWidth : 1,
-	hidden : teachingPicture && teachingVideo,
-	height:((sstsConfig.showInspectorField || sstsConfig.showWrapperField || sstsConfig.showSterilizer) ? 230 : 297),
-	border : true,
-	layout:'fit',
-	items: [{
-		xtype : 'panel',  
-        layout:'absolute',
-        id: 'imageContentPanel',
-        items: [{
-    	    xtype : 'image',
-    	    id : 'browseImage',
-    	    fieldLabel : "预览图片",
-    	    title:'双击预览图片',
-    	    src : Ext4.BLANK_IMAGE_URL
-    	}]
-	}
-	],
-	tbar:[
-	      { id:'imageName'}
-	      ],
-	bbar: [
-	       {xtype:'hidden',id:'imageType'},
-	       {xtype:'hidden',id:'currentPage'},
-	       {xtype:'hidden',id:'materialId'},
-	       {xtype:'hidden',id:'vedioName'},
-		   {xtype:'hidden',id:'td_id'},
-		   {xtype:'hidden',id:'task_id'},
-		   {xtype:'hidden',id:'isTraceable'},
-		   {xtype:'hidden',id:'hideTousseName'},
-		   {xtype:'hidden',id:'hidePackedPhotographed'},
-	       '->',
-	       {
-               xtype : 'button',
-               id:'btn_cameraCapture',
-               name:'btn_cameraCapture',
-               text : '拍摄',
-               hidden : !sstsConfig.showCameraPhoto,
-               handler : function(){
+	var imagePanel = new Ext4.Panel({
+		id: 'imagePanel',
+		colspan: 2,
+		columnWidth: 1,
+		hidden: teachingPicture && teachingVideo,
+		height: ((sstsConfig.showInspectorField || sstsConfig.showWrapperField || sstsConfig.showSterilizer) ? 230 : 297),
+		border: true,
+		layout: 'fit',
+		items: [{
+			xtype: 'panel',
+			layout: 'absolute',
+			id: 'imageContentPanel',
+			items: [{
+				xtype: 'image',
+				id: 'browseImage',
+				fieldLabel: "预览图片",
+				title: '双击预览图片',
+				src: Ext4.BLANK_IMAGE_URL
+			}]
+		}
+		],
+		tbar: [
+			{ id: 'imageName' }
+		],
+		bbar: [
+			{ xtype: 'hidden', id: 'imageType' },
+			{ xtype: 'hidden', id: 'currentPage' },
+			{ xtype: 'hidden', id: 'materialId' },
+			{ xtype: 'hidden', id: 'vedioName' },
+			{ xtype: 'hidden', id: 'td_id' },
+			{ xtype: 'hidden', id: 'task_id' },
+			{ xtype: 'hidden', id: 'isTraceable' },
+			{ xtype: 'hidden', id: 'hideTousseName' },
+			{ xtype: 'hidden', id: 'hidePackedPhotographed' },
+			'->',
+			{
+				xtype: 'button',
+				id: 'btn_cameraCapture',
+				name: 'btn_cameraCapture',
+				text: '拍摄',
+				hidden: !sstsConfig.showCameraPhoto,
+				handler: function () {
 					var isTraceable = Ext4.getCmp('isTraceable').getValue();
 					var hideTousseName = Ext4.getCmp('hideTousseName').getValue();
-					if(isTraceable == '否'){
-						showResult('【'+hideTousseName+'】是不追溯的物品，不支持采集图像/视频');
+					if (isTraceable == '否') {
+						showResult('【' + hideTousseName + '】是不追溯的物品，不支持采集图像/视频');
 						return;
 					}
-				    var imageName = Ext4.getCmp('imageName').getText();
+					var imageName = Ext4.getCmp('imageName').getText();
 					var td_id = Ext4.getCmp('td_id').getValue();
 					var task_id = Ext4.getCmp('task_id').getValue();
-					if(isUndefinedOrNullOrEmpty(task_id)){
-           				showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage);
-           				return ;
-	        		}
-					takeImgAndVideo(imageName,td_id,task_id,false,imageTypeCameraPacking,videoTypePacking);
-               }
-           },
-	       {
-               xtype : 'button',
-               id:'btn_cameraPhoto_application',
-               name:'btn_cameraPhoto_application',
-               text : '申请采集图片/视频',
-               hidden : !sstsConfig.showCameraPhoto,
-               handler : function(){
-            	   var imageName = Ext4.getCmp('imageName').getText();
-            	   var materialId = Ext4.getCmp('materialId').getValue();				 
-            	   if(imageName != "" && materialId == ""){
-					   var td_id = Ext4.getCmp('td_id').getValue();
-					   takeImgAndVideo(imageName,td_id,'',true,imageTypeCameraApplication,videoType);
-            	   }
-               }
-           },
-	       {
-               xtype : 'button',
-               id:'btn_packingNote',
-               name:'btn_packingNote',
-               text : '配包注意事项',
-               hidden : teachingPicture,
-               handler : function(){
-            	   var td_id = Ext4.getCmp('td_id').getValue();
-            	   if(isUndefinedOrNullOrEmpty(td_id)){
-            			showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	        		}else{
-	        			showToussePackingNote(td_id);
-	        		}
-               }
-           },
-	       {
-               xtype : 'button',
-               id:'btn_specification',
-               name:'btn_specification',
-               text : '说明书',
-               hidden : specificationPicture,
-               handler : function(){
-            	   var imageName = Ext4.getCmp('imageName').getText();
-            	   var materialId = Ext4.getCmp('materialId').getValue();
-            	   if(imageName != "" && materialId == ""){
-					   var td_id = Ext4.getCmp('td_id').getValue();
-					   loadGoodsImage(imageName ,'器械包说明书' ,'',1 ,'' ,td_id);
-            		   setTimeout(function(){
+					if (isUndefinedOrNullOrEmpty(task_id)) {
+						showResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage);
+						return;
+					}
+					takeImgAndVideo(imageName, td_id, task_id, false, imageTypeCameraPacking, videoTypePacking);
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_cameraPhoto_application',
+				name: 'btn_cameraPhoto_application',
+				text: '申请采集图片/视频',
+				hidden: !sstsConfig.showCameraPhoto,
+				handler: function () {
+					var imageName = Ext4.getCmp('imageName').getText();
+					var materialId = Ext4.getCmp('materialId').getValue();
+					if (imageName != "" && materialId == "") {
+						var td_id = Ext4.getCmp('td_id').getValue();
+						takeImgAndVideo(imageName, td_id, '', true, imageTypeCameraApplication, videoType);
+					}
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_packingNote',
+				name: 'btn_packingNote',
+				text: '配包注意事项',
+				hidden: teachingPicture,
+				handler: function () {
+					var td_id = Ext4.getCmp('td_id').getValue();
+					if (isUndefinedOrNullOrEmpty(td_id)) {
+						showResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage);
+					} else {
+						showToussePackingNote(td_id);
+					}
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_specification',
+				name: 'btn_specification',
+				text: '说明书',
+				hidden: specificationPicture,
+				handler: function () {
+					var imageName = Ext4.getCmp('imageName').getText();
+					var materialId = Ext4.getCmp('materialId').getValue();
+					if (imageName != "" && materialId == "") {
+						var td_id = Ext4.getCmp('td_id').getValue();
+						loadGoodsImage(imageName, '器械包说明书', '', 1, '', td_id);
+						setTimeout(function () {
 							var row = {
-								tousseName:imageName,
-								td_id:td_id,
-								type:'器械包说明书',
-								materialId:'',
-								currentPage:1
+								tousseName: imageName,
+								td_id: td_id,
+								type: '器械包说明书',
+								materialId: '',
+								currentPage: 1
 							}
 							amendDisinfectionTousse(row);
 						}, 500);
-            	   }
-               }
-           },
-	       {
-               xtype : 'button',
-               id:'btn_teachingPicture',
-               name:'btn_teachingPicture',
-               text : '教学图片',
-               hidden : teachingPicture,
-               handler : function(){
-				   var imageName = Ext4.getCmp('imageName').getText();
-            	   var materialId = Ext4.getCmp('materialId').getValue();
-            	   if(imageName != "" && materialId == ""){
-					   var td_id = Ext4.getCmp('td_id').getValue();
-					   loadGoodsImage(imageName ,'器械包装配教学图片' ,'',1 ,'' ,td_id);
-            		   setTimeout(function(){
+					}
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_teachingPicture',
+				name: 'btn_teachingPicture',
+				text: '教学图片',
+				hidden: teachingPicture,
+				handler: function () {
+					var imageName = Ext4.getCmp('imageName').getText();
+					var materialId = Ext4.getCmp('materialId').getValue();
+					if (imageName != "" && materialId == "") {
+						var td_id = Ext4.getCmp('td_id').getValue();
+						loadGoodsImage(imageName, '器械包装配教学图片', '', 1, '', td_id);
+						setTimeout(function () {
 							var row = {
-								tousseName:imageName,
-								td_id:td_id,
-								type:'器械包装配教学图片',
-								materialId:'',
-								currentPage:1
+								tousseName: imageName,
+								td_id: td_id,
+								type: '器械包装配教学图片',
+								materialId: '',
+								currentPage: 1
 							}
 							amendDisinfectionTousse(row);
 						}, 500);
-				   }
-               }
-           },
-	       {
-               xtype : 'button',
-               hidden : teachingVideo,
-               text : '配包视频',
-               id:'btn_watchVideoBar',
-               name:'btn_watchVideoBar',
-               handler : function(){
-            	   var td_id = Ext4.getCmp('td_id').getValue();
-                   watchVideoModel(td_id);
-               }
-           },
-           {
-               xtype : 'button',
-               id : 'btn_washQualityCheckPoint',
-               name : 'btn_washQualityCheckPoint',
-               hidden : true,
-               text : '清洗质量检查关注点',
-               handler : function(){
-            	   if(!curSelMaterialId){
-            		   showResult("请选择材料" , null , sstsConfig.messagePauseTimeOnPackingPage);
-            		   return;
-            	   }
-               	   loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT,curSelMaterialId,1,"","");
-               }
-           },
-           {
-               xtype : 'button',
-               id : 'btn_washQualityCheckMethod',
-               name : 'btn_washQualityCheckMethod',
-               hidden : true,
-               text : '清洗质量检查方法',
-               handler : function(){
-            	   if(!curSelMaterialId){
-            		   showResult("请选择材料" , null , sstsConfig.messagePauseTimeOnPackingPage);
-            		   return;
-            	   }
-               	   loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD,curSelMaterialId,1,"","");
-               }
-           },
-           {
-               xtype : 'button',
-               id : 'btn_functionCheck',
-               name : 'btn_functionCheck',
-               hidden : true,
-               text : '功能检查',
-               handler : function(){
-            	   if(!curSelMaterialId){
-            		   showResult("请选择材料" , null , sstsConfig.messagePauseTimeOnPackingPage);
-            		   return;
-            	   }
-               	   loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_FUNCTIONCHECK,curSelMaterialId,1,"","");
-               }
-           },
-           {
-               xtype : 'button',
-               id : 'btn_viewTousseImage',
-               name : 'btn_viewTousseImage',
-               text : '查看包图片',
-               handler : function(){
-            	   if(lastSelectTousseName && lastSelectTdId){
-					   loadGoodsImage(lastSelectTousseName ,lastSelectimageTypeTousse ,'',1 ,lastSelectVedioName ,lastSelectTdId);
-					   setTimeout(function(){
+					}
+				}
+			},
+			{
+				xtype: 'button',
+				hidden: teachingVideo,
+				text: '配包视频',
+				id: 'btn_watchVideoBar',
+				name: 'btn_watchVideoBar',
+				handler: function () {
+					var td_id = Ext4.getCmp('td_id').getValue();
+					watchVideoModel(td_id);
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_washQualityCheckPoint',
+				name: 'btn_washQualityCheckPoint',
+				hidden: true,
+				text: '清洗质量检查关注点',
+				handler: function () {
+					if (!curSelMaterialId) {
+						showResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage);
+						return;
+					}
+					loadGoodsImage(curSelMaterialName, IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT, curSelMaterialId, 1, "", "");
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_washQualityCheckMethod',
+				name: 'btn_washQualityCheckMethod',
+				hidden: true,
+				text: '清洗质量检查方法',
+				handler: function () {
+					if (!curSelMaterialId) {
+						showResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage);
+						return;
+					}
+					loadGoodsImage(curSelMaterialName, IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD, curSelMaterialId, 1, "", "");
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_functionCheck',
+				name: 'btn_functionCheck',
+				hidden: true,
+				text: '功能检查',
+				handler: function () {
+					if (!curSelMaterialId) {
+						showResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage);
+						return;
+					}
+					loadGoodsImage(curSelMaterialName, IMAGE_TYPE_MATERIAL_FUNCTIONCHECK, curSelMaterialId, 1, "", "");
+				}
+			},
+			{
+				xtype: 'button',
+				id: 'btn_viewTousseImage',
+				name: 'btn_viewTousseImage',
+				text: '查看包图片',
+				handler: function () {
+					if (lastSelectTousseName && lastSelectTdId) {
+						loadGoodsImage(lastSelectTousseName, lastSelectimageTypeTousse, '', 1, lastSelectVedioName, lastSelectTdId);
+						setTimeout(function () {
 							var row = {
-								tousseName:lastSelectTousseName,
-								td_id:lastSelectTdId,
-								type:lastSelectimageTypeTousse,
-								materialId:'',
-								currentPage:1
+								tousseName: lastSelectTousseName,
+								td_id: lastSelectTdId,
+								type: lastSelectimageTypeTousse,
+								materialId: '',
+								currentPage: 1
 							}
 							amendDisinfectionTousse(row);
-					   }, 500);
-            	   }
-               }
-           },
-	       {xtype:'button',text:'<<',tooltip :"上一页", handler : function(){
-	    	   var imageName = Ext4.getCmp('imageName').getText();
-	    	   var imageType = Ext4.getCmp('imageType').getValue();
-	    	   var currentPage = Ext4.getCmp('currentPage').getValue();
-	    	   var materialId = Ext4.getCmp('materialId').getValue();
-	    	   var vedioName = Ext4.getCmp('vedioName').getValue();
-	    	   var td_id = Ext4.getCmp('td_id').getValue();
-	    	   if(currentPage <= 1){
-	    		   Ext4.getCmp('currentPage').setValue(1);
-	    		   showResult("已是第一页！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	    	   }else{
-	    		   loadGoodsImage(imageName,imageType,materialId,parseInt(currentPage)-1,vedioName,td_id);
-	    	   }
-	       }},
-	       {xtype:'button',text:'>>', tooltip :"下一页", handler : function(){
-	    	   var imageName = Ext4.getCmp('imageName').getText();
-	    	   var imageType = Ext4.getCmp('imageType').getValue();
-	    	   var currentPage = Ext4.getCmp('currentPage').getValue();
-	    	   var materialId = Ext4.getCmp('materialId').getValue();
-	    	   var vedioName = Ext4.getCmp('vedioName').getValue();
-			   var td_id = Ext4.getCmp('td_id').getValue();
-			   var params = {
-					id : td_id,
-					materialId: materialId,
-				 	imageType:imageType
-			   }
-			   if(imageType == '材料图片'){
-				   params = {
-						id : materialId,
-						imageType:imageType
-				   }
-			   }
-	    	   Ext4.Ajax.request({
-	    	         url : WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do',
-	    	         params : params,
-	    	         success : function(result){
-						 var pageCount = Ext4.JSON.decode(result.responseText);
-	    	             var totalPage = parseInt(pageCount.count);
-	    	             if(currentPage >= totalPage){
-	    	            	 Ext4.getCmp('currentPage').setValue(totalPage);
-	    	            	 showResult("已是最后一页！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	    	             }else{
-	    	            	 loadGoodsImage(imageName,imageType,materialId,parseInt(currentPage)+1,vedioName,td_id);
-	    	             }
-	    	         },
-	    	         failure : function(){}
-	    	     });
-	       }}
-	]
-});
+						}, 500);
+					}
+				}
+			},
+			{
+				xtype: 'button', text: '<<', tooltip: "上一页", handler: function () {
+					var imageName = Ext4.getCmp('imageName').getText();
+					var imageType = Ext4.getCmp('imageType').getValue();
+					var currentPage = Ext4.getCmp('currentPage').getValue();
+					var materialId = Ext4.getCmp('materialId').getValue();
+					var vedioName = Ext4.getCmp('vedioName').getValue();
+					var td_id = Ext4.getCmp('td_id').getValue();
+					if (currentPage <= 1) {
+						Ext4.getCmp('currentPage').setValue(1);
+						showResult("已是第一页！", null, sstsConfig.messagePauseTimeOnPackingPage);
+					} else {
+						loadGoodsImage(imageName, imageType, materialId, parseInt(currentPage) - 1, vedioName, td_id);
+					}
+				}
+			},
+			{
+				xtype: 'button', text: '>>', tooltip: "下一页", handler: function () {
+					var imageName = Ext4.getCmp('imageName').getText();
+					var imageType = Ext4.getCmp('imageType').getValue();
+					var currentPage = Ext4.getCmp('currentPage').getValue();
+					var materialId = Ext4.getCmp('materialId').getValue();
+					var vedioName = Ext4.getCmp('vedioName').getValue();
+					var td_id = Ext4.getCmp('td_id').getValue();
+					var params = {
+						id: td_id,
+						materialId: materialId,
+						imageType: imageType
+					}
+					if (imageType == '材料图片') {
+						params = {
+							id: materialId,
+							imageType: imageType
+						}
+					}
+					Ext4.Ajax.request({
+						url: WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do',
+						params: params,
+						success: function (result) {
+							var pageCount = Ext4.JSON.decode(result.responseText);
+							var totalPage = parseInt(pageCount.count);
+							if (currentPage >= totalPage) {
+								Ext4.getCmp('currentPage').setValue(totalPage);
+								showResult("已是最后一页！", null, sstsConfig.messagePauseTimeOnPackingPage);
+							} else {
+								loadGoodsImage(imageName, imageType, materialId, parseInt(currentPage) + 1, vedioName, td_id);
+							}
+						},
+						failure: function () { }
+					});
+				}
+			}
+		]
+	});
 
-var sterilizerTypeStore = new Ext4.data.Store({
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerTypeAndSterilizationPurpose.do',
-		reader : {
-			type : 'array'
-		}
-	},
-	fields : [ 'id','typeName','typeNameAndPurpose','sterilizationMode' ],
-	autoLoad : true
-});
-//灭菌炉
-var sterilizerJsonStore = new Ext4.data.Store({
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?includeNone=yes',
-		reader : {
-			type : 'array'
-		}
-	},
-    fields : [ 'sterilizerName' ],
-    autoLoad : true
-});
-var packageTypeStore = new Ext4.data.Store({
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageTypeAndExpirationDateInfo.do',
-		reader : {
-			type : 'array'
-		}
-	},
-	fields : ['typeName','validDate','validDateUnit','warningDate'],
-	autoLoad : true
-});
+	var sterilizerTypeStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerTypeAndSterilizationPurpose.do',
+			reader: {
+				type: 'array'
+			}
+		},
+		fields: ['id', 'typeName', 'typeNameAndPurpose', 'sterilizationMode'],
+		autoLoad: true
+	});
+	//灭菌炉
+	var sterilizerJsonStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?includeNone=yes',
+			reader: {
+				type: 'array'
+			}
+		},
+		fields: ['sterilizerName'],
+		autoLoad: true
+	});
+	var packageTypeStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageTypeAndExpirationDateInfo.do',
+			reader: {
+				type: 'array'
+			}
+		},
+		fields: ['typeName', 'validDate', 'validDateUnit', 'warningDate'],
+		autoLoad: true
+	});
 
-var tousseWeightStore = new Ext4.data.Store({
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do',
-		extraParams: {
-			optionId: 'tousseWeight'
+	var tousseWeightStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do',
+			extraParams: {
+				optionId: 'tousseWeight'
+			},
+			reader: {
+				type: 'json',
+				root: 'data'
+			}
 		},
-		reader : {
-			type: 'json',
-			root: 'data'
-		}
-	},
-	fields : ['value'],
-	autoLoad : true
-});
+		fields: ['value'],
+		autoLoad: true
+	});
 
-function deleteTask(tousseName,packAmount,taskItemArray){
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	var rootNode = basketTree.getRootNode();
-	var tousseNodes = rootNode.childNodes.slice(0);
-	var selNodes = basketTree.getView().getChecked();
-	if(tousseNodes.length > 0){
-		 Ext4.Array.each(tousseNodes, function(node){
-			 if(node.get('tousseName') == tousseName){
-				 if(node.get('unPackingAmount') == packAmount){
-					 node.remove();
-				 }else{
-					 node.set('amount',node.get('unPackingAmount') - packAmount);
-					 node.set('unPackingAmount',node.get('unPackingAmount') - packAmount);
-					 var urgentAmount = node.get('urgentAmount') - packAmount;
-					 if(urgentAmount < 0){
-						 urgentAmount = 0;
-					 }
-					 node.set('urgentAmount',urgentAmount);
-					 var taskNodes = node.childNodes;
-					
-					 var delNodes = new Array();
-					 for(var i = 0;i < taskItemArray.length;i++){
-						 var taskId = taskItemArray[i].taskId;
-						 var amount = taskItemArray[i].amount;
-						 Ext4.Array.each(taskNodes,function(cNode){
-							 if(cNode.get('taskId') == taskId){
-								 var errors = cNode.get('errors');
-								 var damages = cNode.get("damages");
-								 if((errors == null || errors.length == 0) && (damages == null || damages.length == 0)){
-									 if(amount < cNode.get('amount')){
-										 cNode.set('amount',cNode.get('amount') - amount);
-									 }else{
-										 var len = delNodes.length;
-										 delNodes[len] = cNode;
-									 }
-								 }
-							 }
-						 });
-					 }
-					 for(var j = 0;j < delNodes.length;j++){
-						delNodes[j].remove()
+	function deleteTask(tousseName, packAmount, taskItemArray) {
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var rootNode = basketTree.getRootNode();
+		var tousseNodes = rootNode.childNodes.slice(0);
+		var selNodes = basketTree.getView().getChecked();
+		if (tousseNodes.length > 0) {
+			Ext4.Array.each(tousseNodes, function (node) {
+				if (node.get('tousseName') == tousseName) {
+					if (node.get('unPackingAmount') == packAmount) {
+						node.remove();
+					} else {
+						node.set('amount', node.get('unPackingAmount') - packAmount);
+						node.set('unPackingAmount', node.get('unPackingAmount') - packAmount);
+						var urgentAmount = node.get('urgentAmount') - packAmount;
+						if (urgentAmount < 0) {
+							urgentAmount = 0;
+						}
+						node.set('urgentAmount', urgentAmount);
+						var taskNodes = node.childNodes;
+
+						var delNodes = new Array();
+						for (var i = 0; i < taskItemArray.length; i++) {
+							var taskId = taskItemArray[i].taskId;
+							var amount = taskItemArray[i].amount;
+							Ext4.Array.each(taskNodes, function (cNode) {
+								if (cNode.get('taskId') == taskId) {
+									var errors = cNode.get('errors');
+									var damages = cNode.get("damages");
+									if ((errors == null || errors.length == 0) && (damages == null || damages.length == 0)) {
+										if (amount < cNode.get('amount')) {
+											cNode.set('amount', cNode.get('amount') - amount);
+										} else {
+											var len = delNodes.length;
+											delNodes[len] = cNode;
+										}
+									}
+								}
+							});
+						}
+						for (var j = 0; j < delNodes.length; j++) {
+							delNodes[j].remove()
+						}
 					}
-				 }
-			 }
-		 });
+				}
+			});
+		}
 	}
-}
-// 校验材料是否有丢失和报损还未补充
-function validateSupplement(cNode){
-	var tousseName = cNode.get("tousseName");
-	var	status = cNode.get("status");
-	var	basketBarcode = cNode.get("basketBarcode");
- 	var taskId = cNode.get("taskId");
- 	var tousseType = cNode.get("tousseType");
- 	var damages = cNode.get("damages");
- 	var errors = cNode.get("errors");
- 	
- 	if(status == '待确认'){
-		showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-		return false;
-	}
- 	if(!allowPackingWhenUnSupplementMaterial){
- 		var lost = false;
- 	    for(var i = 0;i < errors.length ; i++) {
- 	        if(errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
- 	        	lost = true;
- 	        }
- 	    }
- 	    if(lost){
- 	    	showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
- 	    	return false;
- 	    }
- 	    if(damages != null && damages.length > 0){
- 	    	showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
- 	    	return false;
- 	    }
- 	}
-    return true;
-}
-formPanel = new Ext4.Panel({
-	id : 'formPanel',
-	minHeight: 110,
-    region: 'center',
-//    margin: '0 0 ' + (document.body.clientHeight-((sstsConfig.showInspectorField || sstsConfig.showWrapperField || sstsConfig.showSterilizer) ? 470 : 440)) + ' 0',
-	border: true,
-	buttonAlign : 'center',
-	layout: "column",
-	items:[imagePanel,{
-		xtype : 'hidden',
-		id : 'taskGroup',
-		name : 'taskGroup'
-	},{
-		xtype : 'hidden',
-		id : 'inspectorCode',
-		name : 'inspectorCode',
-		value : inspectorCode
-	},{
-		xtype : 'hidden',
-		id : 'operatorCode',
-		name : 'operatorCode',
-		value : operatorCode
-	},{
-		xtype : 'hidden',
-		id : 'reviewerCode',
-		name : 'reviewerCode',
-		value : reviewerCode
-	},{
-		xtype : 'hidden',
-		id : 'sterileCode',
-		name : 'sterileCode',
-		value : sterileUserCode
-	},{
-		xtype : 'hidden',
-		id : 'wrapperCode',
-		name : 'wrapperCode',
-		value : wrapperCode
-	},{
-        xtype : 'hidden',
-        id : 'idCardBarcode',
-        name : 'idCardBarcode'
-    },{
-        xtype : 'hidden',
-        id : 'packedPhotographed',
-        name : 'packedPhotographed'
-    },{
-		columnWidth : .5,
-		hidden : sstsConfig.disableIdCard,
-		xtype : 'textfield',
-		id : 'scanIdCardBarcode',
-		fieldLabel : "标识牌条码",
-		componentCls:'formItemMgn',
-		labelWidth:90,
-		anchor : '90%',
-		labelAlign:'right',
-		enableKeyEvents: true,
-		listeners : {
-			keypress: function(thiz, e, eOpts ){
-				if(e.getKey() == 13){
-					if(processActionBarcode(thiz)){
-						return;
-					}
-					loadIdCardByBarcode(thiz.getValue(),true,true);
-					thiz.setValue();
+	// 校验材料是否有丢失和报损还未补充
+	function validateSupplement(cNode) {
+		var tousseName = cNode.get("tousseName");
+		var status = cNode.get("status");
+		var basketBarcode = cNode.get("basketBarcode");
+		var taskId = cNode.get("taskId");
+		var tousseType = cNode.get("tousseType");
+		var damages = cNode.get("damages");
+		var errors = cNode.get("errors");
+
+		if (status == '待确认') {
+			showResult(tousseName + ",有器械丢失，请确认！", null, sstsConfig.messagePauseTimeOnPackingPage);
+			return false;
+		}
+		if (!allowPackingWhenUnSupplementMaterial) {
+			var lost = false;
+			for (var i = 0; i < errors.length; i++) {
+				if (errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
+					lost = true;
 				}
 			}
+			if (lost) {
+				showResult("材料缺失，不够组成器械包，请补充缺失器械！", null, sstsConfig.messagePauseTimeOnPackingPage);
+				return false;
+			}
+			if (damages != null && damages.length > 0) {
+				showResult("材料已报损，不够组成器械包，请补充报损器械！", null, sstsConfig.messagePauseTimeOnPackingPage);
+				return false;
+			}
 		}
-	},{
-		columnWidth : .5,
-		hidden : sstsConfig.disableIdCard,
-		xtype : 'textfield',
-		fieldLabel : '标识牌',
-		componentCls:'formItemMgn',
-		maxLength : '50',
-		id : 'idCardName',
-		name : 'idCardName',
-		labelWidth:90,
-		anchor : '95%',
-		labelAlign:'right',
-		allowBlank : true,
-		readOnly : true
-	},{
-		columnWidth : .5,
-		hidden : sstsConfig.disableIdCard,
-		xtype : 'textfield',
-		fieldLabel : '使用次数',
-		componentCls:'formItemMgn',
-		maxLength : '50',
-		id : 'idCardUseAmount',
-		name : 'idCardUseAmount',
-		labelWidth:90,
-		anchor : '95%',
-		labelAlign:'right',
-		allowBlank : true,
-		readOnly : true
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : inspectorName + '条码',
-		componentCls:'formItemMgn',
-		id : 'inspectorBarcode',
-		name : 'inspectorBarcode',
-		hidden : !sstsConfig.showInspectorField,
-		labelWidth:90,
-		anchor : '90%',
-		labelAlign:'right',
-		listeners : {
-			specialkey : function(thiz, e){
-				if(e.getKey() == 13){
-					if(processActionBarcode(thiz)){
-						return;
+		return true;
+	}
+	formPanel = new Ext4.Panel({
+		id: 'formPanel',
+		minHeight: 110,
+		region: 'center',
+		//    margin: '0 0 ' + (document.body.clientHeight-((sstsConfig.showInspectorField || sstsConfig.showWrapperField || sstsConfig.showSterilizer) ? 470 : 440)) + ' 0',
+		border: true,
+		buttonAlign: 'center',
+		layout: "column",
+		items: [imagePanel, {
+			xtype: 'hidden',
+			id: 'taskGroup',
+			name: 'taskGroup'
+		}, {
+				xtype: 'hidden',
+				id: 'inspectorCode',
+				name: 'inspectorCode',
+				value: inspectorCode
+			}, {
+				xtype: 'hidden',
+				id: 'operatorCode',
+				name: 'operatorCode',
+				value: operatorCode
+			}, {
+				xtype: 'hidden',
+				id: 'reviewerCode',
+				name: 'reviewerCode',
+				value: reviewerCode
+			}, {
+				xtype: 'hidden',
+				id: 'sterileCode',
+				name: 'sterileCode',
+				value: sterileUserCode
+			}, {
+				xtype: 'hidden',
+				id: 'wrapperCode',
+				name: 'wrapperCode',
+				value: wrapperCode
+			}, {
+				xtype: 'hidden',
+				id: 'idCardBarcode',
+				name: 'idCardBarcode'
+			}, {
+				xtype: 'hidden',
+				id: 'packedPhotographed',
+				name: 'packedPhotographed'
+			}, {
+				columnWidth: .5,
+				hidden: sstsConfig.disableIdCard,
+				xtype: 'textfield',
+				id: 'scanIdCardBarcode',
+				fieldLabel: "标识牌条码",
+				componentCls: 'formItemMgn',
+				labelWidth: 90,
+				anchor: '90%',
+				labelAlign: 'right',
+				enableKeyEvents: true,
+				listeners: {
+					keypress: function (thiz, e, eOpts) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(thiz)) {
+								return;
+							}
+							loadIdCardByBarcode(thiz.getValue(), true, true);
+							thiz.setValue();
+						}
 					}
-					loadUserByBarcode(thiz,Ext4.getCmp('inspector'),Ext4.getCmp('inspectorCode'),Ext4.getCmp('operatorBarcode'));
-					inspectorCode = Ext4.getCmp('inspectorCode').getValue();
-                    jobType_inspector_name = Ext4.getCmp('inspector').getValue();
 				}
-			}
-		}
-	
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : inspectorName,
-		componentCls:'formItemMgn',
-		id : 'inspector',
-		name : 'inspector',
-		hidden : !sstsConfig.showInspectorField,
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : false,
-		readOnly : true,
-		labelAlign:'right',
-		value : jobType_inspector_name
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '配包人条码',
-		componentCls:'formItemMgn',
-		id : 'operatorBarcode',
-		name : 'operatorBarcode',
-		labelWidth:90,
-		anchor : '90%',
-		labelAlign:'right',
-		listeners : {
-			specialkey : function(thiz, e){
-				if(e.getKey() == 13){
-					if(processActionBarcode(thiz)){
-						return;
+			}, {
+				columnWidth: .5,
+				hidden: sstsConfig.disableIdCard,
+				xtype: 'textfield',
+				fieldLabel: '标识牌',
+				componentCls: 'formItemMgn',
+				maxLength: '50',
+				id: 'idCardName',
+				name: 'idCardName',
+				labelWidth: 90,
+				anchor: '95%',
+				labelAlign: 'right',
+				allowBlank: true,
+				readOnly: true
+			}, {
+				columnWidth: .5,
+				hidden: sstsConfig.disableIdCard,
+				xtype: 'textfield',
+				fieldLabel: '使用次数',
+				componentCls: 'formItemMgn',
+				maxLength: '50',
+				id: 'idCardUseAmount',
+				name: 'idCardUseAmount',
+				labelWidth: 90,
+				anchor: '95%',
+				labelAlign: 'right',
+				allowBlank: true,
+				readOnly: true
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: inspectorName + '条码',
+				componentCls: 'formItemMgn',
+				id: 'inspectorBarcode',
+				name: 'inspectorBarcode',
+				hidden: !sstsConfig.showInspectorField,
+				labelWidth: 90,
+				anchor: '90%',
+				labelAlign: 'right',
+				listeners: {
+					specialkey: function (thiz, e) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(thiz)) {
+								return;
+							}
+							loadUserByBarcode(thiz, Ext4.getCmp('inspector'), Ext4.getCmp('inspectorCode'), Ext4.getCmp('operatorBarcode'));
+							inspectorCode = Ext4.getCmp('inspectorCode').getValue();
+							jobType_inspector_name = Ext4.getCmp('inspector').getValue();
+						}
 					}
-					var focusField = Ext4.getCmp('reviewerBarcode');
-					if(sstsConfig.hideReviewerField){
-						if(sstsConfig.showSterileField){
-							focusField = Ext4.getCmp('sterileBarcode');
-						}else{
-							focusField = Ext4.getCmp('wrapperBarcode');
+				}
+
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: inspectorName,
+				componentCls: 'formItemMgn',
+				id: 'inspector',
+				name: 'inspector',
+				hidden: !sstsConfig.showInspectorField,
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: false,
+				readOnly: true,
+				labelAlign: 'right',
+				value: jobType_inspector_name
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '配包人条码',
+				componentCls: 'formItemMgn',
+				id: 'operatorBarcode',
+				name: 'operatorBarcode',
+				labelWidth: 90,
+				anchor: '90%',
+				labelAlign: 'right',
+				listeners: {
+					specialkey: function (thiz, e) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(thiz)) {
+								return;
+							}
+							var focusField = Ext4.getCmp('reviewerBarcode');
+							if (sstsConfig.hideReviewerField) {
+								if (sstsConfig.showSterileField) {
+									focusField = Ext4.getCmp('sterileBarcode');
+								} else {
+									focusField = Ext4.getCmp('wrapperBarcode');
+								}
+							}
+							loadUserByBarcode(thiz, Ext4.getCmp('operator'), Ext4.getCmp('operatorCode'), focusField);
+							operatorCode = Ext4.getCmp('operatorCode').getValue();
+							jobType_pack_name = Ext4.getCmp('operator').getValue();
 						}
 					}
-					loadUserByBarcode(thiz,Ext4.getCmp('operator'),Ext4.getCmp('operatorCode'),focusField);
-					operatorCode = Ext4.getCmp('operatorCode').getValue();
-					jobType_pack_name = Ext4.getCmp('operator').getValue();
 				}
-			}
-		}
-	
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '配包人',
-		componentCls:'formItemMgn',
-		id : 'operator',
-		name : 'operator',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : false,
-		readOnly : true,
-		labelAlign:'right',
-		value : jobType_pack_name
-	
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : ''+reviewViewText+'人条码',
-		componentCls:'formItemMgn',
-		id : 'reviewerBarcode',
-		name : 'reviewerBarcode',
-		hidden : sstsConfig.printLabelWhenReviewing || sstsConfig.hideReviewerField,
-		labelWidth:90,
-		anchor : '90%',
-		labelAlign:'right',
-		listeners : {
-			specialkey : function(thiz, e){
-				if(e.getKey() == 13){
-					if(processActionBarcode(thiz)){
-						return;
+
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '配包人',
+				componentCls: 'formItemMgn',
+				id: 'operator',
+				name: 'operator',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: false,
+				readOnly: true,
+				labelAlign: 'right',
+				value: jobType_pack_name
+
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '' + reviewViewText + '人条码',
+				componentCls: 'formItemMgn',
+				id: 'reviewerBarcode',
+				name: 'reviewerBarcode',
+				hidden: sstsConfig.printLabelWhenReviewing || sstsConfig.hideReviewerField,
+				labelWidth: 90,
+				anchor: '90%',
+				labelAlign: 'right',
+				listeners: {
+					specialkey: function (thiz, e) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(thiz)) {
+								return;
+							}
+							var focusField = Ext4.getCmp('wrapperBarcode');
+							if (sstsConfig.showSterileField) {
+								focusField = Ext4.getCmp('sterileBarcode');
+							}
+							loadUserByBarcode(thiz, Ext4.getCmp('reviewer'), Ext4.getCmp('reviewerCode'), focusField);
+							reviewerCode = Ext4.getCmp('reviewerCode').getValue();
+							jobType_review_name = Ext4.getCmp('reviewer').getValue();
+						}
 					}
-					var focusField = Ext4.getCmp('wrapperBarcode');
-					if(sstsConfig.showSterileField){
-						focusField = Ext4.getCmp('sterileBarcode');
+				}
+
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '' + reviewViewText + '人',
+				componentCls: 'formItemMgn',
+				id: 'reviewer',
+				name: 'reviewer',
+				hidden: sstsConfig.printLabelWhenReviewing || sstsConfig.hideReviewerField,
+				labelAlign: 'right',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: false,
+				allowBlank: false,
+				readOnly: true,
+				value: jobType_review_name
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '灭菌人条码',
+				componentCls: 'formItemMgn',
+				id: 'sterileBarcode',
+				name: 'sterileBarcode',
+				hidden: !sstsConfig.showSterileField,
+				labelWidth: 90,
+				anchor: '90%',
+				labelAlign: 'right',
+				listeners: {
+					specialkey: function (thiz, e) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(thiz)) {
+								return;
+							}
+							if (sstsConfig.showSterileField) {
+								var focusField = Ext4.getCmp('wrapperBarcode');
+							}
+
+							loadUserByBarcode(thiz, Ext4.getCmp('sterileUser'), Ext4.getCmp('sterileCode'), focusField);
+							sterileUserCode = Ext4.getCmp('sterileCode').getValue();
+							jobType_sterile_name = Ext4.getCmp('sterileUser').getValue();
+						}
 					}
-					loadUserByBarcode(thiz,Ext4.getCmp('reviewer'),Ext4.getCmp('reviewerCode'),focusField);
-					reviewerCode = Ext4.getCmp('reviewerCode').getValue();
-					jobType_review_name = Ext4.getCmp('reviewer').getValue();
 				}
-			}
-		}
-	
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : ''+reviewViewText+'人',
-		componentCls:'formItemMgn',
-		id : 'reviewer',
-		name : 'reviewer',
-		hidden : sstsConfig.printLabelWhenReviewing || sstsConfig.hideReviewerField,
-		labelAlign:'right',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : false,
-		allowBlank : false,
-		readOnly : true,
-		value:jobType_review_name
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '灭菌人条码',
-		componentCls:'formItemMgn',
-		id : 'sterileBarcode',
-		name : 'sterileBarcode',
-		hidden : !sstsConfig.showSterileField,
-		labelWidth:90,
-		anchor : '90%',
-		labelAlign:'right',
-		listeners : {
-			specialkey : function(thiz, e){
-				if(e.getKey() == 13){
-					if(processActionBarcode(thiz)){
-						return;
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '灭菌人',
+				componentCls: 'formItemMgn',
+				id: 'sterileUser',
+				name: 'sterileUser',
+				hidden: !sstsConfig.showSterileField,
+				labelAlign: 'right',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: false,
+				allowBlank: false,
+				readOnly: true,
+				value: jobType_sterile_name
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '包装人条码',
+				componentCls: 'formItemMgn',
+				id: 'wrapperBarcode',
+				name: 'wrapperBarcode',
+				hidden: !sstsConfig.showWrapperField,
+				labelWidth: 90,
+				anchor: '90%',
+				labelAlign: 'right',
+				listeners: {
+					specialkey: function (thiz, e) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(thiz)) {
+								return;
+							}
+							loadUserByBarcode(thiz, Ext4.getCmp('wrapper'), Ext4.getCmp('wrapperCode'), null);
+							wrapperCode = Ext4.getCmp('wrapperCode').getValue();
+							jobType_wrapper_name = Ext4.getCmp('wrapper').getValue();;
+						}
 					}
-					if(sstsConfig.showSterileField){
-						var focusField = Ext4.getCmp('wrapperBarcode');
+				}
+
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '包装人',
+				componentCls: 'formItemMgn',
+				id: 'wrapper',
+				name: 'wrapper',
+				hidden: !sstsConfig.showWrapperField,
+				labelAlign: 'right',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: false,
+				allowBlank: false,
+				readOnly: true,
+				value: jobType_wrapper_name
+
+			}, {
+				columnWidth: .5,
+				xtype: 'combo',
+				fieldLabel: '灭菌程序',
+				id: 'sterilingType',
+				name: 'sterilingType',
+				componentCls: 'formItemMgn',
+				hidden: sstsConfig.hideSterilingType,
+				minChars: 0,
+				labelWidth: 90,
+				labelAlign: 'right',
+				valueField: 'typeName',
+				displayField: 'typeNameAndPurpose',
+				labelAlign: 'right',
+				store: sterilizerTypeStore,
+				forceSelection: true,
+				lazyInit: true,
+				anchor: '90%',
+				editable: false,
+				triggerAction: 'all',
+				typeAhead: false,
+				allowBlank: false,
+				listeners: {
+					select: function (combo, rec) {
+						Ext4.getCmp('sterilingMode').setValue(rec[0].data["sterilizationMode"]);
 					}
-					
-					loadUserByBarcode(thiz,Ext4.getCmp('sterileUser'),Ext4.getCmp('sterileCode'),focusField);
-					sterileUserCode = Ext4.getCmp('sterileCode').getValue();
-					jobType_sterile_name = Ext4.getCmp('sterileUser').getValue();
 				}
-			}
-		}
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '灭菌人',
-		componentCls:'formItemMgn',
-		id : 'sterileUser',
-		name : 'sterileUser',
-		hidden : !sstsConfig.showSterileField,
-		labelAlign:'right',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : false,
-		allowBlank : false,
-		readOnly : true,
-		value:jobType_sterile_name
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '包装人条码',
-		componentCls:'formItemMgn',
-		id : 'wrapperBarcode',
-		name : 'wrapperBarcode',
-		hidden : !sstsConfig.showWrapperField,
-		labelWidth:90,
-		anchor : '90%',
-		labelAlign:'right',
-		listeners : {
-			specialkey : function(thiz, e){
-				if(e.getKey() == 13){
-					if(processActionBarcode(thiz)){
-						return;
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '灭菌方式',
+				hidden: sstsConfig.hideSterilingType,
+				id: 'sterilingMode',
+				name: 'sterilingMode',
+				componentCls: 'formItemMgn',
+				readOnly: true,
+				labelWidth: 90,
+				labelAlign: 'right',
+				anchor: '90%'
+			}, {
+				columnWidth: .5,
+				xtype: 'combo',
+				fieldLabel: '包装类型',
+				id: 'packageType',
+				name: 'packageType',
+				componentCls: 'formItemMgn',
+				minChars: 0,
+				labelWidth: 90,
+				labelAlign: 'right',
+				valueField: 'typeName',
+				displayField: 'typeName',
+				labelAlign: 'right',
+				store: packageTypeStore,
+				forceSelection: true,
+				lazyInit: true,
+				anchor: '95%',
+				editable: false,
+				triggerAction: 'all',
+				typeAhead: false,
+				allowBlank: false,
+				listeners: {
+					select: function (combo, record, index) {
+						if (record && record[0]) {
+							var validDate = record[0].data["validDate"];
+							if (validDate == null || validDate === '') {
+								alert(record[0].data["typeName"] + '未配置失效期');
+							} else if (validDate == '0') {
+								alert(record[0].data["typeName"] + '无失效期');
+							} else {
+								alert(record[0].data["typeName"] + '失效期为' + record[0].data["validDate"] + record[0].data["validDateUnit"]);
+							}
+						}
 					}
-                    loadUserByBarcode(thiz,Ext4.getCmp('wrapper'),Ext4.getCmp('wrapperCode'),null);
-                    wrapperCode = Ext4.getCmp('wrapperCode').getValue();
-                    jobType_wrapper_name = Ext4.getCmp('wrapper').getValue();;
 				}
-			}
-		}
-	
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '包装人',
-		componentCls:'formItemMgn',
-		id : 'wrapper',
-		name : 'wrapper',
-		hidden : !sstsConfig.showWrapperField,
-		labelAlign:'right',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : false,
-		allowBlank : false,
-		readOnly : true,
-		value:jobType_wrapper_name
-	
-	},{
-		columnWidth :.5,
-		xtype : 'combo',
-		fieldLabel : '灭菌程序',
-		id : 'sterilingType',
-		name : 'sterilingType',
-		componentCls:'formItemMgn',
-		hidden : sstsConfig.hideSterilingType,
-		minChars : 0,
-		labelWidth:90,
-		labelAlign:'right',
-		valueField : 'typeName',
-		displayField : 'typeNameAndPurpose',
-		labelAlign:'right',
-		store : sterilizerTypeStore,
-		forceSelection : true,
-		lazyInit : true,
-		anchor : '90%',
-		editable:false,
-		triggerAction : 'all',
-		typeAhead : false,
-		allowBlank : false,
-		listeners : {
-			select : function(combo,rec){
-				Ext4.getCmp('sterilingMode').setValue(rec[0].data["sterilizationMode"]);
-			}
-		}
-	},{
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '灭菌方式',
-		hidden : sstsConfig.hideSterilingType,
-		id : 'sterilingMode',
-		name : 'sterilingMode',
-		componentCls:'formItemMgn',
-		readOnly : true,
-		labelWidth:90,
-		labelAlign:'right',
-		anchor : '90%'
-	},{
-		columnWidth :.5,
-		xtype : 'combo',
-		fieldLabel : '包装类型',
-		id : 'packageType',
-		name : 'packageType',
-		componentCls:'formItemMgn',
-		minChars : 0,
-		labelWidth:90,
-		labelAlign:'right',
-		valueField : 'typeName',
-		displayField : 'typeName',
-		labelAlign:'right',
-		store : packageTypeStore,
-		forceSelection : true,
-		lazyInit : true,
-		anchor : '95%',
-		editable:false,
-		triggerAction : 'all',
-		typeAhead : false,
-		allowBlank : false,
-		listeners : {
-			select : function(combo,record,index){
-				if(record && record[0]){
-					var validDate = record[0].data["validDate"];
-					if(validDate == null || validDate === ''){
-						alert(record[0].data["typeName"]+'未配置失效期');
-					}else if(validDate == '0'){
-						alert(record[0].data["typeName"]+'无失效期');
-					}else{
-						alert(record[0].data["typeName"]+'失效期为'+record[0].data["validDate"]+record[0].data["validDateUnit"]);
+
+			}, {
+				columnWidth: .5,
+				xtype: 'combo',
+				fieldLabel: '灭菌炉',
+				id: 'sterilizer',
+				name: 'sterilizer',
+				hidden: !sstsConfig.showSterilizer,
+				componentCls: 'formItemMgn',
+				minChars: 0,
+				labelWidth: 90,
+				labelAlign: 'right',
+				valueField: 'sterilizerName',
+				displayField: 'sterilizerName',
+				labelAlign: 'right',
+				store: sterilizerJsonStore,
+				forceSelection: true,
+				lazyInit: true,
+				anchor: '90%',
+				editable: false,
+				triggerAction: 'all',
+				typeAhead: false,
+				allowBlank: !sstsConfig.sterilizerNotAllowBlank,
+				listWidth: 140,
+				listeners: {
+					select: function (combo, record, index) {
+						var sterilizerTypeObj = Ext4.getCmp("sterilingType").getValue();
+						var reset = false;
+						SterilizationRecordTableManager.getSterilisationAndMaxFrequencyMap(combo.value, 0, function (map) {
+							var sterilizerTypeData = new Array();
+							sterilizerTypeData.push(new Array("0", "无", "", ""));
+							var frequency = 1;
+							if (map) {
+								if (map.sterilisationList) {
+									reset = true;
+									for (var k = 0, len = map.sterilisationList.length; k < len; k++) {
+										var sterilisationAndpurposeStr = '';
+										var purpose = map.sterilisationList[k].sterilizationPurpose;
+										if (purpose != null && purpose != '') {
+											sterilisationAndpurposeStr = map.sterilisationList[k].sterilisation + '(' + purpose + ')';
+										}
+										sterilizerTypeData.push(new Array(map.sterilisationList[k].id, map.sterilisationList[k].sterilisation, sterilisationAndpurposeStr, map.sterilisationList[k].sterilizationMode));
+										if (sterilizerTypeObj == map.sterilisationList[k].sterilisation) {
+											reset = false;
+										}
+									}
+									frequency = map.maxFrequency;
+								}
+								else {
+									sterilizerTypeStore.reload();
+									frequency = "";
+								}
+							}
+							sterilizerTypeStore.loadData(sterilizerTypeData);
+							Ext4.getCmp('frequency').setValue(frequency);
+							if (reset) {
+								Ext4.getCmp("sterilingType").setValue("");
+								Ext4.getCmp("sterilingMode").setValue("");
+							}
+						});
 					}
 				}
+
+			}, {
+				columnWidth: .5,
+				xtype: 'numberfield',
+				fieldLabel: '炉次',
+				allowDecimals: false,
+				allowNegative: false,
+				id: 'frequency',
+				name: 'frequency',
+				hidden: !sstsConfig.showSterilizer,
+				componentCls: 'formItemMgn',
+				minValue: 1,
+				labelWidth: 90,
+				labelAlign: 'right',
+				allowBlank: !sstsConfig.sterilizerNotAllowBlank,
+				anchor: '95%'
+
+			}, {
+				columnWidth: .5,
+				xtype: 'datefield',
+				fieldLabel: '灭菌日期',
+				componentCls: 'formItemMgn',
+				labelWidth: 90,
+				labelAlign: 'right',
+				id: 'sterileDate',
+				name: 'sterileDate',
+				hidden: sstsConfig.printLabelWhenReviewing || sstsConfig.hideSterileDate,
+				emptyText: '默认为今天',
+				minValue: new Date(),
+				inputAttrTpl: " data-qtip='空白表示灭菌日期为今天' ",
+				editable: false,
+				altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+				selectOnFocus: true,
+				format: 'Y-m-d',
+				allowBlank: true,
+				anchor: '90%'
+			}, {
+				columnWidth: .5,
+				xtype: 'combo',
+				hidden: !sstsConfig.showTousseWeight,
+				fieldLabel: '重量',
+				id: 'tousseWeight',
+				name: 'tousseWeight',
+				componentCls: 'formItemMgn',
+				minChars: 0,
+				labelWidth: 90,
+				labelAlign: 'right',
+				valueField: 'value',
+				displayField: 'value',
+				labelAlign: 'right',
+				store: tousseWeightStore,
+				forceSelection: true,
+				lazyInit: true,
+				anchor: '95%',
+				editable: false,
+				triggerAction: 'all',
+				typeAhead: false,
+				allowBlank: true
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '备注',
+				componentCls: 'formItemMgn',
+				id: 'remark',
+				name: 'remark',
+				maxLength: '1000',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: true,
+				labelAlign: 'right'
+			}, {
+				xtype: 'hidden',
+				id: 'errorDamageRemarkId',
+				name: 'errorDamageRemarkId'
+			}, {
+				xtype: 'hidden',
+				id: 'errorDamageRemarkInfo',
+				name: 'errorDamageRemarkInfo'
+			}, {
+				columnWidth: .99,
+				xtype: 'textfield',
+				fieldLabel: '丢失材料',
+				componentCls: 'formItemMgn',
+				id: 'errorMaterialsTip',
+				name: 'errorMaterialsTip',
+				maxLength: '250',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: true,
+				readOnly: true,
+				hidden: !sstsConfig.enablePackingMaterialErrorDamageRemark,
+				cls: 'fieldReadOnlyNoRemove',
+				labelAlign: 'right'
+			}, {
+				columnWidth: .99,
+				xtype: 'textfield',
+				fieldLabel: '丢失备注',
+				componentCls: 'formItemMgn',
+				id: 'errorRemark',
+				name: 'errorRemark',
+				maxLength: '250',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: true,
+				readOnly: true,
+				hidden: !sstsConfig.enablePackingMaterialErrorDamageRemark,
+				cls: 'fieldReadOnlyNoRemove',
+				labelAlign: 'right'
+			}, {
+				columnWidth: .99,
+				xtype: 'textfield',
+				fieldLabel: '报损材料',
+				componentCls: 'formItemMgn',
+				id: 'damageMaterialsTip',
+				name: 'damageMaterialsTip',
+				maxLength: '250',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: true,
+				readOnly: true,
+				hidden: !sstsConfig.enablePackingMaterialErrorDamageRemark,
+				cls: 'fieldReadOnlyNoRemove',
+				labelAlign: 'right'
+			}, {
+				columnWidth: .99,
+				xtype: 'textfield',
+				fieldLabel: '报损备注',
+				componentCls: 'formItemMgn',
+				id: 'damageRemark',
+				name: 'damageRemark',
+				maxLength: '250',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: true,
+				readOnly: true,
+				hidden: !sstsConfig.enablePackingMaterialErrorDamageRemark,
+				cls: 'fieldReadOnlyNoRemove',
+				labelAlign: 'right'
+			}, {
+				columnWidth: .99,
+				xtype: 'textfield',
+				fieldLabel: '回收备注',
+				componentCls: 'formItemMgn',
+				id: 'recyclingItemRemark',
+				name: 'recyclingItemRemark',
+				maxLength: '250',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: true,
+				readOnly: true,
+				hidden: !sstsConfig.enableRecyclingItemRemark,
+				cls: 'fieldReadOnlyNoRemove',
+				labelAlign: 'right'
+			}, {
+				columnWidth: .99,
+				xtype: 'panel',
+				border: false,
+				layout: {
+					type: 'hbox',
+					padding: '5',
+					pack: 'center',
+					align: 'middle'
+				},
+				items: [{
+					xtype: 'button',
+					id: "save_print",
+					text: '<span style="font-weight: bold;">' + packingBtnText + '</span>',
+					handler: function () {
+						packingTousseBtnClick0(this, true);
+					}
+				},
+				{
+					xtype: 'button',
+					id: "packingLableBtn",
+					margin: '0 0 0 10',
+					hidden: !sstsConfig.showPackingGoodsBtn,
+					text: '<span style="font-weight: bold;">' + '装配物品' + '</span>',
+					handler: function () {
+						packingTousseBtnClick0(this, false);
+					}
+				},
+				{
+					xtype: 'button',
+					id: "lostBtn",
+					margin: '0 0 0 10',
+					hidden: true,
+					text: '<span style="font-weight: bold;">' + '丢失' + '</span>',
+					handler: function () {
+						onErrorDamageBtnClick2(type_lost);
+					}
+				},
+				{
+					xtype: 'button',
+					id: "damageBtn",
+					margin: '0 0 0 10',
+					hidden: true,
+					text: '<span style="font-weight: bold;">' + '报损' + '</span>',
+					handler: function () {
+						onErrorDamageBtnClick2(type_damage);
+					}
+				}]
 			}
+		]
+	});
+	function amendDisinfectionTousse(row) {
+		var tousseName = row.tousseName;
+		var tousseDefinitionID = row.td_id;
+		var currentPage = row.currentPage;
+		var materialId = row.materialId;
+		var imgName = row.type;
+		var iframeHeight = window.screen.height;
+		var url = WWWROOT + '/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight=' + iframeHeight + '&parentPageName=packingView&tousseDefinitionID=' + tousseDefinitionID + '&materialId=' + materialId + '&tousseName=' + encodeURIComponent(tousseName) + '&imgName=' + encodeURIComponent(imgName) + '&number=' + currentPage;
+		openFullSizeWindowWithName(url, false, imgName);
+	}
+	function loadGoodsImage(tousseName, type, materialId, currentPage, vedioName, td_id, packedPhotographed) {
+		var url;
+		if (type == '器械包装配教学图片') {
+			url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage + '&imageType=' + encodeURIComponent(type) + '&originalImg=true';
+		} else {
+			url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + encodeURIComponent(type) + '&materialId=' + materialId + '&tousseId=' + td_id + '&page=' + currentPage + '&name=' + encodeURIComponent(tousseName);
 		}
-    
-	},{
-		columnWidth :.5,
-	     xtype : 'combo',
-    	 fieldLabel : '灭菌炉',
-    	 id : 'sterilizer',
-    	 name : 'sterilizer',
-    	 hidden : !sstsConfig.showSterilizer,
-    	 componentCls:'formItemMgn',
-    	 minChars : 0,
-    	 labelWidth:90,
-    	 labelAlign:'right',
-    	 valueField : 'sterilizerName',
-    	 displayField : 'sterilizerName',
-    	 labelAlign:'right',
-    	 store : sterilizerJsonStore,
-    	 forceSelection : true,
-    	 lazyInit : true,
-    	 anchor : '90%',
-    	 editable:false,
-    	 triggerAction : 'all',
-    	 typeAhead : false,
-    	 allowBlank : !sstsConfig.sterilizerNotAllowBlank,
-    	 listWidth:140,
-    	 listeners : {
-    		 select : function(combo, record, index) {
-    			 var sterilizerTypeObj = Ext4.getCmp("sterilingType").getValue();
-    			 var reset = false;
-    			 SterilizationRecordTableManager.getSterilisationAndMaxFrequencyMap(combo.value,0,function(map){
-    				 var sterilizerTypeData = new Array();
-    				 sterilizerTypeData.push(new Array("0","无","",""));
-    				 var frequency = 1;
-    				 if(map){
-    					 if(map.sterilisationList){
-    						 reset = true;
-    						 for(var k=0,len=map.sterilisationList.length;k<len;k++){
-    							 var sterilisationAndpurposeStr = '';
-    							 var purpose = map.sterilisationList[k].sterilizationPurpose;
-    							 if(purpose != null && purpose != ''){
-    								 sterilisationAndpurposeStr = map.sterilisationList[k].sterilisation + '(' + purpose + ')';
-    							 }
-    							 sterilizerTypeData.push(new Array(map.sterilisationList[k].id, map.sterilisationList[k].sterilisation,sterilisationAndpurposeStr, map.sterilisationList[k].sterilizationMode));
-    							 if(sterilizerTypeObj == map.sterilisationList[k].sterilisation){
-    								 reset = false;
-    							 }
-    						 }
-    						 frequency = map.maxFrequency;
-    					 }
-    					 else{
-    						 sterilizerTypeStore.reload();
-    						 frequency = "";
-    					 }
-    				 }
-    				 sterilizerTypeStore.loadData(sterilizerTypeData);
-    				 Ext4.getCmp('frequency').setValue(frequency);
-    				 if(reset){
-    					 Ext4.getCmp("sterilingType").setValue("");
-    					 Ext4.getCmp("sterilingMode").setValue("");
-    				 }
-    			 });
-    		 }
-    	 }
-     
-	},{
-        columnWidth : .5,
-        xtype : 'numberfield',
-        fieldLabel : '炉次',
-        allowDecimals : false,
-        allowNegative : false,
-        id : 'frequency',
-        name : 'frequency',
-        hidden : !sstsConfig.showSterilizer,
-        componentCls:'formItemMgn',
-        minValue : 1,
-        labelWidth:90,
-        labelAlign:'right',
-        allowBlank : !sstsConfig.sterilizerNotAllowBlank,
-        anchor : '95%'
-    
-    },{
-		columnWidth :.5,
-		xtype : 'datefield',
-		fieldLabel : '灭菌日期',
-		componentCls:'formItemMgn',
-		labelWidth:90,
-		labelAlign:'right',
-		id : 'sterileDate',
-		name : 'sterileDate',
-		hidden : sstsConfig.printLabelWhenReviewing || sstsConfig.hideSterileDate,
-		emptyText : '默认为今天',
-		minValue: new Date(),
-		inputAttrTpl: " data-qtip='空白表示灭菌日期为今天' ",
-		editable : false,
-		altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-		selectOnFocus :true,
-		format : 'Y-m-d',
-		allowBlank : true,
-		anchor : '90%'
-	},{
-		columnWidth :.5,
-		xtype : 'combo',
-		hidden : !sstsConfig.showTousseWeight,
-		fieldLabel : '重量',
-		id : 'tousseWeight',
-		name : 'tousseWeight',
-		componentCls:'formItemMgn',
-		minChars : 0,
-		labelWidth:90,
-		labelAlign:'right',
-		valueField : 'value',
-		displayField: 'value',
-		labelAlign:'right',
-		store : tousseWeightStore,
-		forceSelection : true,
-		lazyInit : true,
-		anchor : '95%',
-		editable:false,
-		triggerAction : 'all',
-		typeAhead : false,
-		allowBlank : true
-	},{		
-		columnWidth :.5,
-		xtype : 'textfield',
-		fieldLabel : '备注',
-		componentCls:'formItemMgn',
-		id : 'remark',
-		name : 'remark',
-		maxLength : '1000',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : true,
-		labelAlign:'right'
-	},{
-		xtype:'hidden',
-		id:'errorDamageRemarkId',
-		name:'errorDamageRemarkId'
-	},{
-		xtype:'hidden',
-		id:'errorDamageRemarkInfo',
-		name:'errorDamageRemarkInfo'
-	},{
-		columnWidth :.99,
-		xtype : 'textfield',
-		fieldLabel : '丢失材料',
-		componentCls:'formItemMgn',
-		id : 'errorMaterialsTip',
-		name : 'errorMaterialsTip',
-		maxLength : '250',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : true,
-		readOnly : true,
-		hidden:!sstsConfig.enablePackingMaterialErrorDamageRemark,
-        cls : 'fieldReadOnlyNoRemove',
-		labelAlign:'right'
-	},{
-		columnWidth :.99,
-		xtype : 'textfield',
-		fieldLabel : '丢失备注',
-		componentCls:'formItemMgn',
-		id : 'errorRemark',
-		name : 'errorRemark',
-		maxLength : '250',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : true,
-		readOnly : true,
-		hidden:!sstsConfig.enablePackingMaterialErrorDamageRemark,
-        cls : 'fieldReadOnlyNoRemove',
-		labelAlign:'right'
-	},{
-		columnWidth :.99,
-		xtype : 'textfield',
-		fieldLabel : '报损材料',
-		componentCls:'formItemMgn',
-		id : 'damageMaterialsTip',
-		name : 'damageMaterialsTip',
-		maxLength : '250',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : true,
-		readOnly : true,
-		hidden:!sstsConfig.enablePackingMaterialErrorDamageRemark,
-        cls : 'fieldReadOnlyNoRemove',
-		labelAlign:'right'
-	},{
-		columnWidth :.99,
-		xtype : 'textfield',
-		fieldLabel : '报损备注',
-		componentCls:'formItemMgn',
-		id : 'damageRemark',
-		name : 'damageRemark',
-		maxLength : '250',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : true,
-		readOnly : true,
-		hidden:!sstsConfig.enablePackingMaterialErrorDamageRemark,
-        cls : 'fieldReadOnlyNoRemove',
-		labelAlign:'right'
-	},{
-		columnWidth :.99,
-		xtype : 'textfield',
-		fieldLabel : '回收备注',
-		componentCls:'formItemMgn',
-		id : 'recyclingItemRemark',
-		name : 'recyclingItemRemark',
-		maxLength : '250',
-		labelWidth:90,
-		anchor : '95%',
-		allowBlank : true,
-		readOnly : true,
-		hidden:!sstsConfig.enableRecyclingItemRemark,
-        cls : 'fieldReadOnlyNoRemove',
-		labelAlign:'right'
-	},{
-		columnWidth :.99,
-		xtype : 'panel',
-		border: false,
-		layout: {
-	        type: 'hbox',
-	        padding:'5',
-            pack:'center',
-            align:'middle'
-	    },
-	    items:[{
-			xtype:'button',
-			id :"save_print",
-			text:'<span style="font-weight: bold;">' +  packingBtnText + '</span>',
-			handler : function() {
-				packingTousseBtnClick0(this,true);
-			}
-		},
-		{
-			xtype:'button',
-			id :"packingLableBtn",
-			margin:'0 0 0 10',
-			hidden: !sstsConfig.showPackingGoodsBtn,
-			text:'<span style="font-weight: bold;">' +  '装配物品' + '</span>',
-			handler : function() {
-				packingTousseBtnClick0(this,false);
-			}
-		},
-		{
-			xtype:'button',
-			id :"lostBtn",
-			margin:'0 0 0 10',
-			hidden: true,
-			text:'<span style="font-weight: bold;">' +  '丢失' + '</span>',
-			handler : function() {
-				onErrorDamageBtnClick2(type_lost);
-			}
-		},
-		{
-			xtype:'button',
-			id :"damageBtn",
-			margin:'0 0 0 10',
-			hidden: true,
-			text:'<span style="font-weight: bold;">' +  '报损' + '</span>',
-			handler : function() {
-				onErrorDamageBtnClick2(type_damage);
-			}
-		}]
+		Ext4.getCmp('imageName').setText(tousseName);
+		Ext4.getCmp('imageType').setValue(type);
+		Ext4.getCmp('currentPage').setValue(currentPage);
+		Ext4.getCmp('materialId').setValue(materialId);
+		Ext4.getCmp('vedioName').setValue(vedioName);
+		Ext4.getCmp('td_id').setValue(td_id);
+		Ext4.getCmp('hidePackedPhotographed').setValue(packedPhotographed);
+
+		var panel = Ext4.getCmp('imageContentPanel');
+		var image = Ext4.getCmp('browseImage');
+		panel.remove(image);
+
+		var newImage = Ext4.create('Ext4.Img', {
+			id: 'browseImage',
+			fieldLabel: "预览图片",
+			title: '双击预览图片',
+			listeners: {
+				render: function () {
+					var imgCmp = this;
+					imgCmp.getEl().on("dblclick", function (e) {
+						if (this.el.dom.src && this.el.dom.src != '') {
+							var row = {
+								tousseName: tousseName,
+								td_id: td_id,
+								type: type,
+								materialId: materialId,
+								currentPage: currentPage
+							}
+							amendDisinfectionTousse(row);
+							//showImage(this.el.dom.src,tousseName);
+						}
+					});
+					var img = this.imgEl
+					img.on('load', function () {
+						var img = this;
+						var panel = Ext4.getCmp('imageContentPanel');
+						var panelSize = panel.getSize(true);
+
+						var boundaryWidth = panelSize.width;
+						var boundaryHeight = panelSize.height;
+						var originalWidth = img.getWidth();
+						var originalHeight = img.getHeight();
+						var scaledWidth = originalWidth;
+						var scaledHeight = originalHeight;
+						var x = 0, y = 0;
+						// 计算出合适的大小
+						var desScaleYX = boundaryHeight * 1.0 / boundaryWidth;	// 屏幕的高宽比
+						var srcScaleYX = originalHeight * 1.0 / originalWidth;	// 图像的高宽比
+						if (originalWidth > boundaryWidth || originalHeight > boundaryHeight) {
+							// 任何一边大于屏幕时，等比例缩放
+							if (srcScaleYX > desScaleYX) {
+								scaledHeight = boundaryHeight;
+								scaledWidth = parseInt(boundaryHeight * 1.0 / originalHeight * originalWidth);// 保证为2的倍数
+							} else {
+								scaledWidth = boundaryWidth;
+								scaledHeight = parseInt(boundaryWidth * 1.0 / originalWidth * originalHeight);
+							}
+							x = (boundaryWidth - scaledWidth) / 2;
+							y = (boundaryHeight - scaledHeight) / 2;
+						} else {
+							x = (boundaryWidth - scaledWidth) / 2;
+							y = (boundaryHeight - scaledHeight) / 2;
+						}
+						imgCmp.setSize(scaledWidth, scaledHeight);
+						imgCmp.setPosition(x, y);
+						//            	     Ext.Msg.alert('x='+x+',y='+y+',w='+scaledWidth+',h='+scaledHeight+',bw='+boundaryWidth+',bh='+boundaryHeight);
+
+					});
+				}
+			},
+			src: url
+		});
+
+		panel.add(newImage);
 	}
-	]
-});
-function amendDisinfectionTousse(row){
-	var tousseName = row.tousseName;
-	var tousseDefinitionID = row.td_id;
-	var currentPage = row.currentPage;
-	var materialId = row.materialId;
-	var imgName = row.type;
-	var iframeHeight = window.screen.height;
-	var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgName)+'&number='+currentPage;
-	openFullSizeWindowWithName(url,false,imgName);
-}
-function loadGoodsImage(tousseName,type,materialId,currentPage,vedioName,td_id,packedPhotographed){
-	var url;
-	if(type == '器械包装配教学图片'){
-		url = WWWROOT+'/disinfectSystem/packingAction!getImage.do?id='+td_id+'&page='+currentPage+'&imageType='+encodeURIComponent(type)+'&originalImg=true';
-	}else {
-		url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + encodeURIComponent(type) +'&materialId='+materialId+'&tousseId='+td_id+'&page='+currentPage + '&name='+encodeURIComponent(tousseName);
+
+	function loadTousseInfo(tousseName, type, vedioName, td_id, isTraceable, taskId, packedPhotographed) {
+		loadGoodsImage(tousseName, type, '', 1, vedioName, td_id, packedPhotographed);
+		materialStore.load({ params: { tousseName: tousseName, tousseDefinitionId: td_id } });
+		Ext4.getCmp('isTraceable').setValue(isTraceable);
+		Ext4.getCmp('hideTousseName').setValue(tousseName);
+		Ext4.getCmp('task_id').setValue(taskId);
+		showTousseImgBtns();
 	}
-	Ext4.getCmp('imageName').setText(tousseName);
-    Ext4.getCmp('imageType').setValue(type);
-    Ext4.getCmp('currentPage').setValue(currentPage);
-    Ext4.getCmp('materialId').setValue(materialId);
-    Ext4.getCmp('vedioName').setValue(vedioName);
-	Ext4.getCmp('td_id').setValue(td_id);
-	Ext4.getCmp('hidePackedPhotographed').setValue(packedPhotographed);
-	
-    var panel = Ext4.getCmp('imageContentPanel');
-    var image = Ext4.getCmp('browseImage');
-    panel.remove(image);
-    
-    var newImage = Ext4.create('Ext4.Img', {
-    	id : 'browseImage',
-	    fieldLabel : "预览图片",
-	    title:'双击预览图片',
-	    listeners: {
-            render: function() {
-            	var imgCmp = this;
-            	imgCmp.getEl().on("dblclick" , function(e){
-            		if(this.el.dom.src && this.el.dom.src != ''){
-						var row = {
-							tousseName:tousseName,
-							td_id:td_id,
-							type:type,
-							materialId:materialId,
-							currentPage:currentPage
-						}
-						amendDisinfectionTousse(row);
-            			//showImage(this.el.dom.src,tousseName);
-            		}
-            	});
-            	var img = this.imgEl
-            	img.on('load',function(){
-            		 var img = this;
-            		 var panel = Ext4.getCmp('imageContentPanel');
-            		 var panelSize = panel.getSize(true);
-            		 
-            		 var boundaryWidth = panelSize.width;
-            		 var boundaryHeight = panelSize.height;
-            		 var originalWidth = img.getWidth();
-            		 var originalHeight = img.getHeight();
-            		 var scaledWidth = originalWidth;
-            		 var scaledHeight = originalHeight;
-            		 var x=0,y=0;
-            		 // 计算出合适的大小
-        			var desScaleYX = boundaryHeight*1.0/boundaryWidth;	// 屏幕的高宽比
-        			var srcScaleYX = originalHeight*1.0/originalWidth;	// 图像的高宽比
-        			if(originalWidth > boundaryWidth || originalHeight > boundaryHeight)
-        			{
-        				// 任何一边大于屏幕时，等比例缩放
-        				if(srcScaleYX>desScaleYX)
-        				{
-        					scaledHeight = boundaryHeight;
-        					scaledWidth = parseInt(boundaryHeight*1.0/originalHeight*originalWidth);// 保证为2的倍数
-        				}else
-        				{
-        					scaledWidth = boundaryWidth;
-        					scaledHeight = parseInt(boundaryWidth*1.0/originalWidth*originalHeight);
-        				}
-        				x = (boundaryWidth - scaledWidth)/2;
-        				y = (boundaryHeight - scaledHeight)/2;
-        			}else{
-        				x = (boundaryWidth - scaledWidth)/2;
-        				y = (boundaryHeight - scaledHeight)/2;
-        			}
-        			imgCmp.setSize(scaledWidth,scaledHeight);
-        			imgCmp.setPosition(x,y);
-//            	     Ext.Msg.alert('x='+x+',y='+y+',w='+scaledWidth+',h='+scaledHeight+',bw='+boundaryWidth+',bh='+boundaryHeight);
-            	     
-            	});
-            }
-        },
-	    src : url
-    });
-    
-    panel.add(newImage);
-}
 
-function loadTousseInfo(tousseName,type,vedioName,td_id,isTraceable,taskId,packedPhotographed){
-	loadGoodsImage(tousseName,type,'',1,vedioName,td_id,packedPhotographed);
-    materialStore.load({params: {tousseName:tousseName,tousseDefinitionId:td_id}});
-	Ext4.getCmp('isTraceable').setValue(isTraceable);
-	Ext4.getCmp('hideTousseName').setValue(tousseName);
-	Ext4.getCmp('task_id').setValue(taskId);
-    showTousseImgBtns();
-}
+	function showTousseImgBtns() {
+		curSelMaterialName = null;
+		curSelMaterialId = null;
 
-function showTousseImgBtns(){
-	curSelMaterialName = null;
-    curSelMaterialId = null;
-    
-    Ext4.getCmp('btn_washQualityCheckPoint').hide();
-    Ext4.getCmp('btn_washQualityCheckMethod').hide();
-    Ext4.getCmp('btn_functionCheck').hide();
-    
-    if(!teachingPicture){
-    	Ext4.getCmp('btn_packingNote').show();
-    	Ext4.getCmp('btn_teachingPicture').show();
-    }
-    if(!specificationPicture){
-    	Ext4.getCmp('btn_specification').show();
-    }
-    if(!teachingVideo){
-    	Ext4.getCmp('btn_watchVideoBar').show();
-    }
-}
-function showMaterialImgBtns(){
-	Ext4.getCmp('btn_packingNote').hide();
-    Ext4.getCmp('btn_specification').hide();
-    Ext4.getCmp('btn_teachingPicture').hide();
-    Ext4.getCmp('btn_watchVideoBar').hide();
-    
-	Ext4.getCmp('btn_washQualityCheckPoint').show();
-    Ext4.getCmp('btn_washQualityCheckMethod').show();
-    Ext4.getCmp('btn_functionCheck').show();
-}
+		Ext4.getCmp('btn_washQualityCheckPoint').hide();
+		Ext4.getCmp('btn_washQualityCheckMethod').hide();
+		Ext4.getCmp('btn_functionCheck').hide();
 
-var materialStore = new Ext4.data.Store({
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
-		reader : {
-			type : 'json'
+		if (!teachingPicture) {
+			Ext4.getCmp('btn_packingNote').show();
+			Ext4.getCmp('btn_teachingPicture').show();
 		}
-	},
-	fields : [
-			    {name : 'materialDefinitionId'},
-			    {name : 'name'},
-			    {name : 'count'},
-			    {name : 'type'},
-			    {name : 'notice'},
-			    {name : 'hasNotice'},
-			    {name : 'washQualityCheckPoint'},
-			    {name : 'washQualityCheckMethod'},
-			    {name : 'detachable'},
-			    {name : 'functionCheck'}
-			],
-    listeners : {
-    	load : function(thiz,records,options){
-    		var len = records.length;
-    		var materialTotalAmount = 0;
-    		var diposableGoodsTotalAmount = 0;
-			var tousseName = [];
-			var tousseDefinitionId = records[0].raw.tousseDefinitionId;
-			clickItemId = tousseDefinitionId;
-    		for(var i = 0 ; i < len ; i++){
-    			var type = records[i].data.type;
-				tousseName[i+2] =  records[i].data.name;
-    			if(type == '一次性物品'){
-    				diposableGoodsTotalAmount += records[i].data.count;
-    			}else{
-    				materialTotalAmount += records[i].data.count;
-    			}
-    		}
-			if(sstsConfig.enablePackingMaterialsCheckFunction){
-				var tid = tousseDefinitionId;
-				if(!getPackingMaterialsForCheck.get(tousseDefinitionId) && getPackingMaterialsForCheck.get(tousseDefinitionId+'+标识牌')){
-					tid = tousseDefinitionId+'+标识牌';
+		if (!specificationPicture) {
+			Ext4.getCmp('btn_specification').show();
+		}
+		if (!teachingVideo) {
+			Ext4.getCmp('btn_watchVideoBar').show();
+		}
+	}
+	function showMaterialImgBtns() {
+		Ext4.getCmp('btn_packingNote').hide();
+		Ext4.getCmp('btn_specification').hide();
+		Ext4.getCmp('btn_teachingPicture').hide();
+		Ext4.getCmp('btn_watchVideoBar').hide();
+
+		Ext4.getCmp('btn_washQualityCheckPoint').show();
+		Ext4.getCmp('btn_washQualityCheckMethod').show();
+		Ext4.getCmp('btn_functionCheck').show();
+	}
+
+	var materialStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
+			reader: {
+				type: 'json'
+			}
+		},
+		fields: [
+			{ name: 'materialDefinitionId' },
+			{ name: 'name' },
+			{ name: 'count' },
+			{ name: 'type' },
+			{ name: 'notice' },
+			{ name: 'hasNotice' },
+			{ name: 'washQualityCheckPoint' },
+			{ name: 'washQualityCheckMethod' },
+			{ name: 'detachable' },
+			{ name: 'functionCheck' }
+		],
+		listeners: {
+			load: function (thiz, records, options) {
+				var len = records.length;
+				var materialTotalAmount = 0;
+				var diposableGoodsTotalAmount = 0;
+				var tousseName = [];
+				var tousseDefinitionId = records[0].raw.tousseDefinitionId;
+				clickItemId = tousseDefinitionId;
+				for (var i = 0; i < len; i++) {
+					var type = records[i].data.type;
+					tousseName[i + 2] = records[i].data.name;
+					if (type == '一次性物品') {
+						diposableGoodsTotalAmount += records[i].data.count;
+					} else {
+						materialTotalAmount += records[i].data.count;
+					}
 				}
-				if(getPackingMaterialsForCheck.get(tid)){
-					var arr = getPackingMaterialsForCheck.get(tid);
-					tousseName[0] = arr[0];
-					tousseName[1] = arr[1];
-					getPackingMaterialsForCheck.set(tid,tousseName);
+				if (sstsConfig.enablePackingMaterialsCheckFunction) {
+					var tid = tousseDefinitionId;
+					if (!getPackingMaterialsForCheck.get(tousseDefinitionId) && getPackingMaterialsForCheck.get(tousseDefinitionId + '+标识牌')) {
+						tid = tousseDefinitionId + '+标识牌';
+					}
+					if (getPackingMaterialsForCheck.get(tid)) {
+						var arr = getPackingMaterialsForCheck.get(tid);
+						tousseName[0] = arr[0];
+						tousseName[1] = arr[1];
+						getPackingMaterialsForCheck.set(tid, tousseName);
+					}
 				}
+				Ext4.getCmp('materialAmount').setText("器械总数:" + materialTotalAmount);
+				Ext4.getCmp('diposableGoodsAmount').setText("一次性物品总数:" + diposableGoodsTotalAmount);
 			}
-    		Ext4.getCmp('materialAmount').setText("器械总数:" + materialTotalAmount);
-    		Ext4.getCmp('diposableGoodsAmount').setText("一次性物品总数:" + diposableGoodsTotalAmount);
-    	}
-    }
-});
+		}
+	});
 
-function gridItemRender(v , ctx , record){
-	var content = "<tr height=25><td align='left' width='200px'>&nbsp"
-		+ record.data['washQualityCheckMethod']
-		+"</td><td align='left' width='200px'>&nbsp"
-		+ record.data['washQualityCheckPoint']
-		+ "</td><td align='center' width='100px'>&nbsp"
-		+ record.data['functionCheck']
-		+ "</td></tr>";
-	var tableContent = ("<table height='100%' width='310px' border='1' align='center' cellpadding='0' cellspacing='0'>" 
+	function gridItemRender(v, ctx, record) {
+		var content = "<tr height=25><td align='left' width='200px'>&nbsp"
+			+ record.data['washQualityCheckMethod']
+			+ "</td><td align='left' width='200px'>&nbsp"
+			+ record.data['washQualityCheckPoint']
+			+ "</td><td align='center' width='100px'>&nbsp"
+			+ record.data['functionCheck']
+			+ "</td></tr>";
+		var tableContent = ("<table height='100%' width='310px' border='1' align='center' cellpadding='0' cellspacing='0'>"
 			+ "<tr bgcolor='#D7EBD9' height=25>" +
 			"<td width='200px' align='center'><h3>清洗质量检查方法</h3></td><td width='200px' align='center'><h3>清洗质量检查关注点</h3></td><td width='100px' align='center'><h3>功能检查</h3></td>");
-	tableContent += "</tr>"
+		tableContent += "</tr>"
 			+ content
 			+ "</table></br>";
-    ctx.tdAttr = " data-qtip = '"+Ext4.String.htmlEncode(tableContent)+"' data-qwidth=350 data-qtitle='<b><font style=\"color: green;\">质量、功能检查:</font><b>'"; 
-    return v; 
-}
-	
-//获取选择的待装配列表清洗记录id
-function getWashRecordIds(){
-	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	var selNodes = waitPackingTreeGrid.getView().getChecked();
-	var washRecordIds = [];
-	for(var i=0;i<selNodes.length;i++){
-		if(selNodes[i].childNodes.length == 0){
-			if(washRecordIds.indexOf(selNodes[i].data.washRecordId) == -1){
-				washRecordIds.push(selNodes[i].data.washRecordId)
+		ctx.tdAttr = " data-qtip = '" + Ext4.String.htmlEncode(tableContent) + "' data-qwidth=350 data-qtitle='<b><font style=\"color: green;\">质量、功能检查:</font><b>'";
+		return v;
+	}
+
+	//获取选择的待装配列表清洗记录id
+	function getWashRecordIds() {
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		var selNodes = waitPackingTreeGrid.getView().getChecked();
+		var washRecordIds = [];
+		for (var i = 0; i < selNodes.length; i++) {
+			if (selNodes[i].childNodes.length == 0) {
+				if (washRecordIds.indexOf(selNodes[i].data.washRecordId) == -1) {
+					washRecordIds.push(selNodes[i].data.washRecordId)
+				}
 			}
 		}
+		return washRecordIds;
 	}
-	return washRecordIds;
-}
 
-var selModel = top.Ext4.create('top.Ext4.selection.CheckboxModel');
+	var selModel = top.Ext4.create('top.Ext4.selection.CheckboxModel');
 
-var materialGrid = new Ext4.grid.Panel({
-	id :'materialGrid',
-    store: materialStore,
-    height : document.body.clientHeight-20,
-	region: 'east',
-	margin: '0 0 0 0',
-    width : '24%',
-    selModel: selModel,
-    tbar:[{
-    	xtype:'button',
-    	id:"materialAmount"
-    },'-',{
-    	xtype:'button',
-    	id:"diposableGoodsAmount"
-    },'-',{
-    	xtype:'button',
-    	text : '质量监测',
-    	hidden:SSTS_QualityRecord_Create,
-    	id:"addMaterialQualityMonitoring",
-    	handler: function(){
-    		materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+	var materialGrid = new Ext4.grid.Panel({
+		id: 'materialGrid',
+		store: materialStore,
+		height: document.body.clientHeight - 20,
+		region: 'east',
+		margin: '0 0 0 0',
+		width: '24%',
+		selModel: selModel,
+		tbar: [{
+			xtype: 'button',
+			id: "materialAmount"
+		}, '-', {
+			xtype: 'button',
+			id: "diposableGoodsAmount"
+		}, '-', {
+			xtype: 'button',
+			text: '质量监测',
+			hidden: SSTS_QualityRecord_Create,
+			id: "addMaterialQualityMonitoring",
+			handler: function () {
+				materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+				otherPartAddQM = true;
+				var washRecordIds = getWashRecordIds();
+				var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
+				var map = {}, tousseItems = [];
+				Ext4.each(records, function (pNode) {
+					if (pNode.childNodes.length == 0) {
+						var ai = pNode;
+						if (!map[ai.get('tousseName')]) {
+							tousseItems.push({
+								tousseName: ai.parentNode.get('tousseName'),
+								tousseID: ai.parentNode.get('tousseID')
+							});
+							map[ai.get('tousseName')] = ai;
+						}
+					}
+				});
+				if (washRecordIds.length > 1) {
+					addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
+					showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
+				} else if (washRecordIds.length == 1) {
+					addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
+				} else {
+					addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems);
+				}
+			}
+		}],
+		columns: [
+			{ hidden: true, dataIndex: 'materialDefinitionId' },
+			{ header: "材料名称", width: 140, flex: 1, menuDisabled: true, dataIndex: 'name', renderer: gridItemRender },
+			{ header: "数量", width: 40, menuDisabled: true, dataIndex: 'count', renderer: gridItemRender },
+			{
+				header: "是否可拆", width: 60, menuDisabled: true, dataIndex: 'detachable', renderer: function (v, ctx, record) {
+					if (v == '是') {
+						var materialName = record.get('name');
+						var materialId = record.get('materialDefinitionId');
+						return "<input type='button' style='height:20px; width:40px;' value='是' >";
+					} else {
+						return v;
+					}
+				}
+			}
+		],
+		plugins: [{
+			ptype: 'rowexpander',
+			rowBodyTpl: new Ext4.XTemplate(
+				'<tpl if="hasNotice == true">',
+				'<center>注意事项</center>',
+				'<tpl for="notice">',
+				'<div>{.}</div>',
+				'</tpl>',
+				'</tpl>'
+			)
+		}],
+		frame: false,
+		border: false,
+		title: '材料清单',
+		listeners: {
+			cellclick: function (grid, td, cellIndex, record, tr, rowIndex, e, eOpts) {
+				if (cellIndex !== 1) {
+					if (cellIndex == 3) {
+						if (sstsConfig.enablePackingMaterialsCheckFunction) {
+							var tousseDefinitionId = record.raw.tousseDefinitionId;
+							if (getPackingMaterialsForCheck.size() == 1) {
+								materialsAddBgColor(tousseDefinitionId, rowIndex, td);
+							} else if (getPackingMaterialsForCheck.size() > 1) {
+								showResult('一次只能检查一种物品，请勿勾选多种物品！');
+								return false
+							}
+						}
+					}
+					return false
+				}
+				curSelMaterialName = record.get('name');
+				curSelMaterialId = record.get('materialDefinitionId');
+				var detachable = record.get('detachable');
+				var tousseDefinitionId = record.raw.tousseDefinitionId;
+				showMaterialImgBtns();
+				if (cellIndex == 5 && detachable == '是') {
+					loadGoodsImage(curSelMaterialName, IMAGE_TYPE_MATERIAL_DETACHABLE, curSelMaterialId, 1, "", tousseDefinitionId);
+					return;
+				}
+				loadGoodsImage(curSelMaterialName, imageType_material, curSelMaterialId, 1, "", tousseDefinitionId);
+			},
+			afterrender: function (grid) {
+				grid.getView().getHeaderAtIndex(0).hide();
+			}
+		}
+	});
+
+	var waitPackingTbar = [new Ext4.form.field.Checkbox({
+		boxLabel: '全选',
+		name: 'dealStatues',
+		id: 'checkAllWaitPackingTaskNode',
+		inputValue: '0',
+		checked: false,
+		listeners: {
+			afterrender: function (obj) {
+				obj.getEl().dom.onclick = function () {
+					var checked = Ext4.getCmp('checkAllWaitPackingTaskNode').getValue();
+					checkAllWaitPackingTaskNode(checked);
+				};
+			}
+		}
+	}), {
+		text: '刷新',
+		iconCls: 'btn_ext_refresh1',
+		handler: function () {
+			reflushWaitPackingTreeGrid();
+		}
+	}, "-", {
+		text: '添加报损器械',
+		hidden: SSTS_QualityRecord_Create,
+		iconCls: 'btn_ext_application_add',
+		handler: function () {
+			var materialGrid = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+			addAndEditRecyclingDamageRecord('', LINKTYPE_PACKINGRECORD, {}, materialGrid, lastSelectTousseName);
+		}
+	}, "-", {
+		text: '添加丢失器械',
+		//hidden : SSTS_QualityRecord_Create,
+		iconCls: 'btn_ext_application_add',
+		handler: function () {
+			var materialGrid = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+			addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR, {}, materialGrid, lastSelectTousseName, lastSelectTaskId);
+		}
+	}, "-", {
+		text: '质量监测',
+		hidden: SSTS_QualityRecord_Create,
+		iconCls: 'btn_ext_application_add',
+		handler: function () {
+			materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
 			otherPartAddQM = true;
 			var washRecordIds = getWashRecordIds();
 			var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
-			var map = {},tousseItems = [];
-			Ext4.each(records, function(pNode){
-				if(pNode.childNodes.length == 0){
+			var map = {}, tousseItems = [];
+			Ext4.each(records, function (pNode) {
+				if (pNode.childNodes.length == 0) {
 					var ai = pNode;
-					if(!map[ai.get('tousseName')]){
+					if (!map[ai.get('tousseName')]) {
 						tousseItems.push({
-							tousseName:ai.parentNode.get('tousseName'),
-							tousseID:ai.parentNode.get('tousseID')
+							tousseName: ai.parentNode.get('tousseName'),
+							tousseID: ai.parentNode.get('tousseID')
 						});
 						map[ai.get('tousseName')] = ai;
 					}
 				}
 			});
-			if(washRecordIds.length > 1){
-				addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems);
+			if (washRecordIds.length > 1) {
+				addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
 				showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
-			}else if(washRecordIds.length == 1){
-				addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems);
-			}else {
-				addQualityMonitoringByResponPart(responsibilityPart,'',tousseItems);
+			} else if (washRecordIds.length == 1) {
+				addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
+			} else {
+				addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems);
 			}
-    	}
-    }],
-    columns: [
-         {hidden : true, dataIndex : 'materialDefinitionId'},
-         {header : "材料名称",width : 140,flex: 1,menuDisabled: true,dataIndex : 'name',renderer:gridItemRender}, 
-      	 {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count',renderer:gridItemRender},
-         {header : "是否可拆",width : 60,menuDisabled: true,dataIndex : 'detachable',renderer: function(v , ctx , record){
-        	 if(v == '是'){
-        		 var materialName = record.get('name');
-             	 var materialId = record.get('materialDefinitionId');
-        		 return "<input type='button' style='height:20px; width:40px;' value='是' >";
-        	 }else{
-        		 return v;
-        	 }
-         }}
-    ],
-    plugins: [{
-        ptype: 'rowexpander',
-        rowBodyTpl : new Ext4.XTemplate(
-        	    '<tpl if="hasNotice == true">',
-        	    	'<center>注意事项</center>',
-        	    	'<tpl for="notice">',
-        	    		'<div>{.}</div>',
-        	    	'</tpl>',
-        	    '</tpl>'
-        )
-    }],
-    frame:false,
-    border:false,
-    title:'材料清单',
-    listeners: {
-        cellclick: function(grid, td, cellIndex, record, tr, rowIndex, e, eOpts ){
-			if(cellIndex !== 1){
-				if(cellIndex == 3){
-					if(sstsConfig.enablePackingMaterialsCheckFunction){
-						var tousseDefinitionId = record.raw.tousseDefinitionId;
-						if(getPackingMaterialsForCheck.size() == 1){
-							materialsAddBgColor(tousseDefinitionId,rowIndex,td);
-						}else if(getPackingMaterialsForCheck.size() > 1){
-							showResult('一次只能检查一种物品，请勿勾选多种物品！');
-							return false
+		}
+	}, "-", {
+		text: '删除',
+		hidden: SSTS_PackingTask_Delete,
+		iconCls: 'btn_ext_application_del',
+		handler: function () {
+			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+			var selNodes = waitPackingTreeGrid.getView().getChecked();
+			if (selNodes.length == 0) {
+				showResult('请先选择需要删除的待装配任务');
+				return;
+			}
+			var ids = "";
+			Ext4.each(selNodes, function (pNode) {
+				if (pNode.childNodes.length > 0) {
+					Ext4.each(pNode.childNodes, function (cNode) {
+						var taskId = cNode.get('taskId');
+						if (ids != "") {
+							ids += ";";
 						}
+						ids += taskId;
+					});
+				} else {
+					var taskId = pNode.get('taskId');
+					if (ids != "") {
+						ids += ";";
 					}
+					ids += taskId;
 				}
-				return false
-			}
-        	curSelMaterialName = record.get('name');
-        	curSelMaterialId = record.get('materialDefinitionId');
-			var detachable = record.get('detachable');
-			var tousseDefinitionId = record.raw.tousseDefinitionId;
-        	showMaterialImgBtns();
-        	if(cellIndex == 5 && detachable == '是'){
-        		loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_DETACHABLE,curSelMaterialId,1,"",tousseDefinitionId);
-        		return;
-        	}
-        	loadGoodsImage(curSelMaterialName,imageType_material,curSelMaterialId,1,"",tousseDefinitionId);
-        },
-        afterrender: function (grid) {
-            grid.getView().getHeaderAtIndex(0).hide();
-         }
-    }
-});
+			});
+			deletePackingTask(ids, null, null, true, null);
+		}
+	}];
 
-var waitPackingTbar = [new Ext4.form.field.Checkbox({
-    boxLabel : '全选',
-    name : 'dealStatues',
-    id:'checkAllWaitPackingTaskNode',
-    inputValue : '0',
-    checked : false,
-    listeners : {
-    	  afterrender:function(obj){  
-                obj.getEl().dom.onclick = function(){
-                	var checked = Ext4.getCmp('checkAllWaitPackingTaskNode').getValue();
-                	checkAllWaitPackingTaskNode(checked);
-                    };  
-              }
-	    }
-	}),{
-    text : '刷新',
-    iconCls : 'btn_ext_refresh1',
-    handler : function() {
-    	reflushWaitPackingTreeGrid();
-    }
-},"-",{
-    text : '添加报损器械',
-    hidden : SSTS_QualityRecord_Create,
-    iconCls : 'btn_ext_application_add',
-    handler : function() {
-    	var materialGrid = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
-    	addAndEditRecyclingDamageRecord('', LINKTYPE_PACKINGRECORD,{},materialGrid,lastSelectTousseName);
-    }
-},"-",{
-    text : '添加丢失器械',
-    //hidden : SSTS_QualityRecord_Create,
-    iconCls : 'btn_ext_application_add',
-    handler : function() {
-    	var materialGrid = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
-    	addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR,{},materialGrid,lastSelectTousseName,lastSelectTaskId);
-    }
-},"-",{
-    text : '质量监测',
-    hidden:SSTS_QualityRecord_Create,
-    iconCls : 'btn_ext_application_add',
-    handler : function() {
-    	materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
-    	otherPartAddQM = true;
-		var washRecordIds = getWashRecordIds();
-		var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
-		var map = {},tousseItems = [];
-		Ext4.each(records, function(pNode){
-			if(pNode.childNodes.length == 0){
-				var ai = pNode;
-				if(!map[ai.get('tousseName')]){
-					tousseItems.push({
-						tousseName:ai.parentNode.get('tousseName'),
-						tousseID:ai.parentNode.get('tousseID')
-					});
-					map[ai.get('tousseName')] = ai;
-				}
+	var basketStore = new Ext4.data.TreeStore({
+		model: cModel,
+		proxy: {
+			type: 'memory',
+			reader: {
+				type: 'json'
 			}
-		});
-		if(washRecordIds.length > 1){
-			addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems);
-			showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
-		}else if(washRecordIds.length == 1){
-			addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems);
-		}else {
-			addQualityMonitoringByResponPart(responsibilityPart,'',tousseItems);
-		}
-    }
-},"-",{
-    text : '删除',
-    hidden:SSTS_PackingTask_Delete,
-    iconCls : 'btn_ext_application_del',
-    handler : function() {
-    	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-		var selNodes = waitPackingTreeGrid.getView().getChecked();
-		if(selNodes.length == 0){
-			showResult('请先选择需要删除的待装配任务');
-			return;
-		}
-    	var ids = "";
-    	Ext4.each(selNodes, function(pNode) {
-			if(pNode.childNodes.length > 0){
-				Ext4.each(pNode.childNodes, function(cNode){
-					var taskId = cNode.get('taskId');
-					if(ids != ""){
-						ids += ";";
+		},
+		listeners: {
+			beforeload: function (store, operation) {
+				var params = {//参数  
+					taskGroup: taskGroup
+				};
+				Ext4.apply(store.proxy.extraParams, params);
+			}
+		},
+		folderSort: true
+	});
+	var waitPackingTaskStore = new Ext4.data.TreeStore({
+		model: cModel,
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskJson.do'
+		},
+		listeners: {
+			beforeload: function (store, operation) {
+				var params = {//参数  
+					taskGroup: taskGroup
+				};
+				Ext4.apply(store.proxy.extraParams, params);
+			},
+			load: function (treeStore, node, records, successful, eOpts) {
+				Ext4.Ajax.request({
+					url: WWWROOT + '/system/timeoutAction!getTimeoutSetting.do',
+					params: { procedure: 'washToPacking' },
+					success: function (response, options) {
+						var result = Ext4.decode(response.responseText);
+						if (result.success && result.showMessageBox) {
+							var timeoutCount = 0;
+							for (var i = 0; i < records.length; ++i) {
+								for (var j = 0; j < records[i].data.children.length; ++j) {
+									var task = records[i].data.children[j];
+									if (task.isTimeout) {
+										timeoutCount++;
+									}
+								}
+							}
+							if (timeoutCount > 0) {
+								showResult('有' + timeoutCount + '个超时未装配的装配任务,请及时处理红色标注的装配任务', null, sstsConfig.messagePauseTimeOnPackingPage);
+							}
+						}
 					}
-					ids += taskId;
 				});
-			}else {
-				var taskId = pNode.get('taskId');
-				if(ids != ""){
-					ids += ";";
-				}
-				ids += taskId;
 			}
-		});
-    	deletePackingTask(ids,null,null,true,null);
-    }
-}];
-
-var basketStore = new Ext4.data.TreeStore({
-     model: cModel,
-     proxy: {
-         type: 'memory',
-         reader : {
-			  type : 'json'
-		   }
-     },
-     listeners : {
-         beforeload : function(store, operation) {  
-             var params = {//参数  
-             	taskGroup : taskGroup
-             };
-             Ext4.apply(store.proxy.extraParams, params);  
-         }  
-     },
-     folderSort: true
- });
-var waitPackingTaskStore = new Ext4.data.TreeStore({
-    model: cModel,
-    proxy: {
-        type: 'ajax',
-        url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskJson.do'
-    },
-    listeners : {
-        beforeload : function(store, operation) {  
-            var params = {//参数  
-            	taskGroup : taskGroup 
-            };
-            Ext4.apply(store.proxy.extraParams, params);  
-        },
-        load : function(treeStore, node, records, successful, eOpts){
-        	Ext4.Ajax.request({
-    			url :  WWWROOT + '/system/timeoutAction!getTimeoutSetting.do',
-    			params : {procedure : 'washToPacking'},
-    			success : function(response, options) {
-    				var result = Ext4.decode(response.responseText);
-    				if(result.success && result.showMessageBox){
-    					var timeoutCount = 0;
-                		for(var i = 0; i < records.length;++i){
-                			for(var j = 0; j < records[i].data.children.length;++j){
-                				var task = records[i].data.children[j];
-                    			if(task.isTimeout){
-                    				timeoutCount++;
-                    			}
-                			}
-                		}
-                		if(timeoutCount > 0){
-                			showResult('有'+timeoutCount+'个超时未装配的装配任务,请及时处理红色标注的装配任务' , null , sstsConfig.messagePauseTimeOnPackingPage);
-                		}
-    				}
-    			}
-    		});
-        }
-    },
-    folderSort: true
-})
-function getErrorOrDamageRemark(type,taskId){
-	function findNode(rootNode,taskId){
-		if(rootNode){
-			var isLeaf = rootNode.get('leaf');
-			if(isLeaf){
-				var tid = rootNode.get('taskId');
-				if(tid == taskId){
-					return rootNode;
-				}else{
-					return null;
-				}
-			}else{
-				for(var i = 0; i < rootNode.childNodes.length;++i){
-					var fNode = findNode(rootNode.childNodes[i],taskId);
-					if(fNode){
-						return fNode;
+		},
+		folderSort: true
+	})
+	function getErrorOrDamageRemark(type, taskId) {
+		function findNode(rootNode, taskId) {
+			if (rootNode) {
+				var isLeaf = rootNode.get('leaf');
+				if (isLeaf) {
+					var tid = rootNode.get('taskId');
+					if (tid == taskId) {
+						return rootNode;
+					} else {
+						return null;
 					}
+				} else {
+					for (var i = 0; i < rootNode.childNodes.length; ++i) {
+						var fNode = findNode(rootNode.childNodes[i], taskId);
+						if (fNode) {
+							return fNode;
+						}
+					}
 				}
 			}
 		}
-	}
-	var rootNode = waitPackingTaskStore.getRootNode();
-	var fNode = findNode(rootNode,taskId);
-	if(fNode){
-		if(type_lost == type){
-			return fNode.get('errorRemark');
-		}else{
-			return fNode.get('damageRemark');
+		var rootNode = waitPackingTaskStore.getRootNode();
+		var fNode = findNode(rootNode, taskId);
+		if (fNode) {
+			if (type_lost == type) {
+				return fNode.get('errorRemark');
+			} else {
+				return fNode.get('damageRemark');
+			}
 		}
+
 	}
-	
-}
 
-function errorDamageBtnClick(type,taskId){
-	var remak = getErrorOrDamageRemark(type,taskId);
-	additionalMaterial(type,taskId,remak);
-}
-//赋值给全局变量
-onErrorDamageBtnClick = errorDamageBtnClick;
+	function errorDamageBtnClick(type, taskId) {
+		var remak = getErrorOrDamageRemark(type, taskId);
+		additionalMaterial(type, taskId, remak);
+	}
+	//赋值给全局变量
+	onErrorDamageBtnClick = errorDamageBtnClick;
 
 
-function showPackButton(isPrint,isReview,tousseType,showOrHidePrintBtn){
-	var packButton = Ext4.getCmp('save_print');
-	packButton.show();
-	
-	if(sstsConfig.showPackingGoodsBtn){
-		var packingLableBtn = Ext4.getCmp('packingLableBtn');
-		packingLableBtn.show();
-	}
-	
-	if (isPrint == '是'){
-		packButton.setText('<span style="font-weight: bold;">' + packingBtnText + '</span>');
-	}
-	else{
-		packButton.setText('<span style="font-weight: bold;">装配不追溯' + tousseType + '</span>');
-	}
-	if(showOrHidePrintBtn == '是'){
-		packButton.setText('<span style="font-weight: bold;">装配打印标签和材料清单</span>');
-	}
-	
-	// 如果该器械包需要审核
-	if (isReview == '是'){
-		// 并且审核时打印标签，则不显示审核人输入框
-		if (sstsConfig.printLabelWhenReviewing == true){
-            Ext4.getCmp('reviewerBarcode').hide();
-            Ext4.getCmp('reviewer').hide();
+	function showPackButton(isPrint, isReview, tousseType, showOrHidePrintBtn) {
+		var packButton = Ext4.getCmp('save_print');
+		packButton.show();
+
+		if (sstsConfig.showPackingGoodsBtn) {
+			var packingLableBtn = Ext4.getCmp('packingLableBtn');
+			packingLableBtn.show();
 		}
-		// 装配时打印标签，则显示审核人输入框
-		else{
-			if(!sstsConfig.hideReviewerField){
-				Ext4.getCmp('reviewerBarcode').show();
-	            Ext4.getCmp('reviewer').show();
-			}
+
+		if (isPrint == '是') {
+			packButton.setText('<span style="font-weight: bold;">' + packingBtnText + '</span>');
 		}
-	}
-	// 如果该器械包不需要审核
-	else{
-		// 审核时才打印标签，则显示审核人输入框。
-		if (sstsConfig.printLabelWhenReviewing == true){
-            Ext4.getCmp('reviewerBarcode').hide();
-            Ext4.getCmp('reviewer').hide();
+		else {
+			packButton.setText('<span style="font-weight: bold;">装配不追溯' + tousseType + '</span>');
 		}
-		// 装配时打印标签，则显示审核人输入框
-		else{
-			if(!sstsConfig.hideReviewerField){
-				Ext4.getCmp('reviewerBarcode').show();
-	            Ext4.getCmp('reviewer').show();
+		if (showOrHidePrintBtn == '是') {
+			packButton.setText('<span style="font-weight: bold;">装配打印标签和材料清单</span>');
+		}
+
+		// 如果该器械包需要审核
+		if (isReview == '是') {
+			// 并且审核时打印标签，则不显示审核人输入框
+			if (sstsConfig.printLabelWhenReviewing == true) {
+				Ext4.getCmp('reviewerBarcode').hide();
+				Ext4.getCmp('reviewer').hide();
 			}
+			// 装配时打印标签，则显示审核人输入框
+			else {
+				if (!sstsConfig.hideReviewerField) {
+					Ext4.getCmp('reviewerBarcode').show();
+					Ext4.getCmp('reviewer').show();
+				}
+			}
 		}
+		// 如果该器械包不需要审核
+		else {
+			// 审核时才打印标签，则显示审核人输入框。
+			if (sstsConfig.printLabelWhenReviewing == true) {
+				Ext4.getCmp('reviewerBarcode').hide();
+				Ext4.getCmp('reviewer').hide();
+			}
+			// 装配时打印标签，则显示审核人输入框
+			else {
+				if (!sstsConfig.hideReviewerField) {
+					Ext4.getCmp('reviewerBarcode').show();
+					Ext4.getCmp('reviewer').show();
+				}
+			}
+		}
 	}
-}
-//重新设置标识牌的可见状态
-function resetScanIDCardBarcodeVisibility(node){
-//	alert('resetScanIDCardBarcodeVisibility')
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
-	var basketTreeSelNodes = basketTree.getView().getChecked();
-	var waitPackingTreeSelNodes = waitPackingTree.getView().getChecked();
-//	alert(basketTreeSelNodes.length + ' '+waitPackingTree.length)
-//	// 包含标识牌，且选中了多个节点，不允许选中
-//	if(haveEnabledIDCard(basketTreeSelNodes) && basketTreeSelNodes.length>1){
-//		showResult('启用了标识牌的包，只能单独选择!');
-//		node.set("checked", false);
-//		return;
-//	}
-	if(haveEnabledIDCard(basketTreeSelNodes) || getSelAmount() == 0){
-		
-		if(!sstsConfig.disableIdCard){
-			showScanIDCardBarcode();// 没有禁用标识牌功能时，才显示标识牌输入框
+	//重新设置标识牌的可见状态
+	function resetScanIDCardBarcodeVisibility(node) {
+		//	alert('resetScanIDCardBarcodeVisibility')
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
+		var basketTreeSelNodes = basketTree.getView().getChecked();
+		var waitPackingTreeSelNodes = waitPackingTree.getView().getChecked();
+		//	alert(basketTreeSelNodes.length + ' '+waitPackingTree.length)
+		//	// 包含标识牌，且选中了多个节点，不允许选中
+		//	if(haveEnabledIDCard(basketTreeSelNodes) && basketTreeSelNodes.length>1){
+		//		showResult('启用了标识牌的包，只能单独选择!');
+		//		node.set("checked", false);
+		//		return;
+		//	}
+		if (haveEnabledIDCard(basketTreeSelNodes) || getSelAmount() == 0) {
+
+			if (!sstsConfig.disableIdCard) {
+				showScanIDCardBarcode();// 没有禁用标识牌功能时，才显示标识牌输入框
+			}
+		} else {
+
+			hideScanIDCardBarcode();// 只要左边有选中的项，那么隐藏标识牌输入框
 		}
-	}else{
-		
-		hideScanIDCardBarcode();// 只要左边有选中的项，那么隐藏标识牌输入框
 	}
-}
-function formatMaterialCount(materialArray){
-	var materials = "";
-	if(isUndefinedOrNull(materialArray)){
-		return materials;
-	}
-	for(var i = 0; i < materialArray.length;++i){
-		var amount = parseInt(materialArray[i].amount);
-		if(amount > 0){
-			materials += materialArray[i].materialName + "*" + amount + ";";
+	function formatMaterialCount(materialArray) {
+		var materials = "";
+		if (isUndefinedOrNull(materialArray)) {
+			return materials;
 		}
+		for (var i = 0; i < materialArray.length; ++i) {
+			var amount = parseInt(materialArray[i].amount);
+			if (amount > 0) {
+				materials += materialArray[i].materialName + "*" + amount + ";";
+			}
+		}
+		return materials.length > 0 ? materials.substring(0, materials.length - 1) : "";
 	}
-	return materials.length > 0?materials.substring(0,materials.length - 1):"";
-}
-function refreshErrorAndDamageMaterials(record){
-	if(record){
-		var isLeaf = record.get('leaf');
-		var errorMaterials = "";
-		var damageMaterials = "";
-		if(!isLeaf){
-			var children = record.childNodes;
-			if(!isUndefinedOrNull(children)){
-				for(var i = 0; i < children.length;++i){
-					var child = children[i].data;
-					var materials = formatMaterialCount(child.errors);
-					if(!isUndefinedOrNullOrEmpty(materials)){
-						errorMaterials += materials + ";";
+	function refreshErrorAndDamageMaterials(record) {
+		if (record) {
+			var isLeaf = record.get('leaf');
+			var errorMaterials = "";
+			var damageMaterials = "";
+			if (!isLeaf) {
+				var children = record.childNodes;
+				if (!isUndefinedOrNull(children)) {
+					for (var i = 0; i < children.length; ++i) {
+						var child = children[i].data;
+						var materials = formatMaterialCount(child.errors);
+						if (!isUndefinedOrNullOrEmpty(materials)) {
+							errorMaterials += materials + ";";
+						}
+						materials = formatMaterialCount(child.damages);
+						if (!isUndefinedOrNullOrEmpty(materials)) {
+							damageMaterials += materials + ";";
+						}
 					}
-					materials = formatMaterialCount(child.damages);
-					if(!isUndefinedOrNullOrEmpty(materials)){
-						damageMaterials += materials + ";";
-					}
 				}
+			} else {
+				var materials = formatMaterialCount(record.get("errors"));
+				if (!isUndefinedOrNullOrEmpty(materials)) {
+					errorMaterials += materials + ";";
+				}
+				materials = formatMaterialCount(record.get("damages"));
+				if (!isUndefinedOrNullOrEmpty(materials)) {
+					damageMaterials += materials + ";";
+				}
 			}
-		}else{
-			var materials = formatMaterialCount(record.get("errors"));
-			if(!isUndefinedOrNullOrEmpty(materials)){
-				errorMaterials += materials + ";";
+			errorMaterials = errorMaterials.length > 0 ? errorMaterials.substring(0, errorMaterials.length - 1) : "";
+			damageMaterials = damageMaterials.length > 0 ? damageMaterials.substring(0, damageMaterials.length - 1) : "";
+
+			Ext4.getCmp('errorMaterialsTip').setValue(errorMaterials);
+			Ext4.getCmp('damageMaterialsTip').setValue(damageMaterials);
+		}
+	}
+	function refreshErrorAndDamageRemark(record) {
+		if (record) {
+			var errorRemark = '';
+			var damageRemark = '';
+			if (record.get("errorRemark") && record.data.errors.length > 0) {
+				errorRemark = record.get("errorRemark");
 			}
-			materials = formatMaterialCount(record.get("damages"));
-			if(!isUndefinedOrNullOrEmpty(materials)){
-				damageMaterials += materials + ";";
+			if (record.get("damageRemark") && record.data.damages.length > 0) {
+				damageRemark = record.get("damageRemark");
 			}
+			Ext4.getCmp('errorRemark').setValue(errorRemark);
+			Ext4.getCmp('damageRemark').setValue(damageRemark);
+
+			refreshErrorAndDamageMaterials(record);
 		}
-		errorMaterials = errorMaterials.length > 0?errorMaterials.substring(0,errorMaterials.length - 1):"";
-		damageMaterials = damageMaterials.length > 0?damageMaterials.substring(0,damageMaterials.length - 1):"";
-		
-		Ext4.getCmp('errorMaterialsTip').setValue(errorMaterials);
-		Ext4.getCmp('damageMaterialsTip').setValue(damageMaterials);
 	}
-}
-function refreshErrorAndDamageRemark(record){
-	if(record){
-		var errorRemark  = '';
-		var damageRemark = '';
-		if(record.get("errorRemark") && record.data.errors.length > 0){
-			errorRemark = record.get("errorRemark");
-		}
-		if(record.get("damageRemark") && record.data.damages.length > 0){
-			damageRemark = record.get("damageRemark");
-		}
-		Ext4.getCmp('errorRemark').setValue(errorRemark);
-		Ext4.getCmp('damageRemark').setValue(damageRemark);
-		
-		refreshErrorAndDamageMaterials(record);
-	}
-}
 
-function refreshRemarks(record){
-	if(record){
-		var errorDamageRemarkInfo = '';
-		var errorDamageRemarkId = '';
-		if(record.childNodes.length > 0){
-			var children = record.childNodes;
-			for(var i=0;i<children.length;i++){
-				if(children[i].raw.errorDamageRemarkInfo !== '' && (children[i].data.damages.length > 0 || children[i].data.errors.length > 0)){
-					errorDamageRemarkInfo = children[i].raw.errorDamageRemarkInfo;
-					errorDamageRemarkId = children[i].raw.errorDamageRemarkId;
+	function refreshRemarks(record) {
+		if (record) {
+			var errorDamageRemarkInfo = '';
+			var errorDamageRemarkId = '';
+			if (record.childNodes.length > 0) {
+				var children = record.childNodes;
+				for (var i = 0; i < children.length; i++) {
+					if (children[i].raw.errorDamageRemarkInfo !== '' && (children[i].data.damages.length > 0 || children[i].data.errors.length > 0)) {
+						errorDamageRemarkInfo = children[i].raw.errorDamageRemarkInfo;
+						errorDamageRemarkId = children[i].raw.errorDamageRemarkId;
+					}
 				}
+			} else {
+				if (record.raw.errorDamageRemarkInfo !== '' && (record.data.damages.length > 0 || record.data.errors.length > 0)) {
+					errorDamageRemarkInfo = record.raw.errorDamageRemarkInfo;
+					errorDamageRemarkId = record.raw.errorDamageRemarkId;
+				}
 			}
-		}else {
-			if(record.raw.errorDamageRemarkInfo !== '' && (record.data.damages.length > 0 || record.data.errors.length > 0)){
-				errorDamageRemarkInfo = record.raw.errorDamageRemarkInfo;
-				errorDamageRemarkId = record.raw.errorDamageRemarkId;
+			if (errorDamageRemarkInfo == '') {
+				Ext4.getCmp('remark').setValue('');
+				Ext4.getCmp('errorDamageRemarkId').setValue('');
+				Ext4.getCmp('errorDamageRemarkInfo').setValue('');
+			} else {
+				Ext4.getCmp('remark').setValue(errorDamageRemarkInfo);
+				Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
+				Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemarkInfo);
 			}
 		}
-		if(errorDamageRemarkInfo == ''){
-			Ext4.getCmp('remark').setValue('');
-			Ext4.getCmp('errorDamageRemarkId').setValue('');
-			Ext4.getCmp('errorDamageRemarkInfo').setValue('');
-		}else {
-			Ext4.getCmp('remark').setValue(errorDamageRemarkInfo);
-			Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
-			Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemarkInfo);
+	}
+
+	function refreshRecyclingItemRemark(record) {
+		if (record) {
+			var recyclingItemRemark = record.get("recyclingItemRemark");
+
+			if (!recyclingItemRemark) {
+				recyclingItemRemark = '';
+			}
+			Ext4.getCmp('recyclingItemRemark').setValue(recyclingItemRemark);
 		}
 	}
-}
 
-function refreshRecyclingItemRemark(record){
-	if(record){
-		var recyclingItemRemark  = record.get("recyclingItemRemark");
-		
-		if(!recyclingItemRemark){
-			recyclingItemRemark = '';
+	// 重新设置标识牌的可见状态 装配任务选择包的时候
+	function resetScanIDCardBarcodeVisibilityWaitPacking(node) {
+		var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
+		var waitPackingTreeSelNodes = waitPackingTree.getView().getChecked();
+		if (haveEnabledIDCard(waitPackingTreeSelNodes) || getSelAmount() == 0) {
+			if (!sstsConfig.disableIdCard) {
+				showScanIDCardBarcode();// 没有禁用标识牌功能时，才显示标识牌输入框
+			}
+		} else {
+			hideScanIDCardBarcode(); // 只要左边有选中的项，那么隐藏标识牌输入框
 		}
-		Ext4.getCmp('recyclingItemRemark').setValue(recyclingItemRemark);
 	}
-}
+	function showNoteWindow(node) {
+		if (!sstsConfig.showTousseNoteOnClickTousse) {
+			return;
+		}
+		var checked = node.get('checked');
 
-// 重新设置标识牌的可见状态 装配任务选择包的时候
-function resetScanIDCardBarcodeVisibilityWaitPacking(node){
-	var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
-	var waitPackingTreeSelNodes = waitPackingTree.getView().getChecked();
-	if(haveEnabledIDCard(waitPackingTreeSelNodes) || getSelAmount() == 0){
-		if(!sstsConfig.disableIdCard){
-			showScanIDCardBarcode();// 没有禁用标识牌功能时，才显示标识牌输入框
+		var note = node.get('note');
+		//	alert(note+','+checked)
+		if (!Ext.isEmpty(note) && checked) {
+			var width = Ext4.getCmp('materialGrid').getSize().width;
+			alertDiv(note, width);
 		}
-	}else{
-		hideScanIDCardBarcode(); // 只要左边有选中的项，那么隐藏标识牌输入框
 	}
-}
-function showNoteWindow(node){
-	if(!sstsConfig.showTousseNoteOnClickTousse){
-		return;
+	function updateNoteWindow(record) {
+		if (!sstsConfig.showTousseNoteOnClickTousse) {
+			return;
+		}
+		var note = record.data['note'];//配包注意事项
+		//	if(!Ext.isEmpty(note)){
+		//	}else{
+		//		hide();
+		//	}
+		updateNote(note);
 	}
-	var checked = node.get('checked');
-	
-	var note = node.get('note');
-//	alert(note+','+checked)
-	if(!Ext.isEmpty(note) && checked){
-		var width = Ext4.getCmp('materialGrid').getSize().width;
-		alertDiv(note,width);
+	function getSelAmount() {
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		var selAmount = basketTree.getView().getChecked().length + waitPackingTreeGrid.getView().getChecked().length;
+		return selAmount;
 	}
-}
-function updateNoteWindow(record){
-	if(!sstsConfig.showTousseNoteOnClickTousse){
-		return;
-	}
-	var note = record.data['note'];//配包注意事项
-//	if(!Ext.isEmpty(note)){
-//	}else{
-//		hide();
-//	}
-	updateNote(note);
-}
-function getSelAmount(){
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	var selAmount = basketTree.getView().getChecked().length + waitPackingTreeGrid.getView().getChecked().length;
-	return selAmount;
-}
-// 设置包装类型只读
-function setPackageTypeReadOnlyByCondition(){
-	 var bRet = false;
-	 var basketTree = Ext4.getCmp('basketTreeGrid');
-	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	 var selNodes = basketTree.getView().getChecked();
-	 var selLength = selNodes.length;
-	 
-	//遍历器械包节点
-	Ext4.each(selNodes, function(pNode){
-		var allowModifyPackageType = pNode.get("allowModifyPackageType");
-		if(allowModifyPackageType == '否'){
-			bRet = true;
-			return false;
-		}
-	});
-	 if(!bRet){
-		//选择统计的敷料包选项全打印
-		var selNodes = waitPackingTreeGrid.getView().getChecked();
+	// 设置包装类型只读
+	function setPackageTypeReadOnlyByCondition() {
+		var bRet = false;
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		var selNodes = basketTree.getView().getChecked();
 		var selLength = selNodes.length;
-		Ext4.each(selNodes, function(pNode) {
+
+		//遍历器械包节点
+		Ext4.each(selNodes, function (pNode) {
 			var allowModifyPackageType = pNode.get("allowModifyPackageType");
-			if(allowModifyPackageType == '否'){
+			if (allowModifyPackageType == '否') {
 				bRet = true;
 				return false;
 			}
 		});
-    
-	 }
-	 if(bRet){
-		 Ext4.getCmp('packageType').disable();
-	 }else{
-		 Ext4.getCmp('packageType').enable();
-	 }
-	 return bRet;
+		if (!bRet) {
+			//选择统计的敷料包选项全打印
+			var selNodes = waitPackingTreeGrid.getView().getChecked();
+			var selLength = selNodes.length;
+			Ext4.each(selNodes, function (pNode) {
+				var allowModifyPackageType = pNode.get("allowModifyPackageType");
+				if (allowModifyPackageType == '否') {
+					bRet = true;
+					return false;
+				}
+			});
 
-}
-// 清空备注
-function clearRemarkByCondition(){
-//	 var bRet = false;
-//	 var basketTree = Ext4.getCmp('basketTreeGrid');
-//	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-//	 var selNodes = basketTree.getView().getChecked();
-//	 var selLength = selNodes.length;
-//	 
-//	 var selCount = basketTree.getView().getChecked().length + waitPackingTreeGrid.getView().getChecked().length;
-//	 if(selCount > 1){
-//		 Ext4.getCmp('remark').setValue();
-//	 }
-}
-function deselectCheckAll(){
-	var checkAllTaskNode = Ext4.getCmp('checkAllTaskNode');
-	checkAllTaskNode.setValue(false);
-//	var checked = checkAllTaskNode.getValue();
-//	if(checked == true){
-//		checkAllTaskNode.setValue(false);
-//	}
-}
-// 选中的节点是否包含标识牌
-function haveEnabledIDCard(nodes){
-	var have = false;
-	Ext4.each(nodes, function(pNode){
-		var haveIDCard = pNode.get("haveIDCard");
-		if(haveIDCard){
-			have = true;
 		}
-		return true;
-	});
-	return have;
-}
-function getErrorDamageRemark(nodes){
-	var errorDamageRemark = {};
-	Ext4.each(nodes, function(pNode){
-		var errorRemark  = pNode.get("errorRemark");
-		var damageRemark = pNode.get("damageRemark");
-		if(errorRemark || damageRemark){
-			errorDamageRemark.errorRemark = errorRemark;
-			errorDamageRemark.damageRemark = damageRemark;
+		if (bRet) {
+			Ext4.getCmp('packageType').disable();
+		} else {
+			Ext4.getCmp('packageType').enable();
 		}
-		return true;
-	});
-	return errorDamageRemark;
-}
-function hideScanIDCardBarcode(){
-	var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
-	var idCardName = Ext4.getCmp('idCardName');
-	
-	scanScanIDCardBarcode.hide();
-	idCardName.hide();
-	Ext4.getCmp('idCardUseAmount').hide();
-	
-	clearInputedIDCardInfo();
-}
-function showScanIDCardBarcode(){
-	if(sstsConfig.disableIdCard){
-		return;
-	}
-	var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
-	var idCardName = Ext4.getCmp('idCardName');
-	
-	scanScanIDCardBarcode.show();
-	idCardName.show();
-	Ext4.getCmp('idCardUseAmount').show();
-}
+		return bRet;
 
-
-
-// 删除篮筐内物品
-function deleteBasketItems(delBasketItems){
-	var dl = delBasketItems.length;
-	for (var i = 0; i < dl; i++) {
-		 var tousseName = delBasketItems[i].tousseName;
-		 var packAmount = delBasketItems[i].amount;
-		 var packed = delBasketItems[i].packed;
-		 if(packed){
-			 var taskItemArray = delBasketItems[i].taskItems;
-			 deleteTask(tousseName,packAmount,taskItemArray);
-		 }
 	}
-	deselectCheckAll();
-}
-// 打印标识牌的包
-function printIDCardTousse(){
-	if(idCardInstanceID == ''){
-		showResult('请扫描标识牌条码!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-		onPackingTousseBtnClickComplete();
-		return;
+	// 清空备注
+	function clearRemarkByCondition() {
+		//	 var bRet = false;
+		//	 var basketTree = Ext4.getCmp('basketTreeGrid');
+		//	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		//	 var selNodes = basketTree.getView().getChecked();
+		//	 var selLength = selNodes.length;
+		//	 
+		//	 var selCount = basketTree.getView().getChecked().length + waitPackingTreeGrid.getView().getChecked().length;
+		//	 if(selCount > 1){
+		//		 Ext4.getCmp('remark').setValue();
+		//	 }
 	}
-	if(!validateFormParamsForPack()){
-		onPackingTousseBtnClickComplete();
-		return;
+	function deselectCheckAll() {
+		var checkAllTaskNode = Ext4.getCmp('checkAllTaskNode');
+		checkAllTaskNode.setValue(false);
+		//	var checked = checkAllTaskNode.getValue();
+		//	if(checked == true){
+		//		checkAllTaskNode.setValue(false);
+		//	}
 	}
-	if(!(validateSupplement(idCardTaskNode))){
-		onPackingTousseBtnClickComplete();
-		return;
+	// 选中的节点是否包含标识牌
+	function haveEnabledIDCard(nodes) {
+		var have = false;
+		Ext4.each(nodes, function (pNode) {
+			var haveIDCard = pNode.get("haveIDCard");
+			if (haveIDCard) {
+				have = true;
+			}
+			return true;
+		});
+		return have;
 	}
-	showPackingTousseBtnClick_mask();
-	// 标识牌的打印
-	// 延迟100ms执行
-	setTimeout(printIDCardTousse_DeferredExecution,100);
-}
-//打印标识牌的包,延迟执行
-function printIDCardTousse_DeferredExecution(){
-	
-	// 标识牌的打印
-	var packed = printTousseByIDcardTaskNode(idCardTaskNode);
-	if(packed !== false){
-		// 清除标识牌信息
+	function getErrorDamageRemark(nodes) {
+		var errorDamageRemark = {};
+		Ext4.each(nodes, function (pNode) {
+			var errorRemark = pNode.get("errorRemark");
+			var damageRemark = pNode.get("damageRemark");
+			if (errorRemark || damageRemark) {
+				errorDamageRemark.errorRemark = errorRemark;
+				errorDamageRemark.damageRemark = damageRemark;
+			}
+			return true;
+		});
+		return errorDamageRemark;
+	}
+	function hideScanIDCardBarcode() {
+		var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
+		var idCardName = Ext4.getCmp('idCardName');
+
+		scanScanIDCardBarcode.hide();
+		idCardName.hide();
+		Ext4.getCmp('idCardUseAmount').hide();
+
 		clearInputedIDCardInfo();
-		
-		//如果装配界面的配包/审核人是否默认为上一次装配的配包/审核人配置为false,则装配完后需要重新清空
-        if(packingPageOperatorDefaultLastOperator == false){
-       	 Ext4.getCmp('operator').setValue('');
-        }
-        if(packingPageReviewerDefaultLastReviewer == false){
-       	 Ext4.getCmp('reviewer').setValue('');
-        }
 	}
-	onPackingTousseBtnClickComplete();
-}
-var lastSelectedTousseName = null;
-// 选中的和勾选的是否一致
-function useManualSelectPackageType(){
-	var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
-	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	
-	var basketTreeGridCheckedNodes = basketTreeGrid.getView().getChecked();
-	var waitPackingTreeCheckedNodes = waitPackingTreeGrid.getView().getChecked();
-	if(basketTreeGridCheckedNodes.length > 1){
-		return false;
+	function showScanIDCardBarcode() {
+		if (sstsConfig.disableIdCard) {
+			return;
+		}
+		var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
+		var idCardName = Ext4.getCmp('idCardName');
+
+		scanScanIDCardBarcode.show();
+		idCardName.show();
+		Ext4.getCmp('idCardUseAmount').show();
 	}
-	if(waitPackingTreeCheckedNodes.length > 1){
-		return false;
+
+
+
+	// 删除篮筐内物品
+	function deleteBasketItems(delBasketItems) {
+		var dl = delBasketItems.length;
+		for (var i = 0; i < dl; i++) {
+			var tousseName = delBasketItems[i].tousseName;
+			var packAmount = delBasketItems[i].amount;
+			var packed = delBasketItems[i].packed;
+			if (packed) {
+				var taskItemArray = delBasketItems[i].taskItems;
+				deleteTask(tousseName, packAmount, taskItemArray);
+			}
+		}
+		deselectCheckAll();
 	}
-	var totalCheckedNodesLength = basketTreeGridCheckedNodes.length + waitPackingTreeCheckedNodes.length;
-	if(totalCheckedNodesLength < 1){
-		return false;
+	// 打印标识牌的包
+	function printIDCardTousse() {
+		if (idCardInstanceID == '') {
+			showResult('请扫描标识牌条码!', null, sstsConfig.messagePauseTimeOnPackingPage);
+			onPackingTousseBtnClickComplete();
+			return;
+		}
+		if (!validateFormParamsForPack()) {
+			onPackingTousseBtnClickComplete();
+			return;
+		}
+		if (!(validateSupplement(idCardTaskNode))) {
+			onPackingTousseBtnClickComplete();
+			return;
+		}
+		showPackingTousseBtnClick_mask();
+		// 标识牌的打印
+		// 延迟100ms执行
+		setTimeout(printIDCardTousse_DeferredExecution, 100);
 	}
-	
-	if(totalCheckedNodesLength == 2){
-		if(basketTreeGridCheckedNodes[0].get("tousseName") != waitPackingTreeCheckedNodes[0].get("tousseName")){
+	//打印标识牌的包,延迟执行
+	function printIDCardTousse_DeferredExecution() {
+
+		// 标识牌的打印
+		var packed = printTousseByIDcardTaskNode(idCardTaskNode);
+		if (packed !== false) {
+			// 清除标识牌信息
+			clearInputedIDCardInfo();
+
+			//如果装配界面的配包/审核人是否默认为上一次装配的配包/审核人配置为false,则装配完后需要重新清空
+			if (packingPageOperatorDefaultLastOperator == false) {
+				Ext4.getCmp('operator').setValue('');
+			}
+			if (packingPageReviewerDefaultLastReviewer == false) {
+				Ext4.getCmp('reviewer').setValue('');
+			}
+		}
+		onPackingTousseBtnClickComplete();
+	}
+	var lastSelectedTousseName = null;
+	// 选中的和勾选的是否一致
+	function useManualSelectPackageType() {
+		var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+
+		var basketTreeGridCheckedNodes = basketTreeGrid.getView().getChecked();
+		var waitPackingTreeCheckedNodes = waitPackingTreeGrid.getView().getChecked();
+		if (basketTreeGridCheckedNodes.length > 1) {
 			return false;
 		}
+		if (waitPackingTreeCheckedNodes.length > 1) {
+			return false;
+		}
+		var totalCheckedNodesLength = basketTreeGridCheckedNodes.length + waitPackingTreeCheckedNodes.length;
+		if (totalCheckedNodesLength < 1) {
+			return false;
+		}
+
+		if (totalCheckedNodesLength == 2) {
+			if (basketTreeGridCheckedNodes[0].get("tousseName") != waitPackingTreeCheckedNodes[0].get("tousseName")) {
+				return false;
+			}
+		}
+
+		var basketTreeGridSelectionNodes = basketTreeGrid.getView().getSelectionModel().getSelection();
+		var waitPackingTreeSelectionNodes = waitPackingTreeGrid.getView().getSelectionModel().getSelection();
+		var totalSelectionNodesLength = basketTreeGridSelectionNodes.length + waitPackingTreeSelectionNodes.length;
+		if (totalSelectionNodesLength > 2) {
+			return false;
+		}
+		//	if(totalSelectionNodesLength != 1){
+		//		return false;
+		//	}
+		var checkedNode = null;
+		if (basketTreeGridCheckedNodes.length > 0) {
+			checkedNode = basketTreeGridCheckedNodes[0];
+		} else {
+			checkedNode = waitPackingTreeCheckedNodes[0];
+		}
+		var tousseName = checkedNode.get("tousseName");
+		//	if(basketTreeGridSelectionNodes.length > 0){
+		//		for(var i=0;i<basketTreeGridSelectionNodes.length;++i){
+		//			if(tousseName != basketTreeGridSelectionNodes[i].get("tousseName")){
+		//				return false;
+		//			}
+		//		}
+		//	}
+		//	if(waitPackingTreeSelectionNodes.length > 0){
+		//		for(var i=0;i<waitPackingTreeSelectionNodes.length;++i){
+		//			if(tousseName != waitPackingTreeSelectionNodes[i].get("tousseName")){
+		//				return false;
+		//			}
+		//		}
+		//	}
+		var tousseName2 = Ext4.getCmp('imageName').getText();
+		if (tousseName != tousseName2) {
+			return false;
+		}
+		//	var selectionNode = null;
+		//	if(basketTreeGridSelectionNodes.length > 0){
+		//		selectionNode = basketTreeGridSelectionNodes[0];
+		//	}else{
+		//		selectionNode = waitPackingTreeSelectionNodes[0];
+		//	}
+		//	if(checkedNode != selectionNode ){
+		////		alert('checkedNode != selectionNode')
+		//		return false;
+		//	}
+		//	var tousseName = checkedNode.get("tousseName");
+		//	if(tousseName != lastSelectedTousseName){
+		//		return false;
+		//	}
+		//	alert('useManualSelectPackageType');
+		return true;
 	}
-	
-	var basketTreeGridSelectionNodes = basketTreeGrid.getView().getSelectionModel().getSelection();
-	var waitPackingTreeSelectionNodes = waitPackingTreeGrid.getView().getSelectionModel().getSelection();
-	var totalSelectionNodesLength = basketTreeGridSelectionNodes.length + waitPackingTreeSelectionNodes.length;
-	if(totalSelectionNodesLength > 2){
-		return false;
+	// 固定装配1个
+	function printTousseByIDcardTaskNode(taskNode) {
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		var packed = false;
+		var tousseName = taskNode.get("tousseName");
+		var amount = taskNode.get("amount");
+		var tousseItemsToDelete = new Array();
+		setTousseItemsToDelete(tousseItemsToDelete, tousseName);
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var selNodes = basketTree.getView().getChecked();
+		var selectedNodes = basketTree.getView().getSelectionModel().getSelection()
+		var selLength = selNodes.length;
+		//	var selLength = 1;
+		//	alert(selLength)
+		if (amount < 1) {
+			return;
+		}
+		var useViewingPackageType = true;
+		if (selectedNodes != null && selectedNodes[0] != selNodes[0]) {
+			useViewingPackageType = false;
+			//		alert('useViewingPackageType')
+		}
+
+		var tousseName = taskNode.get("tousseName");
+		var status = taskNode.get("status");
+		var basketBarcode = taskNode.get("basketBarcode");
+		var taskId = taskNode.get("taskId");
+
+		var packageType = taskNode.get("packageType");
+		packageType = Ext4.getCmp('packageType').getValue();
+		var sterilingType = taskNode.get("sterilingMethod");
+		sterilingType = Ext4.getCmp('sterilingType').getValue();
+		var sType = Ext4.getCmp('sterilingType');
+		var tousseType = taskNode.get("tousseType");
+		var supplierName = taskNode.get("supplierName");
+		var damages = taskNode.get("damages");
+		var errors = taskNode.get("errors");
+		var department = taskNode.get("department");
+		var urgentAmount = taskNode.get("urgentAmount");
+		var tousseID = taskNode.get("tousseID");
+		var taskIdToAmountMapInfo = [{
+			taskId: taskId,
+			amount: amount,
+			errorDamageAmount: 0
+		}]
+		// 装配
+		var arr = [];
+		packed = packingTousse(false, basketBarcode, basketBarcode, taskId, tousseName, tousseType, 1, packageType, sterilingType, supplierName, department, urgentAmount, JSON.stringify(taskIdToAmountMapInfo), tousseID);
+		if (packed !== false) {
+			arr.push(packed)
+			requestPackingTousse(arr, 0);
+			addTaskItemsToDelete(tousseItemsToDelete, tousseName, taskId, 1);
+			Ext4.getCmp('remark').setValue();
+		}
+		// 一次打印
+		printLabelsAfterPacking();
+		// 删除篮筐物品
+		deleteBasketItems(tousseItemsToDelete);
+		//刷新待装配列表
+		waitPackingTreeGrid.getStore().reload();
+		//刷新篮筐内物品
+		reloadBasketTreeGrid(false);
+		return packed;
 	}
-//	if(totalSelectionNodesLength != 1){
-//		return false;
-//	}
-	var checkedNode = null;
-	if(basketTreeGridCheckedNodes.length > 0){
-		checkedNode = basketTreeGridCheckedNodes[0];
-	}else{
-		checkedNode = waitPackingTreeCheckedNodes[0];
-	}
-	var tousseName = checkedNode.get("tousseName");
-//	if(basketTreeGridSelectionNodes.length > 0){
-//		for(var i=0;i<basketTreeGridSelectionNodes.length;++i){
-//			if(tousseName != basketTreeGridSelectionNodes[i].get("tousseName")){
-//				return false;
-//			}
-//		}
-//	}
-//	if(waitPackingTreeSelectionNodes.length > 0){
-//		for(var i=0;i<waitPackingTreeSelectionNodes.length;++i){
-//			if(tousseName != waitPackingTreeSelectionNodes[i].get("tousseName")){
-//				return false;
-//			}
-//		}
-//	}
-	var tousseName2 = Ext4.getCmp('imageName').getText();
-	if(tousseName != tousseName2){
-		return false;
-	}
-//	var selectionNode = null;
-//	if(basketTreeGridSelectionNodes.length > 0){
-//		selectionNode = basketTreeGridSelectionNodes[0];
-//	}else{
-//		selectionNode = waitPackingTreeSelectionNodes[0];
-//	}
-//	if(checkedNode != selectionNode ){
-////		alert('checkedNode != selectionNode')
-//		return false;
-//	}
-//	var tousseName = checkedNode.get("tousseName");
-//	if(tousseName != lastSelectedTousseName){
-//		return false;
-//	}
-//	alert('useManualSelectPackageType');
-	return true;
-}
-// 固定装配1个
-function printTousseByIDcardTaskNode(taskNode){
-	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	var packed = false;
-	var tousseName = taskNode.get("tousseName");
-	var amount = taskNode.get("amount");
-	var tousseItemsToDelete = new Array();
-	setTousseItemsToDelete(tousseItemsToDelete,tousseName);
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	var selNodes = basketTree.getView().getChecked();
-	var selectedNodes = basketTree.getView().getSelectionModel().getSelection()
-	var selLength = selNodes.length;
-//	var selLength = 1;
-//	alert(selLength)
-	if(amount < 1){
-    	return;
-    }
-	var useViewingPackageType = true;
-	if(selectedNodes != null && selectedNodes[0] != selNodes[0]){
-		useViewingPackageType = false;
-//		alert('useViewingPackageType')
-	}
-	
-    var tousseName = taskNode.get("tousseName");
-	var status = taskNode.get("status");
-	var basketBarcode = taskNode.get("basketBarcode");
- 	var taskId = taskNode.get("taskId");
- 	
- 	var packageType = taskNode.get("packageType");
- 	packageType = Ext4.getCmp('packageType').getValue();
- 	var sterilingType = taskNode.get("sterilingMethod");
- 	sterilingType = Ext4.getCmp('sterilingType').getValue();
- 	var sType = Ext4.getCmp('sterilingType');
- 	var tousseType = taskNode.get("tousseType");
-	var supplierName = taskNode.get("supplierName");
- 	var damages = taskNode.get("damages");
- 	var errors = taskNode.get("errors");
- 	var department = taskNode.get("department");
-	var urgentAmount = taskNode.get("urgentAmount");
-	var tousseID = taskNode.get("tousseID");
-	var taskIdToAmountMapInfo = [{
-		taskId:taskId,
-		amount:amount,
-		errorDamageAmount:0
-	}]
-	// 装配
-	var arr = [];
-    packed = packingTousse(false,basketBarcode,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount,JSON.stringify(taskIdToAmountMapInfo),tousseID);
-	if(packed !== false){
-		arr.push(packed)
-		requestPackingTousse(arr,0);
-    	addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1);
-    	Ext4.getCmp('remark').setValue();
-    }
-    // 一次打印
-	printLabelsAfterPacking();
- 	// 删除篮筐物品
-	deleteBasketItems(tousseItemsToDelete);
-	//刷新待装配列表
-	waitPackingTreeGrid.getStore().reload();
-	//刷新篮筐内物品
-	reloadBasketTreeGrid(false);
-	return packed;
-}
 
-function maintainTousse(){
-	// 判断是否保养 
-	var isMaintain = false;
-	DWREngine.setAsync(false);
-	PackingTableManager.isMaintainTousse(idCardInstanceID,function(result){
-		isMaintain = result;
-	});
-	DWREngine.setAsync(true);
-	if(isMaintain == true){
-		Ext4.MessageBox.confirm("器械包需要保养", "是否保养?",
-				function(btn) {
+	function maintainTousse() {
+		// 判断是否保养 
+		var isMaintain = false;
+		DWREngine.setAsync(false);
+		PackingTableManager.isMaintainTousse(idCardInstanceID, function (result) {
+			isMaintain = result;
+		});
+		DWREngine.setAsync(true);
+		if (isMaintain == true) {
+			Ext4.MessageBox.confirm("器械包需要保养", "是否保养?",
+				function (btn) {
 					if (btn == 'yes') {
 						addAndEditTousseMainTain();
-						loadDataByIdCardInstanceID(idCardInstanceID,"到期添加");
+						loadDataByIdCardInstanceID(idCardInstanceID, "到期添加");
 					}
-		});
+				});
+		}
 	}
-}
 
-// 验证参数
-function validateFormParamsForPack(){
-	if(sstsConfig.showInspectorField){
-		var inspector = Ext4.getCmp('inspector' , null , sstsConfig.messagePauseTimeOnPackingPage);
-		if(inspector.isVisible(true) && !inspector.getValue()){
-			showResult("请扫描"+inspectorName+"条码！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+	// 验证参数
+	function validateFormParamsForPack() {
+		if (sstsConfig.showInspectorField) {
+			var inspector = Ext4.getCmp('inspector', null, sstsConfig.messagePauseTimeOnPackingPage);
+			if (inspector.isVisible(true) && !inspector.getValue()) {
+				showResult("请扫描" + inspectorName + "条码！", null, sstsConfig.messagePauseTimeOnPackingPage);
+				return false;
+			}
+		}
+		if (!Ext4.getCmp('operator').getValue()) {
+			showResult("请扫描配包人条码！", null, sstsConfig.messagePauseTimeOnPackingPage);
 			return false;
 		}
-	}
-	if(!Ext4.getCmp('operator').getValue()){
-        showResult("请扫描配包人条码！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-    }
-	var reviewer = Ext4.getCmp('reviewer' , null , sstsConfig.messagePauseTimeOnPackingPage);
-    if(reviewer.isVisible(true) && !reviewer.getValue()){
-        showResult("请扫描"+reviewViewText+"人条码！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-    }
-	if(sstsConfig.showSterileField){
-		var sterileUser = Ext4.getCmp('sterileUser' , null , sstsConfig.messagePauseTimeOnPackingPage);
-		if(sterileUser.isVisible(true) && !sterileUser.getValue()){
-			showResult("请扫描灭菌人条码！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		var reviewer = Ext4.getCmp('reviewer', null, sstsConfig.messagePauseTimeOnPackingPage);
+		if (reviewer.isVisible(true) && !reviewer.getValue()) {
+			showResult("请扫描" + reviewViewText + "人条码！", null, sstsConfig.messagePauseTimeOnPackingPage);
 			return false;
 		}
-	}
-	if(sstsConfig.showWrapperField){
-		var wrapper = Ext4.getCmp('wrapper' , null , sstsConfig.messagePauseTimeOnPackingPage);
-		if(wrapper.isVisible(true) && !wrapper.getValue()){
-			showResult("请扫描包装人条码！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		if (sstsConfig.showSterileField) {
+			var sterileUser = Ext4.getCmp('sterileUser', null, sstsConfig.messagePauseTimeOnPackingPage);
+			if (sterileUser.isVisible(true) && !sterileUser.getValue()) {
+				showResult("请扫描灭菌人条码！", null, sstsConfig.messagePauseTimeOnPackingPage);
+				return false;
+			}
+		}
+		if (sstsConfig.showWrapperField) {
+			var wrapper = Ext4.getCmp('wrapper', null, sstsConfig.messagePauseTimeOnPackingPage);
+			if (wrapper.isVisible(true) && !wrapper.getValue()) {
+				showResult("请扫描包装人条码！", null, sstsConfig.messagePauseTimeOnPackingPage);
+				return false;
+			}
+		}
+		if (!Ext4.getCmp('sterilingType').getValue() && !Ext4.getCmp('sterilingType').isHidden()) {
+			showResult("请选择灭菌程序！", null, sstsConfig.messagePauseTimeOnPackingPage);
 			return false;
 		}
-	}
-    if(!Ext4.getCmp('sterilingType').getValue() && !Ext4.getCmp('sterilingType').isHidden()){
-        showResult("请选择灭菌程序！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-    }
-    if(!Ext4.getCmp('packageType').getValue()){
-        showResult("请选择包装类型！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-    }
-    
-    if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('sterilizer').getValue()){
-        showResult("请选择灭菌炉！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-    }
-    
-    if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('frequency').getValue()){
-        showResult("请输入炉次号！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-    }
-    
-    return true;
-}
-// 校验是否有选中外来器械
-function ifCheckedForeignTousse(){
-	 var bRet = false;
-	 var basketTree = Ext4.getCmp('basketTreeGrid');
-	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	 var selNodes = basketTree.getView().getChecked();
-	 var selLength = selNodes.length;
-	 
-	//遍历器械包节点
-	 Ext4.each(selNodes, function(pNode){
-		 var tousseType = pNode.get('tousseType');
-		 if(tousseType == '外来器械包'){
-			 bRet = true;
-			 return false;
-		 }
-	});
-	return bRet;
-}
-// 校验是否有选中的装配任务包装类型为空
-function ifCheckedPackingTasksHaveEmptyPackageType(){
-	 var bRet = false;
-	 var basketTree = Ext4.getCmp('basketTreeGrid');
-	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	 var selNodes = basketTree.getView().getChecked();
-	 var selLength = selNodes.length;
-	 
-	//遍历器械包节点
-	 Ext4.each(selNodes, function(pNode){
-		 var pTousseName = pNode.get('tousseName');
-		 //器械包装配数量
-		 var packingAmount = pNode.get('amount');
-		 if(packingAmount <= 0){
-		    	return;
-		 }
-         var tousseName;
-         var packageType;
-         var sterilingType;
-         //遍历器械包下的每条装配任务数据
-		 Ext4.each(pNode.childNodes,function(cNode){
-			    tousseName = cNode.get("tousseName");
-             	packageType = cNode.get("packageType");
-             	sterilingType = cNode.get("sterilingMethod");
-             	if(isUndefinedOrNullOrEmpty(packageType)){
-             		bRet = true;
-             		showResult("【"+tousseName+"】未定义包装类型，请定义包装类型后装配！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-             	}
-//             	if(isUndefinedOrNullOrEmpty(sterilingType)){
-//             		bRet = true;
-//             		showResult("【"+tousseName+"】未定义灭菌程序，请定义灭菌程序后装配！");
-//             	}
-		 });
-	});
-	 if(!bRet){
-			//不回收的物品
-	       var isShow = Ext4.getCmp('save_print').isVisible();
-	       if(isShow){
-	           	//选择统计的敷料包选项全打印
-	           	var selNodes = waitPackingTreeGrid.getView().getChecked();
-	           	var selLength = selNodes.length;
-	       		Ext4.each(selNodes, function(pNode) {
-	       			if(pNode.get('taskType') == taskType_recyclingRecord){
-	       				return true;//在each(jquery、ext都如此)循环中,return true表示continue,return false表示break
-	       			}
-	       			var packingAmount = pNode.get('amount');
-	       			var urgentAmount = pNode.get("urgentAmount");
-	       			
-	                var tousseName;
-	                var packageType;
-	                var sterilingType;
-	                 
-	       			Ext4.each(pNode.childNodes, function(cNode) {
-	       				if(packingAmount <= 0){
-					    	return;
-					    }
-	       				tousseName = cNode.get("tousseName");
-	                 	packageType = cNode.get("packageType");
-	                 	sterilingType = cNode.get("sterilingMethod");
-	                 	if(isUndefinedOrNullOrEmpty(packageType)){
-	                 		bRet = true;
-	                 		showResult("【"+tousseName+"】未定义包装类型，请定义包装类型后装配！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	                 	}
-//	                 	if(isUndefinedOrNullOrEmpty(sterilingType)){
-//	                 		bRet = true;
-//	                 		showResult("【"+tousseName+"】未定义灭菌程序，请定义灭菌程序后装配！");
-//	                 	}
-	       			});
-	       		});
-	       }
-	 }
-	 return bRet;
-}
-function validateRemark(){
-	
-	var remark = Ext4.getCmp('remark').getValue();
-	if(isUndefinedOrNullOrEmpty(remark)){
+		if (!Ext4.getCmp('packageType').getValue()) {
+			showResult("请选择包装类型！", null, sstsConfig.messagePauseTimeOnPackingPage);
+			return false;
+		}
+
+		if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('sterilizer').getValue()) {
+			showResult("请选择灭菌炉！", null, sstsConfig.messagePauseTimeOnPackingPage);
+			return false;
+		}
+
+		if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('frequency').getValue()) {
+			showResult("请输入炉次号！", null, sstsConfig.messagePauseTimeOnPackingPage);
+			return false;
+		}
+
 		return true;
 	}
-	var totalPackingAmount = 0;
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	 {
-		 var selNodes = basketTree.getView().getChecked();
-		 var selLength = selNodes.length;
-		// 遍历器械包节点
-		 Ext4.each(selNodes, function(pNode){
-			 var packingAmount = pNode.get('amount');
-			 if(packingAmount > 0 && pNode.childNodes.length == 0){
-				 totalPackingAmount += packingAmount;
-			 }
+	// 校验是否有选中外来器械
+	function ifCheckedForeignTousse() {
+		var bRet = false;
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		var selNodes = basketTree.getView().getChecked();
+		var selLength = selNodes.length;
+
+		//遍历器械包节点
+		Ext4.each(selNodes, function (pNode) {
+			var tousseType = pNode.get('tousseType');
+			if (tousseType == '外来器械包') {
+				bRet = true;
+				return false;
+			}
 		});
-	 }
-	 {
-       	// 选择统计的敷料包选项全打印
-       	var selNodes = waitPackingTreeGrid.getView().getChecked();
-       	var selLength = selNodes.length;
-   		Ext4.each(selNodes, function(pNode) {
-   			var packingAmount = pNode.get('amount');
-			 if(packingAmount > 0 && pNode.childNodes.length == 0){
-				 totalPackingAmount += packingAmount;
-			 }
-   		});
-	 }
-	 if(totalPackingAmount > 1){
-		 showResult("备注不为空时，只能装配一个包!" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	     return false;
-	 }
-	 return true;
-}
-var packing = false;
-function packingView_autoPacking(){
-	if(sstsConfig.autoPackingAfterScanIdCard){
-		packing = true;
-		Ext4.getCmp('save_print').disable();
-		packingTousseBtnClick();
+		return bRet;
 	}
-}
-function onPackingTousseBtnClickComplete(){
-	Ext4.getCmp('save_print').enable();
-	Ext4.getCmp('packingLableBtn').enable();
-	
-	hidePackingTousseBtnClick_mask();
-	// 根据装配组的配置来设置光标
-	if(taskGroupObj && taskGroupObj.cursorFieldAfterPacking && taskGroupObj.cursorFieldAfterPacking == '标识牌条码'){
-		Ext4.getCmp('scanIdCardBarcode').focus('', 10);
-	}else {
-		Ext4.getCmp('basketBarcodeInput').focus('', 10);
+	// 校验是否有选中的装配任务包装类型为空
+	function ifCheckedPackingTasksHaveEmptyPackageType() {
+		var bRet = false;
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		var selNodes = basketTree.getView().getChecked();
+		var selLength = selNodes.length;
+
+		//遍历器械包节点
+		Ext4.each(selNodes, function (pNode) {
+			var pTousseName = pNode.get('tousseName');
+			//器械包装配数量
+			var packingAmount = pNode.get('amount');
+			if (packingAmount <= 0) {
+				return;
+			}
+			var tousseName;
+			var packageType;
+			var sterilingType;
+			//遍历器械包下的每条装配任务数据
+			Ext4.each(pNode.childNodes, function (cNode) {
+				tousseName = cNode.get("tousseName");
+				packageType = cNode.get("packageType");
+				sterilingType = cNode.get("sterilingMethod");
+				if (isUndefinedOrNullOrEmpty(packageType)) {
+					bRet = true;
+					showResult("【" + tousseName + "】未定义包装类型，请定义包装类型后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
+				}
+				//             	if(isUndefinedOrNullOrEmpty(sterilingType)){
+				//             		bRet = true;
+				//             		showResult("【"+tousseName+"】未定义灭菌程序，请定义灭菌程序后装配！");
+				//             	}
+			});
+		});
+		if (!bRet) {
+			//不回收的物品
+			var isShow = Ext4.getCmp('save_print').isVisible();
+			if (isShow) {
+				//选择统计的敷料包选项全打印
+				var selNodes = waitPackingTreeGrid.getView().getChecked();
+				var selLength = selNodes.length;
+				Ext4.each(selNodes, function (pNode) {
+					if (pNode.get('taskType') == taskType_recyclingRecord) {
+						return true;//在each(jquery、ext都如此)循环中,return true表示continue,return false表示break
+					}
+					var packingAmount = pNode.get('amount');
+					var urgentAmount = pNode.get("urgentAmount");
+
+					var tousseName;
+					var packageType;
+					var sterilingType;
+
+					Ext4.each(pNode.childNodes, function (cNode) {
+						if (packingAmount <= 0) {
+							return;
+						}
+						tousseName = cNode.get("tousseName");
+						packageType = cNode.get("packageType");
+						sterilingType = cNode.get("sterilingMethod");
+						if (isUndefinedOrNullOrEmpty(packageType)) {
+							bRet = true;
+							showResult("【" + tousseName + "】未定义包装类型，请定义包装类型后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
+						}
+						//	                 	if(isUndefinedOrNullOrEmpty(sterilingType)){
+						//	                 		bRet = true;
+						//	                 		showResult("【"+tousseName+"】未定义灭菌程序，请定义灭菌程序后装配！");
+						//	                 	}
+					});
+				});
+			}
+		}
+		return bRet;
 	}
-	
-}
-function showPackingTousseBtnClick_mask(){
-	packingTousseBtnClick_mask = new Ext4.LoadMask({msg:"正在装配，请稍候...",target:Ext4.getCmp('packingViewTab0')});
-	packingTousseBtnClick_mask.show();
-}
-function hidePackingTousseBtnClick_mask(){
-	if(packingTousseBtnClick_mask != null){
-		packingTousseBtnClick_mask.destroy();
-		packingTousseBtnClick_mask = null;
-	}
-}
-var packingTousseBtnClick_mask = null;
+	function validateRemark() {
 
-function processActionBarcode(field){
-	var barcode = field.getValue();
-	
-	if(barcode == BARCODE_ACTION_PACKING_AND_PRINT){
-		field.setValue();
-		setTimeout(processActionBarcode_BARCODE_ACTION_PACKING_AND_PRINT,100);		
+		var remark = Ext4.getCmp('remark').getValue();
+		if (isUndefinedOrNullOrEmpty(remark)) {
+			return true;
+		}
+		var totalPackingAmount = 0;
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		{
+			var selNodes = basketTree.getView().getChecked();
+			var selLength = selNodes.length;
+			// 遍历器械包节点
+			Ext4.each(selNodes, function (pNode) {
+				var packingAmount = pNode.get('amount');
+				if (packingAmount > 0 && pNode.childNodes.length == 0) {
+					totalPackingAmount += packingAmount;
+				}
+			});
+		}
+		{
+			// 选择统计的敷料包选项全打印
+			var selNodes = waitPackingTreeGrid.getView().getChecked();
+			var selLength = selNodes.length;
+			Ext4.each(selNodes, function (pNode) {
+				var packingAmount = pNode.get('amount');
+				if (packingAmount > 0 && pNode.childNodes.length == 0) {
+					totalPackingAmount += packingAmount;
+				}
+			});
+		}
+		if (totalPackingAmount > 1) {
+			showResult("备注不为空时，只能装配一个包!", null, sstsConfig.messagePauseTimeOnPackingPage);
+			return false;
+		}
 		return true;
 	}
-	return false;
-}
-function processActionBarcode_BARCODE_ACTION_PACKING_AND_PRINT(){
-	var btn = Ext4.getCmp('save_print');
-	packing = true;
-	btn.disable();
-	packingTousseBtnClick();
-}
-var confirmIndicatorCardWin = null;
-function packingTousseBtnClick0(btn,isPacking){
-	
-	if(sstsConfig.packingView_confirmIndicatorCard && ifCheckedForeignTousse()){
-		if(confirmIndicatorCardWin){
-			return;
+	var packing = false;
+	function packingView_autoPacking() {
+		if (sstsConfig.autoPackingAfterScanIdCard) {
+			packing = true;
+			Ext4.getCmp('save_print').disable();
+			packingTousseBtnClick();
 		}
-		confirmIndicatorCardWin = top.Ext4.MessageBox.confirm("请确认","是否已放置指示卡！",
-				function(button) {
+	}
+	function onPackingTousseBtnClickComplete() {
+		Ext4.getCmp('save_print').enable();
+		Ext4.getCmp('packingLableBtn').enable();
+
+		hidePackingTousseBtnClick_mask();
+		// 根据装配组的配置来设置光标
+		if (taskGroupObj && taskGroupObj.cursorFieldAfterPacking && taskGroupObj.cursorFieldAfterPacking == '标识牌条码') {
+			Ext4.getCmp('scanIdCardBarcode').focus('', 10);
+		} else {
+			Ext4.getCmp('basketBarcodeInput').focus('', 10);
+		}
+
+	}
+	function showPackingTousseBtnClick_mask() {
+		packingTousseBtnClick_mask = new Ext4.LoadMask({ msg: "正在装配，请稍候...", target: Ext4.getCmp('packingViewTab0') });
+		packingTousseBtnClick_mask.show();
+	}
+	function hidePackingTousseBtnClick_mask() {
+		if (packingTousseBtnClick_mask != null) {
+			packingTousseBtnClick_mask.destroy();
+			packingTousseBtnClick_mask = null;
+		}
+	}
+	var packingTousseBtnClick_mask = null;
+
+	function processActionBarcode(field) {
+		var barcode = field.getValue();
+
+		if (barcode == BARCODE_ACTION_PACKING_AND_PRINT) {
+			field.setValue();
+			setTimeout(processActionBarcode_BARCODE_ACTION_PACKING_AND_PRINT, 100);
+			return true;
+		}
+		return false;
+	}
+	function processActionBarcode_BARCODE_ACTION_PACKING_AND_PRINT() {
+		var btn = Ext4.getCmp('save_print');
+		packing = true;
+		btn.disable();
+		packingTousseBtnClick();
+	}
+	var confirmIndicatorCardWin = null;
+	function packingTousseBtnClick0(btn, isPacking) {
+
+		if (sstsConfig.packingView_confirmIndicatorCard && ifCheckedForeignTousse()) {
+			if (confirmIndicatorCardWin) {
+				return;
+			}
+			confirmIndicatorCardWin = top.Ext4.MessageBox.confirm("请确认", "是否已放置指示卡！",
+				function (button) {
 					confirmIndicatorCardWin = null;
-					if ("yes" == button){
+					if ("yes" == button) {
 						packing = isPacking;
 						btn.disable();
 						packingTousseBtnClick();
 					}
-		});
-	}else{
-		if(sstsConfig.enablePackingMaterialsCheckFunction){
-			var names = [];
-			getPackingMaterialsForCheck.forEach(function(item) {
-				for(var i=2;i<item.length;i++){
-					if(item[i] !== true){
-						names.push(item[i]);
+				});
+		} else {
+			if (sstsConfig.enablePackingMaterialsCheckFunction) {
+				var names = [];
+				getPackingMaterialsForCheck.forEach(function (item) {
+					for (var i = 2; i < item.length; i++) {
+						if (item[i] !== true) {
+							names.push(item[i]);
+						}
 					}
+				})
+				if (names.length > 5) {
+					showResult('如下材料还未进行检查：' + names.splice(0, 5).join('、') + '....!');
+					return
+				} else if (names.length <= 5 && names.length > 0) {
+					showResult('如下材料还未进行检查：' + names.join('、') + '!');
+					return
+				} else {
+					packing = isPacking;
+					btn.disable();
+					packingTousseBtnClick();
 				}
-			})
-			if(names.length > 5){
-				showResult('如下材料还未进行检查：'+names.splice(0,5).join('、')+'....!');
-				return
-			}else if(names.length <= 5 && names.length > 0){
-				showResult('如下材料还未进行检查：'+names.join('、')+'!');
-				return
-			}else {
+			} else {
 				packing = isPacking;
 				btn.disable();
 				packingTousseBtnClick();
 			}
-		}else {
-			packing = isPacking;
-			btn.disable();
-			packingTousseBtnClick();
 		}
-	}	
-}
-// 装配按钮调用
-function packingTousseBtnClick(){
-	if(packing){
-		packingToussesArray = []; // 清除所装配的器械包数组
-		packedToussesArray = [];
-		tousseesToPrint = [];
 	}
-	// 备注不为空时只能装配一个包实例
-	if(!validateRemark()){
-		onPackingTousseBtnClickComplete();
-		return;
-	}
-	// 首先处理标识牌的打印
-	var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
-	if(scanScanIDCardBarcode.isVisible(true)){
-		printIDCardTousse();
-		return;
-	}
-	
-	if(!validateFormParamsForPack()){
-		onPackingTousseBtnClickComplete();
-		return;
-	}
-	showPackingTousseBtnClick_mask();
-	// 延迟100ms执行
-	setTimeout(packingTousseBtnClick_DeferredExecution,100);
-}
-// 装配按钮调用,延迟执行 
-function packingTousseBtnClick_DeferredExecution(isConfirm){
-	isConfirm = isConfirm || '否';
-	 var basketTree = Ext4.getCmp('basketTreeGrid');
-	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	 var selNodes = basketTree.getView().getChecked();
-	 var selLength = selNodes.length;
-	 if(selLength > 0){
-		var delBasketItems = new Array();
-		var map = {},dest = [];
-		Ext4.each(selNodes, function(pNode){
-			if(pNode.childNodes.length == 0){
-				var ai = pNode;
-				if(!map[ai.get('tousseName')]){
-					dest.push(ai.parentNode);
-					map[ai.get('tousseName')] = ai;
-				}
-			}
-		});
-		if(dest.length == 1 && isConfirm == '否'){
-			var sterilingType = Ext4.getCmp('sterilingType').getValue();
-			if(packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType){
-				if(dest[0].data.sterilingMethod !== sterilingType && (dest[0].data.sterilingMethod || '') !== ''){
-					Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName')+'的灭菌程序与包定义不相同，是否继续装配？',
-						function(btn) {
-							if (btn == 'yes') {
-								packingTousseBtnClick_DeferredExecution('是')
-							}else {
-								onPackingTousseBtnClickComplete();
-							}
-					});
-					return
-				}
-			}
+	// 装配按钮调用
+	function packingTousseBtnClick() {
+		if (packing) {
+			packingToussesArray = []; // 清除所装配的器械包数组
+			packedToussesArray = [];
+			tousseesToPrint = [];
 		}
-		var params = [];
-		var packedPhotographed1 = true;
-		var packedPhotographed2 = true;
-		var msg1Array = [];
-		var msg2Array = [];
-		var packageArray = [];
-		for(var i=0;i<dest.length;i++){
-			var pNode = dest[i];
-			var pTousseName = pNode.get('tousseName');
-			 var haveIDCard = pNode.get('haveIDCard');
-			 // 跳过有标识牌的器械包
-			 if(haveIDCard){
-				showResult("【"+pTousseName+"】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-				onPackingTousseBtnClickComplete();
-				return;
-			 }
-			 //器械包装配数量
-			 var packingAmount = pNode.get('amount');
-			 if(packingAmount <= 0){
-				onPackingTousseBtnClickComplete();
-			    return;
-			 }
-			 
-			 //{tousseName:"",amount:1,packed:true,taskItems:[{taskId:11,amount:20},{taskId:12,amount:30}]}
-			 var basketItem = {};
-             basketItem.tousseName = pTousseName;
-             basketItem.amount = 0;
-             basketItem.packed = false;
-             var dl = delBasketItems.length;
-             delBasketItems[dl] = basketItem;
-			 
-             var taskItemArray = new Array();
-             basketItem.taskItems = taskItemArray;
-             
-             var taskIdArray = [];
-             var scannedBasketBarcodes = [];
-             var basketBarcode;
-			 var tousseType;
-			 var tousseName;
-			 var tousseID;
-             var packageType;
-             var sterilingType;
-             var supplierName;
-             var damages;
-             var errors;
-             var department;
-			 var departmentArray = [];
-			 var taskIdToAmountMapInfo = [];
-			 var status;
-			 var parentAmout = 0;
-			 var isChackAll = false;
-			 var taskIdsArray = [];
-			 var noUserFormSterilizationInfo = true;
-             //遍历器械包下的每条装配任务数据
-			 Ext4.each(selNodes,function(cNode){
-				if(cNode.childNodes.length > 0){
-					isChackAll = true;
-					if(cNode.data.tousseType == '外来器械包'){
-						for(var k=0;k<cNode.childNodes.length;k++){
-							if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.childNodes[k].data.partPacking){
-								packedPhotographed1 = false;
-								if(msg1Array.indexOf(cNode.childNodes[k].data.tousseName) == -1){
-									msg1Array.push(cNode.childNodes[k].data.tousseName);
-								}
-							}
-							if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !cNode.childNodes[k].data.packedPhotographed){
-								packedPhotographed2 = false;
-								if(msg2Array.indexOf(cNode.childNodes[k].data.tousseName) == -1){
-									msg2Array.push(cNode.childNodes[k].data.tousseName);
-								}
-							}
-						}
-					}
-				}
-				if(cNode.get("tousseName") == pTousseName && cNode.childNodes.length == 0){
-					tousseName = cNode.get("tousseName");
-					tousseID = cNode.get("tousseID");
-					status = cNode.get("status");
-					basketBarcode = cNode.get("basketBarcode");
-					var taskId = cNode.get("taskId");
-					var amount = cNode.get("amount");
-					packageType = cNode.get("packageType");
-					sterilingType = cNode.get("sterilingMethod");
-					if(dest.length == 1){
-						sterilingType = Ext4.getCmp('sterilingType').getValue();
-						packageType = Ext4.getCmp('packageType').getValue();
-						noUserFormSterilizationInfo = false;
-					}
-					tousseType = cNode.get("tousseType");
-					supplierName = cNode.get("supplierName");
-					damages = cNode.get("damages");
-					errors = cNode.get("errors");
-					department = cNode.get("department");
-					if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包'){
-						if(cNode.get("partPacking")){
-							packedPhotographed1 = false;
-							if(msg1Array.indexOf(cNode.get("tousseName")) == -1){
-								msg1Array.push(cNode.get("tousseName"));
-							}
-						}
-					}
-					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包'){
-						if(cNode.get("packedPhotographed") == '' || cNode.get("packedPhotographed") == false){
-							packedPhotographed2 = false;
-							if(msg2Array.indexOf(cNode.get("tousseName")) == -1){
-								msg2Array.push(cNode.get("tousseName"));
-							}
-						}
-					}
-					if(status == '待确认'){
-						showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-						onPackingTousseBtnClickComplete();
-						return;
-					}
-					var errorDamageAmount = 0;
-					var errorOrDamageAmount = 0;
-					if(!allowPackingWhenUnSupplementMaterial){
-						if(errors != null && errors.length > 0){
-							showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-							onPackingTousseBtnClickComplete();
-							return;
-						}
-						if(damages != null && damages.length > 0){
-							showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-							onPackingTousseBtnClickComplete();
-							return;
-						}
-					}else {
-						for(var i=0;i<errors.length;i++){
-							errorDamageAmount += parseInt(errors[i].amount);
-						}
-						for(var i=0;i<damages.length;i++){
-							errorDamageAmount += parseInt(damages[i].amount);
-						}
-					}
-					if(errorDamageAmount > 0){
-						errorOrDamageAmount = amount;
-					}
-					if(taskIdArray.indexOf(taskId) == -1){
-						departmentArray.push(department);
-						taskIdArray.push(taskId);
-						scannedBasketBarcodes.push(basketBarcode);
-						basketItem.amount += amount;
-						basketItem.packed = true;
-						var ti = taskItemArray.length;
-						taskItemArray[ti] = {};
-						taskItemArray[ti].taskId = taskId;
-						taskItemArray[ti].amount = amount;
-					}
-
-					taskIdToAmountMapInfo.push({
-						taskId:taskId,
-						amount:amount,
-						errorDamageAmount:errorDamageAmount
-					})
-
-					parentAmout += parseInt(amount);
-				}
-			 });
-			 var taskIdMap = {};
-			 var taskIdDest = [];
-			 for(var k=0;k<taskIdToAmountMapInfo.length;k++){
-				var ai = taskIdToAmountMapInfo[k];
-				if(!taskIdMap[ai.taskId]){
-					taskIdDest.push(ai);
-					taskIdMap[ai.taskId] = ai;
-				}else {
-					for(var j = 0; j < taskIdDest.length; j++){
-						var dj = taskIdDest[j];
-						if(dj.taskId == ai.taskId){
-							var amount = parseInt(ai.amount);
-							var errorDamageAmount = parseInt(ai.errorDamageAmount);
-							dj.amount += amount;
-							dj.errorDamageAmount += errorDamageAmount;
-						}
-					}
-				}
-			 }
-			 var lastAmount = 0;
-			if(isChackAll){
-				lastAmount = pNode.get('amount');
-			}else {
-				lastAmount = parentAmout;
-			}
-			packageArray.push({
-				printImmediately:false,
-				basketBarcode:basketBarcode,
-				scannedBasketBarcodes:scannedBasketBarcodes.join(";"),
-				taskIds:taskIdArray.join(";"),
-				tousseName:tousseName,
-				tousseType:tousseType,
-				packAmount:lastAmount,
-				packageType:packageType,
-				sterilingType:sterilingType,
-				supplierName:supplierName,
-				department:departmentArray.join(";"),
-				urgentAmount:pNode.get('urgentAmount'),
-				taskIdToAmountMapInfo:JSON.stringify(taskIdDest),
-				noUserFormSterilizationInfo:noUserFormSterilizationInfo,
-				tousseID:tousseID
-			});
-		}
-		if(!packedPhotographed1){
+		// 备注不为空时只能装配一个包实例
+		if (!validateRemark()) {
 			onPackingTousseBtnClickComplete();
-			showResult(msg1Array.join(",")+'已经做了拆包，请点击拆包进入完成操作!');
 			return;
 		}
-		if(!packedPhotographed2){
+		// 首先处理标识牌的打印
+		var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
+		if (scanScanIDCardBarcode.isVisible(true)) {
+			printIDCardTousse();
+			return;
+		}
+
+		if (!validateFormParamsForPack()) {
 			onPackingTousseBtnClickComplete();
-			showResult(msg2Array.join(",")+'还未上传照片，不能装配，请先上传照片!');
 			return;
 		}
-		if(packageArray.length > 0){
-			for(var i=0;i<packageArray.length;i++){
-				var printImmediately = packageArray[i].printImmediately;
-				var basketBarcode = packageArray[i].basketBarcode;
-				var scannedBasketBarcodes = packageArray[i].scannedBasketBarcodes;
-				var taskIds = packageArray[i].taskIds;
-				var tousseName = packageArray[i].tousseName;
-				var tousseType = packageArray[i].tousseType;
-				var packAmount = packageArray[i].packAmount;
-				var packageType = packageArray[i].packageType;
-				var sterilingType = packageArray[i].sterilingType;
-				var supplierName = packageArray[i].supplierName;
-				var department = packageArray[i].department;
-				var urgentAmount = packageArray[i].urgentAmount;
-				var taskIdToAmountMapInfo = packageArray[i].taskIdToAmountMapInfo;
-				var noUserFormSterilizationInfo = packageArray[i].noUserFormSterilizationInfo;
-				var tousseID = packageArray[i].tousseID;
-				//请求后台装配方法
-				var par = packingTousse(printImmediately,basketBarcode,scannedBasketBarcodes,taskIds,tousseName,tousseType,packAmount,packageType,
-					sterilingType,supplierName,department,urgentAmount,taskIdToAmountMapInfo,noUserFormSterilizationInfo,tousseID);
-				if(par !== false){
-					params.push(par);
-				}
-			}
-		}
-		isConfirmRequestPackingTousse(params,0,true);
-	 }else{
-		//不回收的物品
-	   var isShow = Ext4.getCmp('save_print').isVisible();
-       if(isShow){
-           	//选择统计的敷料包选项全打印
-           	var selNodes = waitPackingTreeGrid.getView().getChecked();
-			var selLength = selNodes.length;
-			var map = {},dest = [];
-			Ext4.each(selNodes, function(pNode){
-				if(pNode.childNodes.length == 0){
+		showPackingTousseBtnClick_mask();
+		// 延迟100ms执行
+		setTimeout(packingTousseBtnClick_DeferredExecution, 100);
+	}
+	// 装配按钮调用,延迟执行 
+	function packingTousseBtnClick_DeferredExecution(isConfirm) {
+		isConfirm = isConfirm || '否';
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		var selNodes = basketTree.getView().getChecked();
+		var selLength = selNodes.length;
+		if (selLength > 0) {
+			var delBasketItems = new Array();
+			var map = {}, dest = [];
+			Ext4.each(selNodes, function (pNode) {
+				if (pNode.childNodes.length == 0) {
 					var ai = pNode;
-					if(!map[ai.get('tousseName')]){
+					if (!map[ai.get('tousseName')]) {
 						dest.push(ai.parentNode);
 						map[ai.get('tousseName')] = ai;
 					}
 				}
 			});
-			if(dest.length == 1 && isConfirm == '否'){
+			if (dest.length == 1 && isConfirm == '否') {
 				var sterilingType = Ext4.getCmp('sterilingType').getValue();
-				if(packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType){
-					if(dest[0].data.sterilingMethod !== sterilingType && (dest[0].data.sterilingMethod || '') !== ''){
-						Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName')+'的灭菌程序与包定义不相同，是否继续装配？',
-							function(btn) {
+				if (packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType) {
+					if (dest[0].data.sterilingMethod !== sterilingType && (dest[0].data.sterilingMethod || '') !== '') {
+						Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName') + '的灭菌程序与包定义不相同，是否继续装配？',
+							function (btn) {
 								if (btn == 'yes') {
 									packingTousseBtnClick_DeferredExecution('是')
-								}else {
+								} else {
 									onPackingTousseBtnClickComplete();
 								}
-						});
+							});
 						return
 					}
 				}
 			}
 			var params = [];
-			for(var i=0;i<dest.length;i++){
+			var packedPhotographed1 = true;
+			var packedPhotographed2 = true;
+			var msg1Array = [];
+			var msg2Array = [];
+			var packageArray = [];
+			for (var i = 0; i < dest.length; i++) {
 				var pNode = dest[i];
-				if(pNode.get('taskType') == taskType_recyclingRecord){
-					return true;//在each(jquery、ext都如此)循环中,return true表示continue,return false表示break
+				var pTousseName = pNode.get('tousseName');
+				var haveIDCard = pNode.get('haveIDCard');
+				// 跳过有标识牌的器械包
+				if (haveIDCard) {
+					showResult("【" + pTousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
+					onPackingTousseBtnClickComplete();
+					return;
 				}
+				//器械包装配数量
 				var packingAmount = pNode.get('amount');
-				var urgentAmount = pNode.get("urgentAmount");
-				var pTousseName = pNode.get("tousseName");
-				var tousseID = pNode.get("tousseID");
-				var noUserFormSterilizationInfo = pNode.get("noUserFormSterilizationInfo");
-       			var taskIdArray = [];
-                var tousseName;
-                var tousseType;
-                var packageType;
-                var sterilingType;
-                var supplierName;
-                var department;
+				if (packingAmount <= 0) {
+					onPackingTousseBtnClickComplete();
+					return;
+				}
+
+				//{tousseName:"",amount:1,packed:true,taskItems:[{taskId:11,amount:20},{taskId:12,amount:30}]}
+				var basketItem = {};
+				basketItem.tousseName = pTousseName;
+				basketItem.amount = 0;
+				basketItem.packed = false;
+				var dl = delBasketItems.length;
+				delBasketItems[dl] = basketItem;
+
+				var taskItemArray = new Array();
+				basketItem.taskItems = taskItemArray;
+
+				var taskIdArray = [];
+				var scannedBasketBarcodes = [];
+				var basketBarcode;
+				var tousseType;
+				var tousseName;
+				var tousseID;
+				var packageType;
+				var sterilingType;
+				var supplierName;
+				var damages;
+				var errors;
+				var department;
 				var departmentArray = [];
 				var taskIdToAmountMapInfo = [];
 				var status;
 				var parentAmout = 0;
 				var isChackAll = false;
-				Ext4.each(selNodes,function(cNode){
-					if(cNode.childNodes.length > 0){
+				var taskIdsArray = [];
+				var noUserFormSterilizationInfo = true;
+				//遍历器械包下的每条装配任务数据
+				Ext4.each(selNodes, function (cNode) {
+					if (cNode.childNodes.length > 0) {
 						isChackAll = true;
+						if (cNode.data.tousseType == '外来器械包') {
+							for (var k = 0; k < cNode.childNodes.length; k++) {
+								if (sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.childNodes[k].data.partPacking) {
+									packedPhotographed1 = false;
+									if (msg1Array.indexOf(cNode.childNodes[k].data.tousseName) == -1) {
+										msg1Array.push(cNode.childNodes[k].data.tousseName);
+									}
+								}
+								if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !cNode.childNodes[k].data.packedPhotographed) {
+									packedPhotographed2 = false;
+									if (msg2Array.indexOf(cNode.childNodes[k].data.tousseName) == -1) {
+										msg2Array.push(cNode.childNodes[k].data.tousseName);
+									}
+								}
+							}
+						}
 					}
-					if(cNode.get("tousseName") == pTousseName && cNode.childNodes.length == 0){
+					if (cNode.get("tousseName") == pTousseName && cNode.childNodes.length == 0) {
 						tousseName = cNode.get("tousseName");
-						var haveIDCard = pNode.get('haveIDCard');
-						// 跳过有标识牌的器械包
-						if(haveIDCard){
-							showResult("【"+tousseName+"】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+						tousseID = cNode.get("tousseID");
+						status = cNode.get("status");
+						basketBarcode = cNode.get("basketBarcode");
+						var taskId = cNode.get("taskId");
+						var amount = cNode.get("amount");
+						packageType = cNode.get("packageType");
+						sterilingType = cNode.get("sterilingMethod");
+						if (dest.length == 1) {
+							sterilingType = Ext4.getCmp('sterilingType').getValue();
+							packageType = Ext4.getCmp('packageType').getValue();
+							noUserFormSterilizationInfo = false;
+						}
+						tousseType = cNode.get("tousseType");
+						supplierName = cNode.get("supplierName");
+						damages = cNode.get("damages");
+						errors = cNode.get("errors");
+						department = cNode.get("department");
+						if (sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包') {
+							if (cNode.get("partPacking")) {
+								packedPhotographed1 = false;
+								if (msg1Array.indexOf(cNode.get("tousseName")) == -1) {
+									msg1Array.push(cNode.get("tousseName"));
+								}
+							}
+						}
+						if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包') {
+							if (cNode.get("packedPhotographed") == '' || cNode.get("packedPhotographed") == false) {
+								packedPhotographed2 = false;
+								if (msg2Array.indexOf(cNode.get("tousseName")) == -1) {
+									msg2Array.push(cNode.get("tousseName"));
+								}
+							}
+						}
+						if (status == '待确认') {
+							showResult(tousseName + ",有器械丢失，请确认！", null, sstsConfig.messagePauseTimeOnPackingPage);
 							onPackingTousseBtnClickComplete();
 							return;
 						}
-						var status = cNode.get("status");
-						if(status == '待确认'){
-							showResult("【"+tousseName+"】有器械丢失，请先确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-							onPackingTousseBtnClickComplete();
-							return false;
+						var errorDamageAmount = 0;
+						var errorOrDamageAmount = 0;
+						if (!allowPackingWhenUnSupplementMaterial) {
+							if (errors != null && errors.length > 0) {
+								showResult("材料缺失，不够组成器械包，请补充缺失器械！", null, sstsConfig.messagePauseTimeOnPackingPage);
+								onPackingTousseBtnClickComplete();
+								return;
+							}
+							if (damages != null && damages.length > 0) {
+								showResult("材料已报损，不够组成器械包，请补充报损器械！", null, sstsConfig.messagePauseTimeOnPackingPage);
+								onPackingTousseBtnClickComplete();
+								return;
+							}
+						} else {
+							for (var i = 0; i < errors.length; i++) {
+								errorDamageAmount += parseInt(errors[i].amount);
+							}
+							for (var i = 0; i < damages.length; i++) {
+								errorDamageAmount += parseInt(damages[i].amount);
+							}
 						}
-						 var taskId = cNode.get("taskId");
-						 var amount = cNode.get("amount");
-						 packageType = cNode.get("packageType");
-						 sterilingType = cNode.get("sterilingMethod");
-						 if(dest.length == 1){
-							sterilingType = Ext4.getCmp('sterilingType').getValue();
-							packageType = Ext4.getCmp('packageType').getValue();
+						if (errorDamageAmount > 0) {
+							errorOrDamageAmount = amount;
 						}
-						 tousseType = cNode.get("tousseType");
-						 supplierName = cNode.get("supplierName");
-						 department = cNode.get("department");
-						 departmentArray.push(department);
-						 
-						if(packingAmount > 0){
+						if (taskIdArray.indexOf(taskId) == -1) {
+							departmentArray.push(department);
 							taskIdArray.push(taskId);
-							packingAmount -= amount;
+							scannedBasketBarcodes.push(basketBarcode);
+							basketItem.amount += amount;
+							basketItem.packed = true;
+							var ti = taskItemArray.length;
+							taskItemArray[ti] = {};
+							taskItemArray[ti].taskId = taskId;
+							taskItemArray[ti].amount = amount;
 						}
 
 						taskIdToAmountMapInfo.push({
-							taskId:taskId,
-							amount:amount,
-							errorDamageAmount:0
+							taskId: taskId,
+							amount: amount,
+							errorDamageAmount: errorDamageAmount
 						})
-						parentAmout += amount;
+
+						parentAmout += parseInt(amount);
 					}
-				})
+				});
+				var taskIdMap = {};
+				var taskIdDest = [];
+				for (var k = 0; k < taskIdToAmountMapInfo.length; k++) {
+					var ai = taskIdToAmountMapInfo[k];
+					if (!taskIdMap[ai.taskId]) {
+						taskIdDest.push(ai);
+						taskIdMap[ai.taskId] = ai;
+					} else {
+						for (var j = 0; j < taskIdDest.length; j++) {
+							var dj = taskIdDest[j];
+							if (dj.taskId == ai.taskId) {
+								var amount = parseInt(ai.amount);
+								var errorDamageAmount = parseInt(ai.errorDamageAmount);
+								dj.amount += amount;
+								dj.errorDamageAmount += errorDamageAmount;
+							}
+						}
+					}
+				}
 				var lastAmount = 0;
-				if(isChackAll){
+				if (isChackAll) {
 					lastAmount = pNode.get('amount');
-				}else {
+				} else {
 					lastAmount = parentAmout;
 				}
-				var par = packingTousse(false,'','',taskIdArray.join(";"),tousseName,tousseType,lastAmount,packageType,sterilingType,supplierName,departmentArray.join(";"),urgentAmount,JSON.stringify(taskIdToAmountMapInfo),noUserFormSterilizationInfo,tousseID);
-				if(par !== false){
-					params.push(par);
+				packageArray.push({
+					printImmediately: false,
+					basketBarcode: basketBarcode,
+					scannedBasketBarcodes: scannedBasketBarcodes.join(";"),
+					taskIds: taskIdArray.join(";"),
+					tousseName: tousseName,
+					tousseType: tousseType,
+					packAmount: lastAmount,
+					packageType: packageType,
+					sterilingType: sterilingType,
+					supplierName: supplierName,
+					department: departmentArray.join(";"),
+					urgentAmount: pNode.get('urgentAmount'),
+					taskIdToAmountMapInfo: JSON.stringify(taskIdDest),
+					noUserFormSterilizationInfo: noUserFormSterilizationInfo,
+					tousseID: tousseID
+				});
+			}
+			if (!packedPhotographed1) {
+				onPackingTousseBtnClickComplete();
+				showResult(msg1Array.join(",") + '已经做了拆包，请点击拆包进入完成操作!');
+				return;
+			}
+			if (!packedPhotographed2) {
+				onPackingTousseBtnClickComplete();
+				showResult(msg2Array.join(",") + '还未上传照片，不能装配，请先上传照片!');
+				return;
+			}
+			if (packageArray.length > 0) {
+				for (var i = 0; i < packageArray.length; i++) {
+					var printImmediately = packageArray[i].printImmediately;
+					var basketBarcode = packageArray[i].basketBarcode;
+					var scannedBasketBarcodes = packageArray[i].scannedBasketBarcodes;
+					var taskIds = packageArray[i].taskIds;
+					var tousseName = packageArray[i].tousseName;
+					var tousseType = packageArray[i].tousseType;
+					var packAmount = packageArray[i].packAmount;
+					var packageType = packageArray[i].packageType;
+					var sterilingType = packageArray[i].sterilingType;
+					var supplierName = packageArray[i].supplierName;
+					var department = packageArray[i].department;
+					var urgentAmount = packageArray[i].urgentAmount;
+					var taskIdToAmountMapInfo = packageArray[i].taskIdToAmountMapInfo;
+					var noUserFormSterilizationInfo = packageArray[i].noUserFormSterilizationInfo;
+					var tousseID = packageArray[i].tousseID;
+					//请求后台装配方法
+					var par = packingTousse(printImmediately, basketBarcode, scannedBasketBarcodes, taskIds, tousseName, tousseType, packAmount, packageType,
+						sterilingType, supplierName, department, urgentAmount, taskIdToAmountMapInfo, noUserFormSterilizationInfo, tousseID);
+					if (par !== false) {
+						params.push(par);
+					}
 				}
 			}
-			isConfirmRequestPackingTousse(params,0,false);
-       }else{
-          showResult('请选择要打印的行!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-       }
-	 }
-	 Ext4.getCmp('remark').setValue();
-     Ext4.getCmp('sterilingType').setValue(null);
-     Ext4.getCmp("sterilingMode").setValue("");
-     Ext4.getCmp('packageType').setValue(null);
-     Ext4.getCmp('packageType').enable();
-     lastSelectedTousseName = null;
-     
-     //如果装配界面的配包/审核人是否默认为上一次装配的配包/审核人配置为false,则装配完后需要重新清空
-     if(packingPageOperatorDefaultLastOperator == false){
-    	 Ext4.getCmp('operator').setValue('');
-     }
-     if(packingPageReviewerDefaultLastReviewer == false){
-    	 Ext4.getCmp('reviewer').setValue('');
-     }
-     
-     onPackingTousseBtnClickComplete();
-}
-// 装配器械包
-function packingTousse(printImmediately,basketBarcode,scannedBasketBarcodes,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department,urgentAmount,taskIdToAmountMapInfo,noUserFormSterilizationInfo,tousseID){
-	if(!validateFormParamsForPack()){
-		return false;
+			isConfirmRequestPackingTousse(params, 0, true);
+		} else {
+			//不回收的物品
+			var isShow = Ext4.getCmp('save_print').isVisible();
+			if (isShow) {
+				//选择统计的敷料包选项全打印
+				var selNodes = waitPackingTreeGrid.getView().getChecked();
+				var selLength = selNodes.length;
+				var map = {}, dest = [];
+				Ext4.each(selNodes, function (pNode) {
+					if (pNode.childNodes.length == 0) {
+						var ai = pNode;
+						if (!map[ai.get('tousseName')]) {
+							dest.push(ai.parentNode);
+							map[ai.get('tousseName')] = ai;
+						}
+					}
+				});
+				if (dest.length == 1 && isConfirm == '否') {
+					var sterilingType = Ext4.getCmp('sterilingType').getValue();
+					if (packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType) {
+						if (dest[0].data.sterilingMethod !== sterilingType && (dest[0].data.sterilingMethod || '') !== '') {
+							Ext4.MessageBox.confirm("请确认", dest[0].get('tousseName') + '的灭菌程序与包定义不相同，是否继续装配？',
+								function (btn) {
+									if (btn == 'yes') {
+										packingTousseBtnClick_DeferredExecution('是')
+									} else {
+										onPackingTousseBtnClickComplete();
+									}
+								});
+							return
+						}
+					}
+				}
+				var params = [];
+				for (var i = 0; i < dest.length; i++) {
+					var pNode = dest[i];
+					if (pNode.get('taskType') == taskType_recyclingRecord) {
+						return true;//在each(jquery、ext都如此)循环中,return true表示continue,return false表示break
+					}
+					var packingAmount = pNode.get('amount');
+					var urgentAmount = pNode.get("urgentAmount");
+					var pTousseName = pNode.get("tousseName");
+					var tousseID = pNode.get("tousseID");
+					var noUserFormSterilizationInfo = pNode.get("noUserFormSterilizationInfo");
+					var taskIdArray = [];
+					var tousseName;
+					var tousseType;
+					var packageType;
+					var sterilingType;
+					var supplierName;
+					var department;
+					var departmentArray = [];
+					var taskIdToAmountMapInfo = [];
+					var status;
+					var parentAmout = 0;
+					var isChackAll = false;
+					Ext4.each(selNodes, function (cNode) {
+						if (cNode.childNodes.length > 0) {
+							isChackAll = true;
+						}
+						if (cNode.get("tousseName") == pTousseName && cNode.childNodes.length == 0) {
+							tousseName = cNode.get("tousseName");
+							var haveIDCard = pNode.get('haveIDCard');
+							// 跳过有标识牌的器械包
+							if (haveIDCard) {
+								showResult("【" + tousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
+								onPackingTousseBtnClickComplete();
+								return;
+							}
+							var status = cNode.get("status");
+							if (status == '待确认') {
+								showResult("【" + tousseName + "】有器械丢失，请先确认！", null, sstsConfig.messagePauseTimeOnPackingPage);
+								onPackingTousseBtnClickComplete();
+								return false;
+							}
+							var taskId = cNode.get("taskId");
+							var amount = cNode.get("amount");
+							packageType = cNode.get("packageType");
+							sterilingType = cNode.get("sterilingMethod");
+							if (dest.length == 1) {
+								sterilingType = Ext4.getCmp('sterilingType').getValue();
+								packageType = Ext4.getCmp('packageType').getValue();
+							}
+							tousseType = cNode.get("tousseType");
+							supplierName = cNode.get("supplierName");
+							department = cNode.get("department");
+							departmentArray.push(department);
+
+							if (packingAmount > 0) {
+								taskIdArray.push(taskId);
+								packingAmount -= amount;
+							}
+
+							taskIdToAmountMapInfo.push({
+								taskId: taskId,
+								amount: amount,
+								errorDamageAmount: 0
+							})
+							parentAmout += amount;
+						}
+					})
+					var lastAmount = 0;
+					if (isChackAll) {
+						lastAmount = pNode.get('amount');
+					} else {
+						lastAmount = parentAmout;
+					}
+					var par = packingTousse(false, '', '', taskIdArray.join(";"), tousseName, tousseType, lastAmount, packageType, sterilingType, supplierName, departmentArray.join(";"), urgentAmount, JSON.stringify(taskIdToAmountMapInfo), noUserFormSterilizationInfo, tousseID);
+					if (par !== false) {
+						params.push(par);
+					}
+				}
+				isConfirmRequestPackingTousse(params, 0, false);
+			} else {
+				showResult('请选择要打印的行!', null, sstsConfig.messagePauseTimeOnPackingPage);
+			}
+		}
+		Ext4.getCmp('remark').setValue();
+		Ext4.getCmp('sterilingType').setValue(null);
+		Ext4.getCmp("sterilingMode").setValue("");
+		Ext4.getCmp('packageType').setValue(null);
+		Ext4.getCmp('packageType').enable();
+		lastSelectedTousseName = null;
+
+		//如果装配界面的配包/审核人是否默认为上一次装配的配包/审核人配置为false,则装配完后需要重新清空
+		if (packingPageOperatorDefaultLastOperator == false) {
+			Ext4.getCmp('operator').setValue('');
+		}
+		if (packingPageReviewerDefaultLastReviewer == false) {
+			Ext4.getCmp('reviewer').setValue('');
+		}
+
+		onPackingTousseBtnClickComplete();
 	}
-	var tousseWeight = Ext4.getCmp('tousseWeight').getValue();
-    //是否消毒物品
-    var validatepass = true;
-    DWREngine.setAsync(false);
-    PackingTableManager.validatePackingTask(taskIds,new Date(),packageType,tousseName,supplierName,idCardInstanceID,function(response){
-    	var result = Ext4.decode(response);
-        var ableToPack = result.ableToPackAmount;
-        var errorMsg = result.errorMsg;
-        if(errorMsg != null && errorMsg != ''){
-        	validatepass = false;
-        	showWarningDialog(errorMsg);
-        }
-    });
-    DWREngine.setAsync(true);
-    if(!validatepass){
-        return validatepass;
-    }
-    inspector = Ext4.getCmp('inspector').getValue();
-    if(inspector == "null"){
-    	inspector = null;
-    }
-    operator = Ext4.getCmp('operator').getValue();
-    reviewer = Ext4.getCmp('reviewer').getValue();
-    wrapper = Ext4.getCmp('wrapper').getValue();
-    if(wrapper == "null"){
-    	wrapper = null;
-    }
-    sterileUserName = Ext4.getCmp('sterileUser').getValue();
-    inspectorCode = Ext4.getCmp('inspectorCode').getValue();
-    if(inspectorCode == "null"){
-    	inspectorCode = null;
-    }
-    operatorCode = Ext4.getCmp('operatorCode').getValue();
-    reviewerCode = Ext4.getCmp('reviewerCode').getValue();
-    wrapperCode = Ext4.getCmp('wrapperCode').getValue();
-    if(wrapperCode == "null"){
-    	wrapperCode = null;
-    }
-    sterileUserCode = Ext4.getCmp('sterileCode').getValue();
-    var sterilizer = Ext4.getCmp("sterilizer").getValue();
-    var frequency = Ext4.getCmp("frequency").getValue();;
-    
-    
-    //检查包装类型的有效期是否有定义
-    var isExpirationInfoDefined = false;
-    var sterileDate = Ext4.getCmp('sterileDate').getValue();
-    if(isUndefinedOrNullOrEmpty(sterileDate)){
-    	sterileDate = '';
-    }
-    DWREngine.setAsync(false);
-    ExpirationDateInfoTableManager.getExpirationDate(sterileDate,packageType,function(result){
-		var json = JSON.parse(result);
-    	isExpirationInfoDefined = json.isDefined;
-    });
-    DWREngine.setAsync(true);
-    // 如果不是消毒，有效期未定义则不允许装配
-    if (tousseType != "消毒物品"){
-    	if (!isExpirationInfoDefined){
-    		alert("包装类型【" + packageType + "】的有效期未定义，请检查系统参数设置！");
-    		return false;
-    	}
-    }
-	var remark = Ext4.getCmp('remark').getValue();
-	var errorDamageRemarkId = Ext4.getCmp('errorDamageRemarkId').getValue() || '';
-	var errorDamageRemarkInfo = Ext4.getCmp('errorDamageRemarkInfo').getValue() || '';
-    var params = {
-		taskIds: taskIds,
-		inspector: inspector,
-		inspectorCode: inspectorCode,
-		operator: operator,
-		operatorCode: operatorCode,
-		reviewer: reviewer,
-		reviewerCode: reviewerCode,
-		sterileUserName : sterileUserName,
-		sterileUserCode : sterileUserCode,
-		wrapper: wrapper,
-		wrapperCode: wrapperCode,
-		packageType: packageType,
-		sterilingType: sterilingType,
-		sterileDate: (sterileDate == '')?'': sterileDate.getTime(),
-		packAmount: packAmount,
-		taskGroup: taskGroup,
-		splitPackage: null,
-		basketBarcode: basketBarcode,
-		scannedBasketBarcodes:scannedBasketBarcodes,
-		idCardInstanceID: idCardInstanceID,
-		idCardDefinitionId: idCardInfo==null?'':idCardInfo.idCardDefinition.id,
-		sterilizer: sterilizer,
-		frequency: frequency,
-		confirmContinue: '',
-		urgentAmount: urgentAmount,
-		tousseWeight: tousseWeight,
-		remark: remark,
-		errorDamageRemarkInfo:errorDamageRemarkInfo,
-		taskIdToAmountMapInfo:taskIdToAmountMapInfo,
-		noUserFormSterilizationInfo:noUserFormSterilizationInfo,
-		websocketSessionId : getWebsocketSessionId(),
-		tousseName:tousseName,
-		tousseType:tousseType,
-		printImmediately:printImmediately,
-		tousseID:tousseID
-	}
-	if(errorDamageRemarkId !== '' && errorDamageRemarkId !== 0){
-		params.errorDamageRemarkId = errorDamageRemarkId;
-	}
-	
-	return params
-}
+	// 装配器械包
+	function packingTousse(printImmediately, basketBarcode, scannedBasketBarcodes, taskIds, tousseName, tousseType, packAmount, packageType, sterilingType, supplierName, department, urgentAmount, taskIdToAmountMapInfo, noUserFormSterilizationInfo, tousseID) {
+		if (!validateFormParamsForPack()) {
+			return false;
+		}
+		var tousseWeight = Ext4.getCmp('tousseWeight').getValue();
+		//是否消毒物品
+		var validatepass = true;
+		DWREngine.setAsync(false);
+		PackingTableManager.validatePackingTask(taskIds, new Date(), packageType, tousseName, supplierName, idCardInstanceID, function (response) {
+			var result = Ext4.decode(response);
+			var ableToPack = result.ableToPackAmount;
+			var errorMsg = result.errorMsg;
+			if (errorMsg != null && errorMsg != '') {
+				validatepass = false;
+				showWarningDialog(errorMsg);
+			}
+		});
+		DWREngine.setAsync(true);
+		if (!validatepass) {
+			return validatepass;
+		}
+		inspector = Ext4.getCmp('inspector').getValue();
+		if (inspector == "null") {
+			inspector = null;
+		}
+		operator = Ext4.getCmp('operator').getValue();
+		reviewer = Ext4.getCmp('reviewer').getValue();
+		wrapper = Ext4.getCmp('wrapper').getValue();
+		if (wrapper == "null") {
+			wrapper = null;
+		}
+		sterileUserName = Ext4.getCmp('sterileUser').getValue();
+		inspectorCode = Ext4.getCmp('inspectorCode').getValue();
+		if (inspectorCode == "null") {
+			inspectorCode = null;
+		}
+		operatorCode = Ext4.getCmp('operatorCode').getValue();
+		reviewerCode = Ext4.getCmp('reviewerCode').getValue();
+		wrapperCode = Ext4.getCmp('wrapperCode').getValue();
+		if (wrapperCode == "null") {
+			wrapperCode = null;
+		}
+		sterileUserCode = Ext4.getCmp('sterileCode').getValue();
+		var sterilizer = Ext4.getCmp("sterilizer").getValue();
+		var frequency = Ext4.getCmp("frequency").getValue();;
 
-//装配调接口
-function requestPackingTousse(params,index,isTrue){
-	var par = params[index];
-	Ext4.Ajax.request({
-		async: false,
-		dataType:"json",
-		url: WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
-		params : {packingParams : JSON.stringify(par)},
-		success: function(rs) {
-			var result = Ext4.decode(rs.responseText);
-			var showName = par.tousseName;
-			if(getPackingMaterialsForCheck.has(par.tousseID)){
-				getPackingMaterialsForCheck.remove(par.tousseID);
-				materialStore.reload();
+
+		//检查包装类型的有效期是否有定义
+		var isExpirationInfoDefined = false;
+		var sterileDate = Ext4.getCmp('sterileDate').getValue();
+		if (isUndefinedOrNullOrEmpty(sterileDate)) {
+			sterileDate = '';
+		}
+		DWREngine.setAsync(false);
+		ExpirationDateInfoTableManager.getExpirationDate(sterileDate, packageType, function (result) {
+			var json = JSON.parse(result);
+			isExpirationInfoDefined = json.isDefined;
+		});
+		DWREngine.setAsync(true);
+		// 如果不是消毒，有效期未定义则不允许装配
+		if (tousseType != "消毒物品") {
+			if (!isExpirationInfoDefined) {
+				alert("包装类型【" + packageType + "】的有效期未定义，请检查系统参数设置！");
+				return false;
 			}
-    		if (result.success){
-				var taskIdToAmountMapInfo = par.taskIdToAmountMapInfo;
-				var obj = JSON.parse(taskIdToAmountMapInfo);
-				var packAmount = 0;
-				for(var k=0;k<obj.length;k++){
-					packAmount += parseInt(obj[k].amount);
+		}
+		var remark = Ext4.getCmp('remark').getValue();
+		var errorDamageRemarkId = Ext4.getCmp('errorDamageRemarkId').getValue() || '';
+		var errorDamageRemarkInfo = Ext4.getCmp('errorDamageRemarkInfo').getValue() || '';
+		var params = {
+			taskIds: taskIds,
+			inspector: inspector,
+			inspectorCode: inspectorCode,
+			operator: operator,
+			operatorCode: operatorCode,
+			reviewer: reviewer,
+			reviewerCode: reviewerCode,
+			sterileUserName: sterileUserName,
+			sterileUserCode: sterileUserCode,
+			wrapper: wrapper,
+			wrapperCode: wrapperCode,
+			packageType: packageType,
+			sterilingType: sterilingType,
+			sterileDate: (sterileDate == '') ? '' : sterileDate.getTime(),
+			packAmount: packAmount,
+			taskGroup: taskGroup,
+			splitPackage: null,
+			basketBarcode: basketBarcode,
+			scannedBasketBarcodes: scannedBasketBarcodes,
+			idCardInstanceID: idCardInstanceID,
+			idCardDefinitionId: idCardInfo == null ? '' : idCardInfo.idCardDefinition.id,
+			sterilizer: sterilizer,
+			frequency: frequency,
+			confirmContinue: '',
+			urgentAmount: urgentAmount,
+			tousseWeight: tousseWeight,
+			remark: remark,
+			errorDamageRemarkInfo: errorDamageRemarkInfo,
+			taskIdToAmountMapInfo: taskIdToAmountMapInfo,
+			noUserFormSterilizationInfo: noUserFormSterilizationInfo,
+			websocketSessionId: getWebsocketSessionId(),
+			tousseName: tousseName,
+			tousseType: tousseType,
+			printImmediately: printImmediately,
+			tousseID: tousseID
+		}
+		if (errorDamageRemarkId !== '' && errorDamageRemarkId !== 0) {
+			params.errorDamageRemarkId = errorDamageRemarkId;
+		}
+
+		return params
+	}
+
+	//装配调接口
+	function requestPackingTousse(params, index, isTrue) {
+		var par = params[index];
+		Ext4.Ajax.request({
+			async: false,
+			dataType: "json",
+			url: WWWROOT + "/disinfectSystem/packingController/packingTousse.mhtml",
+			params: { packingParams: JSON.stringify(par) },
+			success: function (rs) {
+				var result = Ext4.decode(rs.responseText);
+				var showName = par.tousseName;
+				if (getPackingMaterialsForCheck.has(par.tousseID)) {
+					getPackingMaterialsForCheck.remove(par.tousseID);
+					materialStore.reload();
 				}
-				var newPackAmount = (parseInt(par.packAmount)>parseInt(packAmount))?parseInt(packAmount):parseInt(par.packAmount);
-    			processAfterPacking(par.printImmediately,result, showName, newPackAmount);
-    			//保存装配视频监控
-    			if(sstsConfig.enableVideoMonitorModule && setVideoWhenAddPackingRecord){
-    				if(result.packingRecordIds && result.packingRecordIds.length > 0){
-    					var packingRecordIdArray = [];
-    					for (var i = 0; i < result.packingRecordIds.length; i++) {
-    						packingRecordIdArray.push(result.packingRecordIds[i]);
+				if (result.success) {
+					var taskIdToAmountMapInfo = par.taskIdToAmountMapInfo;
+					var obj = JSON.parse(taskIdToAmountMapInfo);
+					var packAmount = 0;
+					for (var k = 0; k < obj.length; k++) {
+						packAmount += parseInt(obj[k].amount);
+					}
+					var newPackAmount = (parseInt(par.packAmount) > parseInt(packAmount)) ? parseInt(packAmount) : parseInt(par.packAmount);
+					processAfterPacking(par.printImmediately, result, showName, newPackAmount);
+					//保存装配视频监控
+					if (sstsConfig.enableVideoMonitorModule && setVideoWhenAddPackingRecord) {
+						if (result.packingRecordIds && result.packingRecordIds.length > 0) {
+							var packingRecordIdArray = [];
+							for (var i = 0; i < result.packingRecordIds.length; i++) {
+								packingRecordIdArray.push(result.packingRecordIds[i]);
+							}
+							setVideoWhenAddPackingRecord(packingRecordIdArray);
 						}
-    					setVideoWhenAddPackingRecord(packingRecordIdArray);
-    				}
-				}
-    		}else{
-    			//如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示)
-    			if(result.type && (result.type == 'virtualBasketNotEnough')){
-	    			// TODO: 需确认是否要判断物品是否为器械包
-	    			Ext4.MessageBox.confirm("请确认", result.message,function(btn) {
-						if (btn == 'yes') {
-							//输入一个true的参数
-							par.confirmContinue = 'true';
-							params[index].confirmContinue = 'true';
-							Ext4.Ajax.request({
-								//async: !isFirstOnLoad,
-								async: false,
-								dataType:"json",
-								url: WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
-								params : {packingParams : JSON.stringify(par)},
-								success: function(rs1) {
-									var result = Ext4.decode(rs1.responseText);
-									if(getPackingMaterialsForCheck.has(par.tousseID)){
-										getPackingMaterialsForCheck.remove(par.tousseID);
-									}
-									if(result.success){
-										var taskIdToAmountMapInfo = par.taskIdToAmountMapInfo;
-										var obj = JSON.parse(taskIdToAmountMapInfo);
-										var packAmount = 0;
-										for(var k=0;k<obj.length;k++){
-											packAmount += parseInt(obj[k].amount);
+					}
+				} else {
+					//如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示)
+					if (result.type && (result.type == 'virtualBasketNotEnough')) {
+						// TODO: 需确认是否要判断物品是否为器械包
+						Ext4.MessageBox.confirm("请确认", result.message, function (btn) {
+							if (btn == 'yes') {
+								//输入一个true的参数
+								par.confirmContinue = 'true';
+								params[index].confirmContinue = 'true';
+								Ext4.Ajax.request({
+									//async: !isFirstOnLoad,
+									async: false,
+									dataType: "json",
+									url: WWWROOT + "/disinfectSystem/packingController/packingTousse.mhtml",
+									params: { packingParams: JSON.stringify(par) },
+									success: function (rs1) {
+										var result = Ext4.decode(rs1.responseText);
+										if (getPackingMaterialsForCheck.has(par.tousseID)) {
+											getPackingMaterialsForCheck.remove(par.tousseID);
 										}
-										var newPackAmount = (parseInt(par.packAmount)>parseInt(packAmount))?parseInt(packAmount):parseInt(par.packAmount);
-										processAfterConfirmPacking(par.printImmediately,result, showName, newPackAmount);
-										printLabelsAfterConfirmPacking(result.tousses);
-									}
-									//保存装配视频监控
-									if(sstsConfig.enableVideoMonitorModule && setVideoWhenAddPackingRecord){
-										if(result.packingRecordIds && result.packingRecordIds.length > 0){
-											var packingRecordIdArray = [];
-											for (var i = 0; i < result.packingRecordIds.length; i++) {
-												packingRecordIdArray.push(result.packingRecordIds[i]);
+										if (result.success) {
+											var taskIdToAmountMapInfo = par.taskIdToAmountMapInfo;
+											var obj = JSON.parse(taskIdToAmountMapInfo);
+											var packAmount = 0;
+											for (var k = 0; k < obj.length; k++) {
+												packAmount += parseInt(obj[k].amount);
 											}
-											setVideoWhenAddPackingRecord(packingRecordIdArray);
+											var newPackAmount = (parseInt(par.packAmount) > parseInt(packAmount)) ? parseInt(packAmount) : parseInt(par.packAmount);
+											processAfterConfirmPacking(par.printImmediately, result, showName, newPackAmount);
+											printLabelsAfterConfirmPacking(result.tousses);
 										}
+										//保存装配视频监控
+										if (sstsConfig.enableVideoMonitorModule && setVideoWhenAddPackingRecord) {
+											if (result.packingRecordIds && result.packingRecordIds.length > 0) {
+												var packingRecordIdArray = [];
+												for (var i = 0; i < result.packingRecordIds.length; i++) {
+													packingRecordIdArray.push(result.packingRecordIds[i]);
+												}
+												setVideoWhenAddPackingRecord(packingRecordIdArray);
+											}
+										}
+									},
+									error: function (req, textStatus) {
+										showResult('装配失败!', null, sstsConfig.messagePauseTimeOnPackingPage);
+										uncheck();
+										return;
 									}
-								},
-								error : function(req, textStatus) {
-									showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-									uncheck();
-									return;
-								}
-							});
+								});
+							}
+						});
+					} else {
+						var message = result.message;
+						if (!message) {
+							message = '装配失败!';
 						}
-					});
-    			}else{
-    				var message = result.message;
-    				if(!message){
-    					message = '装配失败!';
-    				}
-    				showResult(message , null , sstsConfig.messagePauseTimeOnPackingPage);
-					uncheck();
-					return;
-    			}
+						showResult(message, null, sstsConfig.messagePauseTimeOnPackingPage);
+						uncheck();
+						return;
+					}
+				}
+				if (isTrue !== undefined) {
+					isConfirmRequestPackingTousse(params, parseInt(index + 1), isTrue);
+				}
+			},
+			error: function (req, textStatus) {
+				showResult('装配失败!', null, sstsConfig.messagePauseTimeOnPackingPage);
 			}
-			if(isTrue !== undefined){
-				isConfirmRequestPackingTousse(params,parseInt(index+1),isTrue);
-			}
-		},
-	    error : function(req, textStatus) {
-	    	showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-	    }
-	});
-}
+		});
+	}
 
-//取消勾选
-function uncheck(){
-	var basketTree = Ext4.getCmp('basketTreeGrid');
-	var selNodes = basketTree.getView().getChecked();
-	Ext4.each(selNodes, function(pNode){
-		pNode.set('checked',false);
-		Ext4.each(pNode.childNodes, function(node){
-			node.set('checked',false);
-		})
-	});
-}
+	//取消勾选
+	function uncheck() {
+		var basketTree = Ext4.getCmp('basketTreeGrid');
+		var selNodes = basketTree.getView().getChecked();
+		Ext4.each(selNodes, function (pNode) {
+			pNode.set('checked', false);
+			Ext4.each(pNode.childNodes, function (node) {
+				node.set('checked', false);
+			})
+		});
+	}
 
-//BJ307YY-87：外来器械回收分多篮筐入筐后，装配时允许合并装配成一个包
-/**
- * 
- * @param {参数} params 
- * @param {数组序号} index 
- * @param {是否回收} isTrue 
- */
-function isConfirmRequestPackingTousse(params,index,isTrue){
-	var len = params.length;
-	if(index == len){
-		if(isTrue){
-			printLabelsAfterPacking(params);
-			//刷新篮筐内物品
-			reloadBasketTreeGrid(false);
-			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-			//刷新待装配列表
-			waitPackingTreeGrid.getStore().reload();
-			showScanIDCardBarcode();
-		}else {
-			// 一次打印
-			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-			printLabelsAfterPacking(params);
-			waitPackingTreeGrid.getStore().reload();
-			showScanIDCardBarcode();
-		}
-		onPackingTousseBtnClickComplete();
-	}else {
-		var tousseName = params[index].tousseName;
-		var splitCount = params[index].basketBarcode.split(";").length;
-		params[index].splitPackingForeignTousse = '';
-		if(sstsConfig.askWhetherMergeAllPartsOfForeignTousseSplitInRecyclingToOneWhenPacking && params[index].tousseType == '外来器械包' && params[index].basketBarcode.split(';').length > 1){
+	//BJ307YY-87：外来器械回收分多篮筐入筐后，装配时允许合并装配成一个包
+	/**
+	 * 
+	 * @param {参数} params 
+	 * @param {数组序号} index 
+	 * @param {是否回收} isTrue 
+	 */
+	function isConfirmRequestPackingTousse(params, index, isTrue) {
+		var len = params.length;
+		if (index == len) {
+			if (isTrue) {
+				printLabelsAfterPacking(params);
+				//刷新篮筐内物品
+				reloadBasketTreeGrid(false);
+				var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+				//刷新待装配列表
+				waitPackingTreeGrid.getStore().reload();
+				showScanIDCardBarcode();
+			} else {
+				// 一次打印
+				var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+				printLabelsAfterPacking(params);
+				waitPackingTreeGrid.getStore().reload();
+				showScanIDCardBarcode();
+			}
 			onPackingTousseBtnClickComplete();
-			Ext4.MessageBox.confirm("请确认", tousseName+'回收时已经拆分成'+splitCount+'部分，放入了不同的清洗篮筐，是否装配成1个包？',function(btn) {
-				if (btn == 'yes') {
-					params[index].splitPackingForeignTousse = false;
-					showPackingTousseBtnClick_mask();
-					requestPackingTousse(params,index,isTrue);
-				}else {
-					showPackingTousseBtnClick_mask();
-					requestPackingTousse(params,index,isTrue);
-				}
-			});
-		}else {
-			requestPackingTousse(params,index,isTrue);
+		} else {
+			var tousseName = params[index].tousseName;
+			var splitCount = params[index].basketBarcode.split(";").length;
+			params[index].splitPackingForeignTousse = '';
+			if (sstsConfig.askWhetherMergeAllPartsOfForeignTousseSplitInRecyclingToOneWhenPacking && params[index].tousseType == '外来器械包' && params[index].basketBarcode.split(';').length > 1) {
+				onPackingTousseBtnClickComplete();
+				Ext4.MessageBox.confirm("请确认", tousseName + '回收时已经拆分成' + splitCount + '部分，放入了不同的清洗篮筐，是否装配成1个包？', function (btn) {
+					if (btn == 'yes') {
+						params[index].splitPackingForeignTousse = false;
+						showPackingTousseBtnClick_mask();
+						requestPackingTousse(params, index, isTrue);
+					} else {
+						showPackingTousseBtnClick_mask();
+						requestPackingTousse(params, index, isTrue);
+					}
+				});
+			} else {
+				requestPackingTousse(params, index, isTrue);
+			}
 		}
 	}
-}
 
-function processAfterPacking(printImmediately,result, showName, packAmount){
-	var tousses = result.tousses;
-	packingToussesArray = packingToussesArray.concat(tousses);
-	packedToussesArray = packedToussesArray.concat(tousses);
-	
-	// 取装配物品的是否审核和是否打印的属性(第一个元素的即可)
-	var isReview = tousses[0].isReview;
-	var isPrint = tousses[0].isPrint;
-	// 默认装配时打印标签
-	var isPrintLabelNow = true;
-	
-	// 如果系统设定为在审核时打印标签，并且该器械包需要审核，则现在不打印标签
-	if (sstsConfig.printLabelWhenReviewing == true && isReview == true){
-		isPrintLabelNow = false;
-	}
-	
-//	for(var i=0;i<tousses.length;++i){
-//		if(tousses[i].isPrint){
-//			continue;
-//		}
-//		if(sstsConfig.printLabelWhenReviewing && tousses[i].isReview){
-//			continue;
-//		}
-//		tousseesToPrint.push(tousses[i]);
-//	}
-	// 现在不打印标签
-	if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){
-		showResult(packAmount + "个" + showName + "装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	}
-	// 现在打印标签
-	else{
-		// 该物品的器械包定义是否需要打印标签
-		if (isPrint){
-			tousseesToPrint = tousseesToPrint.concat(tousses);
+	function processAfterPacking(printImmediately, result, showName, packAmount) {
+		var tousses = result.tousses;
+		packingToussesArray = packingToussesArray.concat(tousses);
+		packedToussesArray = packedToussesArray.concat(tousses);
+
+		// 取装配物品的是否审核和是否打印的属性(第一个元素的即可)
+		var isReview = tousses[0].isReview;
+		var isPrint = tousses[0].isPrint;
+		// 默认装配时打印标签
+		var isPrintLabelNow = true;
+
+		// 如果系统设定为在审核时打印标签，并且该器械包需要审核，则现在不打印标签
+		if (sstsConfig.printLabelWhenReviewing == true && isReview == true) {
+			isPrintLabelNow = false;
 		}
-		else{
-			showResult(packAmount + "个" + showName + "装配完成，该物品设置为不打印条码标签！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+
+		//	for(var i=0;i<tousses.length;++i){
+		//		if(tousses[i].isPrint){
+		//			continue;
+		//		}
+		//		if(sstsConfig.printLabelWhenReviewing && tousses[i].isReview){
+		//			continue;
+		//		}
+		//		tousseesToPrint.push(tousses[i]);
+		//	}
+		// 现在不打印标签
+		if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true) {
+			showResult(packAmount + "个" + showName + "装配完成", null, sstsConfig.messagePauseTimeOnPackingPage);
 		}
-		
+		// 现在打印标签
+		else {
+			// 该物品的器械包定义是否需要打印标签
+			if (isPrint) {
+				tousseesToPrint = tousseesToPrint.concat(tousses);
+			}
+			else {
+				showResult(packAmount + "个" + showName + "装配完成，该物品设置为不打印条码标签！", null, sstsConfig.messagePauseTimeOnPackingPage);
+			}
+
+		}
+		Ext4.getCmp("idCardBarcode").setValue('');
 	}
-	Ext4.getCmp("idCardBarcode").setValue('');
-}
-function processAfterConfirmPacking(printImmediately,result, showName, packAmount){
-	
-	var tousses = result.tousses;
-	packingToussesArray = packingToussesArray.concat(tousses);
-	packedToussesArray = packedToussesArray.concat(tousses);
-	
-	// 取装配物品的是否审核和是否打印的属性(第一个元素的即可)
-	var isReview = tousses[0].isReview;
-	var isPrint = tousses[0].isPrint;
-	// 默认装配时打印标签
-	var isPrintLabelNow = true;
-	
-	// 如果系统设定为在审核时打印标签，并且该器械包需要审核，则现在不打印标签
-	if (sstsConfig.printLabelWhenReviewing == true && isReview == true){
-		isPrintLabelNow = false;
-	}
-	
-	// 现在不打印标签
-	//if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){
-	if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){
-		showResult(packAmount + "个" + showName + "装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	}
-	// 现在打印标签
-	else{
-		// 该物品的器械包定义是否需要打印标签
-		if (isPrint){
+	function processAfterConfirmPacking(printImmediately, result, showName, packAmount) {
+
+		var tousses = result.tousses;
+		packingToussesArray = packingToussesArray.concat(tousses);
+		packedToussesArray = packedToussesArray.concat(tousses);
+
+		// 取装配物品的是否审核和是否打印的属性(第一个元素的即可)
+		var isReview = tousses[0].isReview;
+		var isPrint = tousses[0].isPrint;
+		// 默认装配时打印标签
+		var isPrintLabelNow = true;
+
+		// 如果系统设定为在审核时打印标签，并且该器械包需要审核，则现在不打印标签
+		if (sstsConfig.printLabelWhenReviewing == true && isReview == true) {
+			isPrintLabelNow = false;
 		}
-		else{
-			showResult(packAmount + "个" + showName + "装配完成，该物品设置为不打印条码标签！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+
+		// 现在不打印标签
+		//if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){
+		if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true) {
+			showResult(packAmount + "个" + showName + "装配完成", null, sstsConfig.messagePauseTimeOnPackingPage);
 		}
-		
+		// 现在打印标签
+		else {
+			// 该物品的器械包定义是否需要打印标签
+			if (isPrint) {
+			}
+			else {
+				showResult(packAmount + "个" + showName + "装配完成，该物品设置为不打印条码标签！", null, sstsConfig.messagePauseTimeOnPackingPage);
+			}
+
+		}
 	}
-}
-function printLabelsAfterPacking(params){
-	if(!packing){
-		return;
-	}
-	var packAmount = packedToussesArray.length;
-//	showResult(packAmount + "个" + showName + "装配完成");
-	var printGroupType = Ext4.getCmp('printGroupType').getValue();
-	var cfg = createPrintLabelsConfig(printGroupType);
-	if(tousseesToPrint.length > 0){
-		DWREngine.setAsync(false);
-		doPrintLabels(tousseesToPrint,cfg);
-		
-		if(sstsConfig.enableConfirmNoticeAfterPackingPrint){
-			//打印完成给出确认提示筐,物品是否有缺陷,正常则不管,缺陷则弹出质量监测窗口:CDSLQYQYYY-51
-			Ext.Msg.show({
-				title : '请确认',
-				msg : '物品是否有缺陷？',
-				buttons: {"yes":"正常","no":"缺陷"},
-				width: 200,
-				height: 100,
-				fn : function(btn){
-					if(btn == 'no'){
-						var washRecordIds = getWashRecordIds();
-						if(washRecordIds.length > 1){
-							addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0]);
-							showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
-						}else if(washRecordIds.length == 1){
-							addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0]);
-						}else {
-							addQualityMonitoringByResponPart(responsibilityPart);
+	function printLabelsAfterPacking(params) {
+		if (!packing) {
+			return;
+		}
+		var packAmount = packedToussesArray.length;
+		//	showResult(packAmount + "个" + showName + "装配完成");
+		var printGroupType = Ext4.getCmp('printGroupType').getValue();
+		var cfg = createPrintLabelsConfig(printGroupType);
+		if (tousseesToPrint.length > 0) {
+			DWREngine.setAsync(false);
+			doPrintLabels(tousseesToPrint, cfg);
+
+			if (sstsConfig.enableConfirmNoticeAfterPackingPrint) {
+				//打印完成给出确认提示筐,物品是否有缺陷,正常则不管,缺陷则弹出质量监测窗口:CDSLQYQYYY-51
+				Ext.Msg.show({
+					title: '请确认',
+					msg: '物品是否有缺陷？',
+					buttons: { "yes": "正常", "no": "缺陷" },
+					width: 200,
+					height: 100,
+					fn: function (btn) {
+						if (btn == 'no') {
+							var washRecordIds = getWashRecordIds();
+							if (washRecordIds.length > 1) {
+								addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0]);
+								showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
+							} else if (washRecordIds.length == 1) {
+								addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0]);
+							} else {
+								addQualityMonitoringByResponPart(responsibilityPart);
+							}
 						}
 					}
+				});
+			}
+			DWREngine.setAsync(true);
+			//SZSDSRMYY-68:打印材料清单
+			if (sstsConfig.printBOMwhenPrintLabel) {
+				var ids = [];
+				for (var i = 0; i < tousseesToPrint.length; i++) {
+					ids[i] = tousseesToPrint[i].tousseDefinitionId;
 				}
-			});
-		}
-		DWREngine.setAsync(true);
-		//SZSDSRMYY-68:打印材料清单
-		if(sstsConfig.printBOMwhenPrintLabel){
-			var ids = [];
-			for(var i=0;i<tousseesToPrint.length;i++){
-				ids[i] = tousseesToPrint[i].tousseDefinitionId;
+				if (ids.length > 0) {
+					printTousseDefinitionMaterial(ids.join(';'), true, params, 0, 'packingView');
+				}
 			}
-			if(ids.length > 0){
-				printTousseDefinitionMaterial(ids.join(';'),true,params,0,'packingView');
-			}
 		}
 	}
-}
-function printLabelsAfterConfirmPacking(curTousseesToPrint){
-	if(!packing){
-		return;
+	function printLabelsAfterConfirmPacking(curTousseesToPrint) {
+		if (!packing) {
+			return;
+		}
+
+		var printGroupType = Ext4.getCmp('printGroupType').getValue();
+		var cfg = createPrintLabelsConfig(printGroupType);
+
+		if (curTousseesToPrint.length > 0) {
+			//		if(!Ext4.isIE){
+			//			showResult("目前只支持IE浏览器进行打印!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+			//			return;
+			//		}
+			doPrintLabels(curTousseesToPrint, cfg);
+		}
 	}
-	
-	var printGroupType = Ext4.getCmp('printGroupType').getValue();
-	var cfg = createPrintLabelsConfig(printGroupType);
-	
-	if(curTousseesToPrint.length > 0){
-//		if(!Ext4.isIE){
-//			showResult("目前只支持IE浏览器进行打印!" , null , sstsConfig.messagePauseTimeOnPackingPage);
-//			return;
-//		}
-		doPrintLabels(curTousseesToPrint,cfg);
+	// 添加要删除的项
+	function setTousseItemsToDelete(tousseItemsToDelete, tousseName) {
+		var tousseItem = {};
+		tousseItem.tousseName = tousseName;
+		tousseItem.amount = 0;
+		tousseItem.packed = false;
+		tousseItem.taskItems = new Array();
+		tousseItemsToDelete.push(tousseItem);
+		return tousseItem;
 	}
-}
-// 添加要删除的项
-function setTousseItemsToDelete(tousseItemsToDelete,tousseName){
-	var tousseItem = {};
-    tousseItem.tousseName = tousseName;
-    tousseItem.amount = 0;
-    tousseItem.packed = false;
-    tousseItem.taskItems = new Array();
-    tousseItemsToDelete.push(tousseItem);
-    return tousseItem;
-}
-// 添加要删除的任务
-function addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,amount){
-	var tousseItem = null;
-	for(var i=0;i<tousseItemsToDelete.length;++i){
-		if(tousseName == tousseItemsToDelete[i].tousseName){
-			tousseItem = tousseItemsToDelete[i];
-			break;
+	// 添加要删除的任务
+	function addTaskItemsToDelete(tousseItemsToDelete, tousseName, taskId, amount) {
+		var tousseItem = null;
+		for (var i = 0; i < tousseItemsToDelete.length; ++i) {
+			if (tousseName == tousseItemsToDelete[i].tousseName) {
+				tousseItem = tousseItemsToDelete[i];
+				break;
+			}
 		}
+		if (tousseItem == null) {
+			tousseItem = setTousseItemsToDelete(tousseItemsToDelete, tousseName);
+		}
+		tousseItem.amount += amount;
+		tousseItem.packed = true;
+		var task = { taskId: taskId, amount: amount };
+		tousseItem.taskItems.push(task);
 	}
-	if(tousseItem == null){
-		tousseItem = setTousseItemsToDelete(tousseItemsToDelete,tousseName);
-	}
-	tousseItem.amount += amount;
-	tousseItem.packed = true;
-	var task = {taskId:taskId,amount:amount};
-	tousseItem.taskItems.push(task);
-}
-// 将除了标识牌的误差全部删除
-function deleteAllErrorsExcludeIDCard(errors){
-	if(isUndefinedOrNullOrEmpty(errors)){
-		return [];
-	}
-	var retErrors = [];
-	for(var i=0;i<errors.length;++i){
-		if(errors[i].materialName == MATERIAL_NAME_IDCARD){
-			retErrors.push(errors[i]);
+	// 将除了标识牌的误差全部删除
+	function deleteAllErrorsExcludeIDCard(errors) {
+		if (isUndefinedOrNullOrEmpty(errors)) {
+			return [];
 		}
+		var retErrors = [];
+		for (var i = 0; i < errors.length; ++i) {
+			if (errors[i].materialName == MATERIAL_NAME_IDCARD) {
+				retErrors.push(errors[i]);
+			}
+		}
+		return retErrors;
 	}
-	return retErrors;
-}
 
-/**
- * 选择的装配任务优先装配
- */
-function selectTaskFirstPacking(node){
-	var parentNode = node.parentNode;
-	var cloneNode = node.copy();
-	//插入到第一行
-	parentNode.insertChild(0,cloneNode);
-	//删除当前选择行
-	parentNode.removeChild(node);
-}
+	/**
+	 * 选择的装配任务优先装配
+	 */
+	function selectTaskFirstPacking(node) {
+		var parentNode = node.parentNode;
+		var cloneNode = node.copy();
+		//插入到第一行
+		parentNode.insertChild(0, cloneNode);
+		//删除当前选择行
+		parentNode.removeChild(node);
+	}
 
-/**
- * 鼠标右键菜单
- */
-function taskItemMenu(menutree, record, items, index, e) {  
-    e.preventDefault();  
-    e.stopEvent();
-    var leaf = record.get("leaf");
-    if(leaf){
-  	var menuArray = [];
-    	menuArray.push({  
-            text : "优先装配该任务",
-            iconCls :'btn_ext_add',
-            handler : function() {
-          	  /*if(record.isFirst()){
-          		  return;
-          	  }*/
-          	  selectTaskFirstPacking(record);
-            } 
-        },{  
-            text : "优先装配该科室任务",
-            iconCls :'btn_ext_add',
-            handler : function() {
-          	  var departmentName = record.get("department");
-          	  if(departmentName == ""){
-          		  return;
-          	  }
-          	  var parentNode = record.parentNode;
-          	  var departmentTaskArray = [];
-          	  parentNode.eachChild(function(node){
-          		  if(node.get("department") == departmentName){
-          			  departmentTaskArray.push(node);
-          		  }
-          	  });
-          	  var length = departmentTaskArray.length;
-          	  if(length > 0){
-          		  for(var i = 0 ; i < length ; i++){
-          			  var tmpNode = departmentTaskArray[i];
-          			  selectTaskFirstPacking(tmpNode);
-          		  }
-          	  }
-            } 
-        });
-    	 var nodemenu = new Ext4.menu.Menu({  
-           items : menuArray
-       });
-       nodemenu.showAt(e.getXY()); 
-    }
-}
-
-//刷新待装配任务的数据
-function reloadBasketTreeGrid(isReload){
-	if(isReload == true){
-		var basketBarcodeArr = getBasketBarcode();
-		if(basketBarcodeArr.length > 0){
-			Ext4.getCmp('basketTreeGrid').getStore().reload();
-			for(var z=0;z<basketBarcodeArr.length;z++){
-				scanBasketBarcodes(basketBarcodeArr[z],2);
-			}
-		}else {
-			Ext4.getCmp('basketTreeGrid').getStore().reload();
+	/**
+	 * 鼠标右键菜单
+	 */
+	function taskItemMenu(menutree, record, items, index, e) {
+		e.preventDefault();
+		e.stopEvent();
+		var leaf = record.get("leaf");
+		if (leaf) {
+			var menuArray = [];
+			menuArray.push({
+				text: "优先装配该任务",
+				iconCls: 'btn_ext_add',
+				handler: function () {
+					/*if(record.isFirst()){
+						return;
+					}*/
+					selectTaskFirstPacking(record);
+				}
+			}, {
+				text: "优先装配该科室任务",
+				iconCls: 'btn_ext_add',
+				handler: function () {
+					var departmentName = record.get("department");
+					if (departmentName == "") {
+						return;
+					}
+					var parentNode = record.parentNode;
+					var departmentTaskArray = [];
+					parentNode.eachChild(function (node) {
+						if (node.get("department") == departmentName) {
+							departmentTaskArray.push(node);
+						}
+					});
+					var length = departmentTaskArray.length;
+					if (length > 0) {
+						for (var i = 0; i < length; i++) {
+							var tmpNode = departmentTaskArray[i];
+							selectTaskFirstPacking(tmpNode);
+						}
+					}
+				}
+			});
+			var nodemenu = new Ext4.menu.Menu({
+				items: menuArray
+			});
+			nodemenu.showAt(e.getXY());
 		}
-	}else {
-		var basketTree = Ext4.getCmp('basketTreeGrid');
-		var selNodes = basketTree.getView().getChecked();
-		var map = {},dest = [];
-		Ext4.each(selNodes, function(pNode){
-			if(pNode.childNodes.length == 0){
-				var ai = pNode;
-				if(!map[ai.get('tousseName')]){
-					dest.push(ai.parentNode);
-					map[ai.get('tousseName')] = ai;
+	}
+
+	//刷新待装配任务的数据
+	function reloadBasketTreeGrid(isReload) {
+		if (isReload == true) {
+			var basketBarcodeArr = getBasketBarcode();
+			if (basketBarcodeArr.length > 0) {
+				Ext4.getCmp('basketTreeGrid').getStore().reload();
+				for (var z = 0; z < basketBarcodeArr.length; z++) {
+					scanBasketBarcodes(basketBarcodeArr[z], 2);
 				}
+			} else {
+				Ext4.getCmp('basketTreeGrid').getStore().reload();
 			}
-		});
-		if(dest.length > 0){
-			Ext4.each(dest, function(pNode){
-				var parentAmout = pNode.get('amount');
-				var parentChecked = pNode.get('checked');
-				var parentMaxAmount = pNode.get('maxAmount');
-				var amountSum = 0;
-				for(var i=0;i<pNode.childNodes.length;i++){
-					var amount = pNode.childNodes[i].get('amount');
-					var maxAmount = pNode.childNodes[i].get('maxAmount');
-					var checked = pNode.childNodes[i].get('checked');
-					if(checked){
-						amountSum += parseInt(amount);
+		} else {
+			var basketTree = Ext4.getCmp('basketTreeGrid');
+			var selNodes = basketTree.getView().getChecked();
+			var map = {}, dest = [];
+			Ext4.each(selNodes, function (pNode) {
+				if (pNode.childNodes.length == 0) {
+					var ai = pNode;
+					if (!map[ai.get('tousseName')]) {
+						dest.push(ai.parentNode);
+						map[ai.get('tousseName')] = ai;
 					}
 				}
-				//父器械包选中的情况下，子记录必然是选中的
-				if(parentChecked == true){
-					//场景1：父器械包的数量小于子记录的总数量，以父包数量为准，从上到下扣减
-					if(parentAmout < amountSum){
-						var removeArr = [];
-						pNode.set('checked',false);
-						var isReturn = false;
-						for(var i=0;i<pNode.childNodes.length;i++){
-							var maxAmount = pNode.childNodes[i].get('maxAmount');
-							var parentAmout = pNode.get('amount');
-							if(maxAmount > parentAmout){
-								var newAmount = maxAmount - parentAmout;
-								parentMaxAmount = parentMaxAmount - parentAmout;
-								pNode.childNodes[i].set('amount',newAmount);
-								pNode.childNodes[i].set('maxAmount',newAmount);
+			});
+			if (dest.length > 0) {
+				Ext4.each(dest, function (pNode) {
+					var parentAmout = pNode.get('amount');
+					var parentChecked = pNode.get('checked');
+					var parentMaxAmount = pNode.get('maxAmount');
+					var amountSum = 0;
+					for (var i = 0; i < pNode.childNodes.length; i++) {
+						var amount = pNode.childNodes[i].get('amount');
+						var maxAmount = pNode.childNodes[i].get('maxAmount');
+						var checked = pNode.childNodes[i].get('checked');
+						if (checked) {
+							amountSum += parseInt(amount);
+						}
+					}
+					//父器械包选中的情况下，子记录必然是选中的
+					if (parentChecked == true) {
+						//场景1：父器械包的数量小于子记录的总数量，以父包数量为准，从上到下扣减
+						if (parentAmout < amountSum) {
+							var removeArr = [];
+							pNode.set('checked', false);
+							var isReturn = false;
+							for (var i = 0; i < pNode.childNodes.length; i++) {
+								var maxAmount = pNode.childNodes[i].get('maxAmount');
+								var parentAmout = pNode.get('amount');
+								if (maxAmount > parentAmout) {
+									var newAmount = maxAmount - parentAmout;
+									parentMaxAmount = parentMaxAmount - parentAmout;
+									pNode.childNodes[i].set('amount', newAmount);
+									pNode.childNodes[i].set('maxAmount', newAmount);
+									pNode.childNodes[i].set("checked", false);
+									for (var j = 0; j < removeArr.length; j++) {
+										var node = removeArr[j];
+										var amount = node.get('amount');
+										parentMaxAmount = parentMaxAmount - amount;
+										node.remove();
+									}
+									pNode.set('amount', parentMaxAmount);
+									pNode.set('maxAmount', parentMaxAmount);
+									isReturn = true;
+									continue;
+								} else {
+									if (!isReturn) {
+										removeArr.push(pNode.childNodes[i])
+										pNode.set('amount', parentAmout - maxAmount);
+										pNode.set('maxAmount', parentMaxAmount - parentAmout);
+									} else {
+										pNode.childNodes[i].set("checked", false);
+										pNode.childNodes[i].set('amount', maxAmount);
+										pNode.childNodes[i].set('maxAmount', maxAmount);
+									}
+								}
+							}
+						} else {
+							//场景2：父器械包的数量大于等于子记录的总数量，以子记录的数量为准，根据每条记录修改的数量扣减
+							var removeArr = [];
+							for (var i = 0; i < pNode.childNodes.length; i++) {
+								var maxAmount = pNode.childNodes[i].get('maxAmount');
+								var amount = pNode.childNodes[i].get('amount');
+								var newAmount = maxAmount - amount;
+								parentMaxAmount = parentMaxAmount - amount;
+								pNode.childNodes[i].set('amount', newAmount);
+								pNode.childNodes[i].set('maxAmount', newAmount);
 								pNode.childNodes[i].set("checked", false);
-								for(var j=0;j<removeArr.length;j++){
+								if (newAmount == 0) {
+									removeArr.push(pNode.childNodes[i])
+								}
+							}
+							if (parentMaxAmount == 0) {
+								pNode.remove();
+							} else {
+								pNode.set('amount', parentMaxAmount);
+								pNode.set('maxAmount', parentMaxAmount);
+								pNode.set('checked', false);
+								for (var j = 0; j < removeArr.length; j++) {
 									var node = removeArr[j];
-									var amount = node.get('amount');
-									parentMaxAmount = parentMaxAmount - amount;
 									node.remove();
 								}
-								pNode.set('amount',parentMaxAmount);
-								pNode.set('maxAmount',parentMaxAmount);
-								isReturn = true;
-								continue;
-							}else {
-								if(!isReturn){
-									removeArr.push(pNode.childNodes[i])
-									pNode.set('amount',parentAmout-maxAmount);
-									pNode.set('maxAmount',parentMaxAmount-parentAmout);
-								}else {
-									pNode.childNodes[i].set("checked", false);
-									pNode.childNodes[i].set('amount',maxAmount);
-									pNode.childNodes[i].set('maxAmount',maxAmount);
-								}
 							}
 						}
-					}else {
-						//场景2：父器械包的数量大于等于子记录的总数量，以子记录的数量为准，根据每条记录修改的数量扣减
+					} else {
+						//父器械包未选中的情况下，子记录包含选中和未选中
+						//选中的记录要扣减，未选中的要还原
 						var removeArr = [];
-						for(var i=0;i<pNode.childNodes.length;i++){
-							var maxAmount = pNode.childNodes[i].get('maxAmount');
+						for (var i = 0; i < pNode.childNodes.length; i++) {
 							var amount = pNode.childNodes[i].get('amount');
-							var newAmount = maxAmount - amount;
-							parentMaxAmount = parentMaxAmount - amount;
-							pNode.childNodes[i].set('amount',newAmount);
-							pNode.childNodes[i].set('maxAmount',newAmount);
-							pNode.childNodes[i].set("checked", false);
-							if(newAmount == 0){
-								removeArr.push(pNode.childNodes[i])
+							var maxAmount = pNode.childNodes[i].get('maxAmount');
+							var checked = pNode.childNodes[i].get('checked');
+							if (checked == true) {
+								var newAmount = maxAmount - amount;
+								pNode.childNodes[i].set('amount', newAmount);
+								pNode.childNodes[i].set('maxAmount', newAmount);
+								pNode.childNodes[i].set("checked", false);
+								parentMaxAmount = parentMaxAmount - amount;
+								if (newAmount == 0) {
+									removeArr.push(pNode.childNodes[i])
+								}
+							} else {
+								pNode.childNodes[i].set('amount', maxAmount);
 							}
 						}
-						if(parentMaxAmount == 0){
-							pNode.remove();
-						}else {
-							pNode.set('amount',parentMaxAmount);
-							pNode.set('maxAmount',parentMaxAmount);
-							pNode.set('checked',false);
-							for(var j=0;j<removeArr.length;j++){
-								var node = removeArr[j];
-								node.remove();
-							}
+						pNode.set('amount', parentMaxAmount);
+						pNode.set('maxAmount', parentMaxAmount);
+						for (var j = 0; j < removeArr.length; j++) {
+							var node = removeArr[j];
+							node.remove();
 						}
 					}
-				}else {
-					//父器械包未选中的情况下，子记录包含选中和未选中
-					//选中的记录要扣减，未选中的要还原
-					var removeArr = [];
-					for(var i=0;i<pNode.childNodes.length;i++){
-						var amount = pNode.childNodes[i].get('amount');
-						var maxAmount = pNode.childNodes[i].get('maxAmount');
-						var checked = pNode.childNodes[i].get('checked');
-						if(checked == true){
-							var newAmount = maxAmount - amount;
-							pNode.childNodes[i].set('amount',newAmount);
-							pNode.childNodes[i].set('maxAmount',newAmount);
-							pNode.childNodes[i].set("checked", false);
-							parentMaxAmount = parentMaxAmount - amount;
-							if(newAmount == 0){
-								removeArr.push(pNode.childNodes[i])
-							}
-						}else {
-							pNode.childNodes[i].set('amount',maxAmount);
-						}
-					}
-					pNode.set('amount',parentMaxAmount);
-					pNode.set('maxAmount',parentMaxAmount);
-					for(var j=0;j<removeArr.length;j++){
-						var node = removeArr[j];
-						node.remove();
-					}
-				}
-			});
+				});
+			}
 		}
 	}
-}
 
-/**
- * 拍照
- * @param tousseName 包定义名称 
- * @param tousseDefinitionId 包定义id
- * @param isLook 是查看还是拍摄 true查看 false需要拍摄和上传
- * @param imageType  图片类型
- * @param videoType  视频类型
- */
-function takeImgAndVideo(tousseName,tousseDefinitionId,packingTaskId,isLook,imageType,videoType){
-	var imageIds = '';
-    var videoIds = '';
-	var packedPhotographed = Ext4.getCmp('hidePackedPhotographed').getValue();
-	var flag = packedPhotographed === "false" ? false : true;
-	if(tousseDefinitionId == "null"){
-		tousseDefinitionId = "";
-	}
-	var barcode = idCardBarcode || '';
-	var imgType = '';
-	if(videoType !== '申请采集视频'){
-		tousseDefinitionId = packingTaskId;
-		imgType = 2;
-	}
-    var params = {
-		tousseDefinitionId: tousseDefinitionId,
-		goodsName:tousseName,
-		isLook: isLook,
-		barcode:barcode,
-		imageType: imageType,
-		videoType: videoType,
-		imageIds:imageIds,
-		videoIds:videoIds,
-		imgType:imgType
-	}
-	openCameraPhotoWindow(params,function(returnValue){
-        if(flag !== returnValue){
-			//刷新篮筐内物品
-			reloadBasketTreeGrid(true);
+	/**
+	 * 拍照
+	 * @param tousseName 包定义名称 
+	 * @param tousseDefinitionId 包定义id
+	 * @param isLook 是查看还是拍摄 true查看 false需要拍摄和上传
+	 * @param imageType  图片类型
+	 * @param videoType  视频类型
+	 */
+	function takeImgAndVideo(tousseName, tousseDefinitionId, packingTaskId, isLook, imageType, videoType) {
+		var imageIds = '';
+		var videoIds = '';
+		var packedPhotographed = Ext4.getCmp('hidePackedPhotographed').getValue();
+		var flag = packedPhotographed === "false" ? false : true;
+		if (tousseDefinitionId == "null") {
+			tousseDefinitionId = "";
 		}
-    });
-}
-
-//扫描篮筐条码,装配完成之后重新扫描条码不提示
-function scanBasketBarcodes(basketBarcode,scanType){
-	var myMask = new Ext4.LoadMask({msg:"正在加载，请稍候...",target:Ext4.getCmp('basketTreeGrid')});
-	myMask.show();
-	Ext4.Ajax.request({
-		url : WWWROOT + '/disinfectSystem/packingAction!loadPackingTaskByBasketBarCode.do',
-		params : {
-			basketBarcode : basketBarcode,
-			taskGroup:taskGroup
-		},
-		success : function(result){
-			myMask.destroy();
-			Ext4.getCmp('basketBarcodeInput').setValue('');
-			var jsonObj = Ext4.JSON.decode(result.responseText);
-			if(!jsonObj.success){
-				showResult(jsonObj.message , null , sstsConfig.messagePauseTimeOnPackingPage);
-				return;
+		var barcode = idCardBarcode || '';
+		var imgType = '';
+		if (videoType !== '申请采集视频') {
+			tousseDefinitionId = packingTaskId;
+			imgType = 2;
+		}
+		var params = {
+			tousseDefinitionId: tousseDefinitionId,
+			goodsName: tousseName,
+			isLook: isLook,
+			barcode: barcode,
+			imageType: imageType,
+			videoType: videoType,
+			imageIds: imageIds,
+			videoIds: videoIds,
+			imgType: imgType
+		}
+		openCameraPhotoWindow(params, function (returnValue) {
+			if (flag !== returnValue) {
+				//刷新篮筐内物品
+				reloadBasketTreeGrid(true);
 			}
-			var taskList = jsonObj.data;
-			var nLength = taskList?taskList.length:0;
-			if(scanType == 1){
-				if(jsonObj.notWashedInfo !== ''){
-					showResult(jsonObj.notWashedInfo);
-				}else {
-					if(nLength == 0){
-						showResult('该篮筐在'+taskGroup+'内无装配任务！' , null , sstsConfig.messagePauseTimeOnPackingPage);
-					}
+		});
+	}
+
+	//扫描篮筐条码,装配完成之后重新扫描条码不提示
+	function scanBasketBarcodes(basketBarcode, scanType) {
+		var myMask = new Ext4.LoadMask({ msg: "正在加载，请稍候...", target: Ext4.getCmp('basketTreeGrid') });
+		myMask.show();
+		Ext4.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/packingAction!loadPackingTaskByBasketBarCode.do',
+			params: {
+				basketBarcode: basketBarcode,
+				taskGroup: taskGroup
+			},
+			success: function (result) {
+				myMask.destroy();
+				Ext4.getCmp('basketBarcodeInput').setValue('');
+				var jsonObj = Ext4.JSON.decode(result.responseText);
+				if (!jsonObj.success) {
+					showResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage);
+					return;
 				}
-			}
-			var speakBasket = new SpeakBasket();
-			for(var n = 0;n < nLength; n++){
-				var taskVO = taskList[n];
-				var td_id = taskVO.tousseID;
-				var videoNames = taskVO.uuid_vedioNames;
-				var tousseName = taskVO.tousseName;
-				var amount = taskVO.amount;
-				var urgentAmount = taskVO.urgentAmount;
-				var tousseType = taskVO.tousseType;
-				var packageType = taskVO.packageType;
-				//var packageSize = taskVO.packageSize;
-			
-				var sterilingMethod = taskVO.sterilingMethod;
-				var isTraceable = taskVO.isTraceable;
-				var isPrint = taskVO.isPrint;
-				var isReview = taskVO.isReview;
-				var rMaterils = taskVO.replenishMaterils;
-				var rootNode = basketStore.getRootNode();
-				var haveIDCard = taskVO.haveIDCard;
-				var errorRemark = taskVO.errorRemark;
-				var damageRemark = taskVO.damageRemark;
-				var needInspectMaterials = taskVO.needInspectMaterials;
-				
-				var parentNode = null;
-				var isChecked = false;
-				rootNode.cascade(function(n) {
-					if(!n.get('leaf') && n.get('tousseName') == tousseName){
-						parentNode = n;
-					}
-					if(n.get('checked')){
-						isChecked = true;
-					}
-				});
-				var newParentNode = false;
-				var checked = false;
-				if(parentNode == null){
-					if(n == 0 && !isChecked){
-						checked = true;
-					}
-					var params = {
-						taskId:'',
-						td_id:td_id,
-						invoicePlanId:'',
-						videoNames:videoNames,
-						tousseName:tousseName,
-						amount:0,
-						washTime:'',
-						basketBarcode:'',
-						basketName:'',
-						taskStatus:'',
-						department:'',
-						tousseType1:tousseType,
-						packageType:packageType,
-						packageSize:'',
-						sterilingMethod:sterilingMethod,
-						dateTime:'',
-						isTraceable:isTraceable,
-						isPrint:isPrint,
-						isReview:isReview,
-						errors:'',
-						damages:'',
-						replenishMaterils:rMaterils,
-						taskType:'',
-						supplierName:'',
-						haveIDCard:haveIDCard,
-						urgentAmount:0,
-						childUrgentAmount:urgentAmount,
-						idCardBarcode:taskVO.idCardBarcode,
-						allowModifyPackageType:taskVO.allowModifyPackageType,
-						errorRemark:taskVO.errorRemark,
-						damageRemark:taskVO.damageRemark,
-						urgentLevel:taskVO.urgentLevel || '',
-						serialNumber:'',
-						recyclingItemRemark:'',
-						cleaned:taskVO.cleaned,
-						note:taskVO.note,
-						urgentLevelObj:taskVO.urgentLevelObj,
-						colorCode:taskVO.colorCode,
-						errorDamageRemarkId:'',
-						errorDamageRemarkInfo:'',
-						needInspectMaterials:needInspectMaterials,
-						tousseID:td_id,
-						maxAmount:0
-					}
-					parentNode = addTaskNode(params);
-					newParentNode = true;
-				}else{
-					/*
-					var uamountStr = parentNode.get('urgentAmount');
-					if(isNumeric(urgentAmount)){
-						if(isNumeric(uamountStr)){
-							parentNode.set('urgentAmount',parseInt(uamountStr) + parseInt(urgentAmount));
-						}else{
-							parentNode.set('urgentAmount',urgentAmount);
+				var taskList = jsonObj.data;
+				var nLength = taskList ? taskList.length : 0;
+				if (scanType == 1) {
+					if (jsonObj.notWashedInfo !== '') {
+						showResult(jsonObj.notWashedInfo);
+					} else {
+						if (nLength == 0) {
+							showResult('该篮筐在' + taskGroup + '内无装配任务！', null, sstsConfig.messagePauseTimeOnPackingPage);
 						}
-					}*/
-					var errorRemark = parentNode.get('errorRemark');
-					var damageRemark = parentNode.get('damageRemark');
-					errorRemark = errorRemark ? errorRemark + ";" + taskVO.errorRemark:taskVO.errorRemark;
-					damageRemark = damageRemark ? damageRemark + ";" + taskVO.damageRemark:taskVO.damageRemark;
-					parentNode.set('errorRemark',errorRemark);
-					parentNode.set('damageRemark',damageRemark);
+					}
 				}
-				var cLength = taskVO.children.length;
-				
-				var haveForeignTousseNode = false;
-				
-				var childNodes = parentNode.childNodes;
-				var childNodeLength = childNodes.length;
-				for (var j = 0; j < cLength; j++) {
-					var task = taskVO.children[j];
-					var taskId = task.taskId;
-					var invoicePlanId = task.invoicePlanId;
-					var tousseName = task.tousseName;
-					var amount = task.amount;
-					var urgentAmount = task.urgentAmount;
-					var washTime = task.washTime;
-					var basketBarcode = task.basketBarcode;
-					var basketName = task.basketName;
-					var taskStatus = task.status;
-					var dateTime = task.dateTime;
-					var department = task.department;
-					var isTraceable = task.isTraceable;
-					var isPrint = task.isPrint;
-					var isReview = task.isReview;
-					var errors = task.errors;
-					var damages = task.damages;
-					var replenishMaterils = task.replenishMaterils;
-					var taskType = task.taskType;
-					var supplierName = task.supplierName;
-					var packageSize = task.packageSize;	
-					var urgentLevel = task.urgentLevel;	
-					var maxAmount = task.maxAmount;	
-					var packedPhotographed = task.packedPhotographed;	
-					if(task.tousseType == '外来器械包'){
-						haveForeignTousseNode = true;
+				var speakBasket = new SpeakBasket();
+				for (var n = 0; n < nLength; n++) {
+					var taskVO = taskList[n];
+					var td_id = taskVO.tousseID;
+					var videoNames = taskVO.uuid_vedioNames;
+					var tousseName = taskVO.tousseName;
+					var amount = taskVO.amount;
+					var urgentAmount = taskVO.urgentAmount;
+					var tousseType = taskVO.tousseType;
+					var packageType = taskVO.packageType;
+					//var packageSize = taskVO.packageSize;
+
+					var sterilingMethod = taskVO.sterilingMethod;
+					var isTraceable = taskVO.isTraceable;
+					var isPrint = taskVO.isPrint;
+					var isReview = taskVO.isReview;
+					var rMaterils = taskVO.replenishMaterils;
+					var rootNode = basketStore.getRootNode();
+					var haveIDCard = taskVO.haveIDCard;
+					var errorRemark = taskVO.errorRemark;
+					var damageRemark = taskVO.damageRemark;
+					var needInspectMaterials = taskVO.needInspectMaterials;
+
+					var parentNode = null;
+					var isChecked = false;
+					rootNode.cascade(function (n) {
+						if (!n.get('leaf') && n.get('tousseName') == tousseName) {
+							parentNode = n;
+						}
+						if (n.get('checked')) {
+							isChecked = true;
+						}
+					});
+					var newParentNode = false;
+					var checked = false;
+					if (parentNode == null) {
+						if (n == 0 && !isChecked) {
+							checked = true;
+						}
+						var params = {
+							taskId: '',
+							td_id: td_id,
+							invoicePlanId: '',
+							videoNames: videoNames,
+							tousseName: tousseName,
+							amount: 0,
+							washTime: '',
+							basketBarcode: '',
+							basketName: '',
+							taskStatus: '',
+							department: '',
+							tousseType1: tousseType,
+							packageType: packageType,
+							packageSize: '',
+							sterilingMethod: sterilingMethod,
+							dateTime: '',
+							isTraceable: isTraceable,
+							isPrint: isPrint,
+							isReview: isReview,
+							errors: '',
+							damages: '',
+							replenishMaterils: rMaterils,
+							taskType: '',
+							supplierName: '',
+							haveIDCard: haveIDCard,
+							urgentAmount: 0,
+							childUrgentAmount: urgentAmount,
+							idCardBarcode: taskVO.idCardBarcode,
+							allowModifyPackageType: taskVO.allowModifyPackageType,
+							errorRemark: taskVO.errorRemark,
+							damageRemark: taskVO.damageRemark,
+							urgentLevel: taskVO.urgentLevel || '',
+							serialNumber: '',
+							recyclingItemRemark: '',
+							cleaned: taskVO.cleaned,
+							note: taskVO.note,
+							urgentLevelObj: taskVO.urgentLevelObj,
+							colorCode: taskVO.colorCode,
+							errorDamageRemarkId: '',
+							errorDamageRemarkInfo: '',
+							needInspectMaterials: needInspectMaterials,
+							tousseID: td_id,
+							maxAmount: 0
+						}
+						parentNode = addTaskNode(params);
+						newParentNode = true;
+					} else {
+						/*
+						var uamountStr = parentNode.get('urgentAmount');
+						if(isNumeric(urgentAmount)){
+							if(isNumeric(uamountStr)){
+								parentNode.set('urgentAmount',parseInt(uamountStr) + parseInt(urgentAmount));
+							}else{
+								parentNode.set('urgentAmount',urgentAmount);
+							}
+						}*/
+						var errorRemark = parentNode.get('errorRemark');
+						var damageRemark = parentNode.get('damageRemark');
+						errorRemark = errorRemark ? errorRemark + ";" + taskVO.errorRemark : taskVO.errorRemark;
+						damageRemark = damageRemark ? damageRemark + ";" + taskVO.damageRemark : taskVO.damageRemark;
+						parentNode.set('errorRemark', errorRemark);
+						parentNode.set('damageRemark', damageRemark);
 					}
-					
-					var sigle = true;
-					speakBasket.addGoods(basketName, tousseName, amount);
-					for (var m = 0; m < childNodeLength; m++) {
-						var cNode = childNodes[m];
-						if(cNode.get('taskId') == taskId){
-							sigle = false;
-							if(haveForeignTousseNode && allowForeignToussePartiallyPacking){
-								var cNodeBasketName = cNode.get('basketName');
-								var cNodeBasketBarcode = cNode.get('basketBarcode');
-								var basketBarcodeArr = cNodeBasketBarcode.split(';');
-								if(!Ext4.Array.contains(basketBarcodeArr,basketBarcode)){
-									cNode.set('basketName',cNodeBasketName+';'+basketName);
-									cNode.set('basketBarcode',cNodeBasketBarcode+';'+basketBarcode);
+					var cLength = taskVO.children.length;
+
+					var haveForeignTousseNode = false;
+
+					var childNodes = parentNode.childNodes;
+					var childNodeLength = childNodes.length;
+					for (var j = 0; j < cLength; j++) {
+						var task = taskVO.children[j];
+						var taskId = task.taskId;
+						var invoicePlanId = task.invoicePlanId;
+						var tousseName = task.tousseName;
+						var amount = task.amount;
+						var urgentAmount = task.urgentAmount;
+						var washTime = task.washTime;
+						var basketBarcode = task.basketBarcode;
+						var basketName = task.basketName;
+						var taskStatus = task.status;
+						var dateTime = task.dateTime;
+						var department = task.department;
+						var isTraceable = task.isTraceable;
+						var isPrint = task.isPrint;
+						var isReview = task.isReview;
+						var errors = task.errors;
+						var damages = task.damages;
+						var replenishMaterils = task.replenishMaterils;
+						var taskType = task.taskType;
+						var supplierName = task.supplierName;
+						var packageSize = task.packageSize;
+						var urgentLevel = task.urgentLevel;
+						var maxAmount = task.maxAmount;
+						var packedPhotographed = task.packedPhotographed;
+						if (task.tousseType == '外来器械包') {
+							haveForeignTousseNode = true;
+						}
+
+						var sigle = true;
+						speakBasket.addGoods(basketName, tousseName, amount);
+						for (var m = 0; m < childNodeLength; m++) {
+							var cNode = childNodes[m];
+							if (cNode.get('taskId') == taskId) {
+								sigle = false;
+								if (haveForeignTousseNode && allowForeignToussePartiallyPacking) {
+									var cNodeBasketName = cNode.get('basketName');
+									var cNodeBasketBarcode = cNode.get('basketBarcode');
+									var basketBarcodeArr = cNodeBasketBarcode.split(';');
+									if (!Ext4.Array.contains(basketBarcodeArr, basketBarcode)) {
+										cNode.set('basketName', cNodeBasketName + ';' + basketName);
+										cNode.set('basketBarcode', cNodeBasketBarcode + ';' + basketBarcode);
+									}
+									cNode.set('check', parentNode.get('checked'));
 								}
-								cNode.set('check',parentNode.get('checked'));
+								break;
 							}
-							break;
 						}
+						if (sigle) {
+							task.td_id = td_id;
+							task.videoNames = videoNames;
+							task.tousseType1 = tousseType;
+							task.packageType = packageType;
+							task.sterilingMethod = sterilingMethod;
+							task.maxAmount = maxAmount;
+							task.packedPhotographed = packedPhotographed;
+							var childNode = addTaskNode(task);
+							parentNode.appendChild(childNode);
+							var pNewAmount = parentNode.get('amount') + amount;
+							var purgentAmount = parseInt(parentNode.get('urgentAmount')) + parseInt(urgentAmount);
+							if (parentNode.get('urgentLevel') == '') {
+								parentNode.set('colorCode', '#ff0000');
+								parentNode.set('urgentLevel', urgentLevel);
+							}
+							parentNode.set('amount', pNewAmount);
+							parentNode.set('maxAmount', pNewAmount);
+							parentNode.set('urgentAmount', purgentAmount);
+							parentNode.set('unPackingAmount', pNewAmount);
+						}
 					}
-					if(sigle){
-						task.td_id = td_id;
-						task.videoNames = videoNames;
-						task.tousseType1 = tousseType;
-						task.packageType = packageType;
-						task.sterilingMethod = sterilingMethod;
-						task.maxAmount = maxAmount;
-						task.packedPhotographed = packedPhotographed;
-						var childNode =	addTaskNode(task);
-						parentNode.appendChild(childNode);
-						var pNewAmount = parentNode.get('amount') + amount;
-						var purgentAmount = parseInt(parentNode.get('urgentAmount')) + parseInt(urgentAmount);
-						if(parentNode.get('urgentLevel') == '' ){
-							parentNode.set('colorCode','#ff0000');
-							parentNode.set('urgentLevel',urgentLevel);
+					if (newParentNode) {
+						rootNode.appendChild(parentNode);
+						//外来器械默认展开节点
+						if (haveForeignTousseNode) {
+							parentNode.expand();
 						}
-						parentNode.set('amount',pNewAmount);
-						parentNode.set('maxAmount',pNewAmount);
-						parentNode.set('urgentAmount',purgentAmount);
-						parentNode.set('unPackingAmount',pNewAmount);
 					}
-				}
-				if(newParentNode){
-					rootNode.appendChild(parentNode);
-					//外来器械默认展开节点
-					if(haveForeignTousseNode){
-						parentNode.expand();
+					if (sstsConfig.packingView_autoSelectTousseWhenScanBasket && checked) {
+						basketColumnTreeGrid.getView().fireEvent('itemClick', '', parentNode, '', '');
+						Ext4.getCmp('basketBarcodeInput').focus('', 10);
 					}
 				}
-				if(sstsConfig.packingView_autoSelectTousseWhenScanBasket && checked){
-					basketColumnTreeGrid.getView().fireEvent('itemClick','',parentNode,'','');
-					Ext4.getCmp('basketBarcodeInput').focus('', 10);
-				}
-			}
-			var root = basketStore.getRootNode();
+				var root = basketStore.getRootNode();
 
-			//动态设置表格列的宽度
-			setGridColumnsWidth(root,basketColumnTreeGrid,'basketTreeGrid');
+				//动态设置表格列的宽度
+				setGridColumnsWidth(root, basketColumnTreeGrid, 'basketTreeGrid');
 
-			speakBasket.speakContent();
-			if(sstsConfig.enablePackingMaterialsCheckFunction){
-				var keys = getPackingMaterialsForCheck.keys();
-				for(var i=0;i<keys.length;i++){
-					if(typeof keys[i] == 'string'){
-						getPackingMaterialsForCheck.remove(keys[i]);
+				speakBasket.speakContent();
+				if (sstsConfig.enablePackingMaterialsCheckFunction) {
+					var keys = getPackingMaterialsForCheck.keys();
+					for (var i = 0; i < keys.length; i++) {
+						if (typeof keys[i] == 'string') {
+							getPackingMaterialsForCheck.remove(keys[i]);
+						}
 					}
 				}
-			}
-		},
-		failure : function(){myMask.hide();}
-	});
-}
+			},
+			failure: function () { myMask.hide(); }
+		});
+	}
 
 
-//点击器械包的时候触发事件
-function itemClickFunction(record,storeId,index){
-	var tousseName = record.get('tousseName');
-	var sterilingMethod = record.get('sterilingMethod');
-	var packageType = record.get('packageType');
-	var tousseType = record.get('tousseType');
-	var isTraceable = record.get('isTraceable');
-	var isPrint = record.get('isPrint');
-	var isReview = record.get('isReview');
-	var vedioName = record.get('uuid_vedioNames');
-	var td_id;
-	if(storeId == 'basketTreeGrid'){
-		td_id = (record.get('tousseID') == '')?record.raw.td_id:record.get('tousseID');
-		showPackButton(isPrint,isReview,tousseType);
-	}else {
-		td_id = record.get('tousseID');
-		lastSelectTaskId = record.get('taskId');
-		//不为回收任务时,不显示装配与打印按钮,只有任务类型为回收任务时才显示
-		if (record.get('taskType') != taskType_recyclingRecord) {
+	//点击器械包的时候触发事件
+	function itemClickFunction(record, storeId, index) {
+		var tousseName = record.get('tousseName');
+		var sterilingMethod = record.get('sterilingMethod');
+		var packageType = record.get('packageType');
+		var tousseType = record.get('tousseType');
+		var isTraceable = record.get('isTraceable');
+		var isPrint = record.get('isPrint');
+		var isReview = record.get('isReview');
+		var vedioName = record.get('uuid_vedioNames');
+		var td_id;
+		if (storeId == 'basketTreeGrid') {
+			td_id = (record.get('tousseID') == '') ? record.raw.td_id : record.get('tousseID');
 			showPackButton(isPrint, isReview, tousseType);
 		} else {
-			Ext4.getCmp('save_print').hide();
-			Ext4.getCmp('packingLableBtn').hide();
+			td_id = record.get('tousseID');
+			lastSelectTaskId = record.get('taskId');
+			//不为回收任务时,不显示装配与打印按钮,只有任务类型为回收任务时才显示
+			if (record.get('taskType') != taskType_recyclingRecord) {
+				showPackButton(isPrint, isReview, tousseType);
+			} else {
+				Ext4.getCmp('save_print').hide();
+				Ext4.getCmp('packingLableBtn').hide();
+			}
 		}
-	}
-	var taskId = '';
-	var packedPhotographed = '';
-	if(tousseType == '外来器械包'){
-		taskId = record.get('taskId');
-		if(index !== ''){
-			packedPhotographed = record.get('packedPhotographed');
-		}else {
-			packedPhotographed = record.childNodes[0].get('packedPhotographed');
+		var taskId = '';
+		var packedPhotographed = '';
+		if (tousseType == '外来器械包') {
+			taskId = record.get('taskId');
+			if (index !== '') {
+				packedPhotographed = record.get('packedPhotographed');
+			} else {
+				packedPhotographed = record.childNodes[0].get('packedPhotographed');
+			}
 		}
-	}
 
-	if(record.childNodes.length == 1){
-		taskId = record.childNodes[0].get('taskId');
-	}else if(record.childNodes.length == 0){
-		taskId = record.get('taskId');
-	}
-	if(record.get('checked') == false){
-		record.set('checked', true);
-		if(storeId == 'basketTreeGrid'){
-			basketColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked'));
-		}else {
-			waitPackColumnTreeGrid.getView().fireEvent('checkchange', record, record.get('checked'));
+		if (record.childNodes.length == 1) {
+			taskId = record.childNodes[0].get('taskId');
+		} else if (record.childNodes.length == 0) {
+			taskId = record.get('taskId');
 		}
-	}
-	var root;
-	if(storeId == 'basketTreeGrid'){
-		root = basketStore.getRootNode();
-	}else {
-		var waitPackingTreeGrid = Ext4.getCmp("waitPackingTreeGrid");
-		root = waitPackingTreeGrid.getRootNode();
-	}
-	updateNoteWindow(record);
-	loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable,taskId,packedPhotographed);
-	lastSelectTousseName = tousseName;
-	lastSelectimageTypeTousse = imageType_tousse;
-	lastSelectVedioName = vedioName;
-	lastSelectTdId = td_id;
-	if(packingPageAutoSetSterilizationProgramAfterSelectTousse){
-		Ext4.getCmp('sterilingType').setValue(sterilingMethod);
-		//根据灭菌程序设置灭菌方式的值
-		setSterilingModeValueBySterilingType(sterilingMethod);
-	}
-	Ext4.getCmp('packageType').setValue(packageType);
-	lastSelectedTousseName = tousseName;
-	// 显示丢失报损按钮
-	showOrHideErrorAndDamageBtn();
-	var idCardBarcodeTemp = record.get("idCardBarcode");
-	if(record.childNodes.length > 0){
-		idCardBarcodeTemp = record.childNodes[0].get("idCardBarcode");
-	}
-	if(idCardBarcodeTemp != ""){
-		var autoSetIDCardBarcodeForPacking = sstsConfig.autoSetIDCardBarcodeForPacking;
-		loadIdCardByBarcode(idCardBarcodeTemp,false,autoSetIDCardBarcodeForPacking);
-	}else {
-		if(storeId !== 'basketTreeGrid'){
-			clearInputedIDCardInfo();
+		if (record.get('checked') == false) {
+			record.set('checked', true);
+			if (storeId == 'basketTreeGrid') {
+				basketColumnTreeGrid.getView().fireEvent('checkchange', record, record.get('checked'));
+			} else {
+				waitPackColumnTreeGrid.getView().fireEvent('checkchange', record, record.get('checked'));
+			}
 		}
-	}
-	if(sstsConfig.enablePackingMaterialsCheckFunction){
-		var keys = getPackingMaterialsForCheck.keys();
-		for(var i=0;i<keys.length;i++){
-			if(typeof keys[i] == 'string'){
-				getPackingMaterialsForCheck.remove(keys[i]);
+		var root;
+		if (storeId == 'basketTreeGrid') {
+			root = basketStore.getRootNode();
+		} else {
+			var waitPackingTreeGrid = Ext4.getCmp("waitPackingTreeGrid");
+			root = waitPackingTreeGrid.getRootNode();
+		}
+		updateNoteWindow(record);
+		loadTousseInfo(tousseName, imageType_tousse, vedioName, td_id, isTraceable, taskId, packedPhotographed);
+		lastSelectTousseName = tousseName;
+		lastSelectimageTypeTousse = imageType_tousse;
+		lastSelectVedioName = vedioName;
+		lastSelectTdId = td_id;
+		if (packingPageAutoSetSterilizationProgramAfterSelectTousse) {
+			Ext4.getCmp('sterilingType').setValue(sterilingMethod);
+			//根据灭菌程序设置灭菌方式的值
+			setSterilingModeValueBySterilingType(sterilingMethod);
+		}
+		Ext4.getCmp('packageType').setValue(packageType);
+		lastSelectedTousseName = tousseName;
+		// 显示丢失报损按钮
+		showOrHideErrorAndDamageBtn();
+		var idCardBarcodeTemp = record.get("idCardBarcode");
+		if (record.childNodes.length > 0) {
+			idCardBarcodeTemp = record.childNodes[0].get("idCardBarcode");
+		}
+		if (idCardBarcodeTemp != "") {
+			var autoSetIDCardBarcodeForPacking = sstsConfig.autoSetIDCardBarcodeForPacking;
+			loadIdCardByBarcode(idCardBarcodeTemp, false, autoSetIDCardBarcodeForPacking);
+		} else {
+			if (storeId !== 'basketTreeGrid') {
+				clearInputedIDCardInfo();
 			}
 		}
+		if (sstsConfig.enablePackingMaterialsCheckFunction) {
+			var keys = getPackingMaterialsForCheck.keys();
+			for (var i = 0; i < keys.length; i++) {
+				if (typeof keys[i] == 'string') {
+					getPackingMaterialsForCheck.remove(keys[i]);
+				}
+			}
+		}
+		refreshErrorAndDamageRemark(record);
+		refreshRemarks(record);
+		refreshRecyclingItemRemark(record);
 	}
-	refreshErrorAndDamageRemark(record);
-	refreshRemarks(record);
-	refreshRecyclingItemRemark(record);
-}
 
-function updatePackageType(storeId){
-	var storeIds = Ext4.getCmp(storeId);
-	var selNodes = storeIds.getView().getChecked();
-	var selLength = selNodes.length;
-	if(selLength > 0){
-	   var map = {},dest = [];
-	   Ext4.each(selNodes, function(pNode){
-		   if(pNode.childNodes.length == 0){
-			   var ai = pNode;
-			   if(!map[ai.get('tousseName')]){
-				   dest.push(ai);
-				   map[ai.get('tousseName')] = ai;
-			   }
-		   }
-	   });
-	   if(dest.length == 1){
-			itemClickFunction(dest[0],storeId);
-			Ext4.getCmp('sterilingType').enable();
-			if(dest[0].data.allowModifyPackageType == '否'){
+	function updatePackageType(storeId) {
+		var storeIds = Ext4.getCmp(storeId);
+		var selNodes = storeIds.getView().getChecked();
+		var selLength = selNodes.length;
+		if (selLength > 0) {
+			var map = {}, dest = [];
+			Ext4.each(selNodes, function (pNode) {
+				if (pNode.childNodes.length == 0) {
+					var ai = pNode;
+					if (!map[ai.get('tousseName')]) {
+						dest.push(ai);
+						map[ai.get('tousseName')] = ai;
+					}
+				}
+			});
+			if (dest.length == 1) {
+				itemClickFunction(dest[0], storeId);
+				Ext4.getCmp('sterilingType').enable();
+				if (dest[0].data.allowModifyPackageType == '否') {
+					Ext4.getCmp('packageType').disable();
+				} else {
+					Ext4.getCmp('packageType').enable();
+				}
+			} else {
+				Ext4.getCmp('sterilingType').disable();
 				Ext4.getCmp('packageType').disable();
-			}else {
-				Ext4.getCmp('packageType').enable();
 			}
-	   }else {
-			Ext4.getCmp('sterilingType').disable();
-			Ext4.getCmp('packageType').disable();
-	   }
+		}
 	}
-}
 
-//SSTS-377：是否显示打印标签的按钮
-function showOrHidePrintBtn(){
-	var basketTreeId = Ext4.getCmp('basketTreeGrid');
-	var basketTreeList = basketTreeId.getView().getChecked();
-	var waitPackingTreeId = Ext4.getCmp('waitPackingTreeGrid');
-	var waitPackingTreeList = waitPackingTreeId.getView().getChecked();
-	if(basketTreeList.length > 0){
-		var isPrint = basketTreeList[0].get('isPrint');
-		var isReview = basketTreeList[0].get('isReview');
-		var tousseType = basketTreeList[0].get('tousseType');
-		var printBOMwhenPrintLabel = '否';
-		if(sstsConfig.printBOMwhenPrintLabel){
-			if(basketTreeList[0].childNodes.length > 0){
-				printBOMwhenPrintLabel = basketTreeList[0].childNodes[0].raw.printBOMwhenPrintLabel || '否';
-			}else {
-				printBOMwhenPrintLabel = basketTreeList[0].raw.printBOMwhenPrintLabel || '否';
-			}
-		}
-		showPackButton(isPrint,isReview,tousseType,printBOMwhenPrintLabel);
-	}else {
-		if(waitPackingTreeList.length > 0){
-			var isPrint;
-			var isReview;
-			var tousseType;
+	//SSTS-377：是否显示打印标签的按钮
+	function showOrHidePrintBtn() {
+		var basketTreeId = Ext4.getCmp('basketTreeGrid');
+		var basketTreeList = basketTreeId.getView().getChecked();
+		var waitPackingTreeId = Ext4.getCmp('waitPackingTreeGrid');
+		var waitPackingTreeList = waitPackingTreeId.getView().getChecked();
+		if (basketTreeList.length > 0) {
+			var isPrint = basketTreeList[0].get('isPrint');
+			var isReview = basketTreeList[0].get('isReview');
+			var tousseType = basketTreeList[0].get('tousseType');
 			var printBOMwhenPrintLabel = '否';
-			for(var i=0;i<waitPackingTreeList.length;i++){
-				var taskType = waitPackingTreeList[i].get('taskType');
-				if(taskType != taskType_recyclingRecord){
-					isPrint = waitPackingTreeList[i].get('isPrint') || '';
-					isReview = waitPackingTreeList[i].get('isReview') || '';
-					tousseType = waitPackingTreeList[i].get('tousseType') || '';
+			if (sstsConfig.printBOMwhenPrintLabel) {
+				if (basketTreeList[0].childNodes.length > 0) {
+					printBOMwhenPrintLabel = basketTreeList[0].childNodes[0].raw.printBOMwhenPrintLabel || '否';
+				} else {
+					printBOMwhenPrintLabel = basketTreeList[0].raw.printBOMwhenPrintLabel || '否';
 				}
-				if(sstsConfig.printBOMwhenPrintLabel){
-					if(waitPackingTreeList[i].childNodes.length > 0){
-						printBOMwhenPrintLabel = waitPackingTreeList[i].childNodes[0].raw.printBOMwhenPrintLabel || '否';
-					}else {
-						printBOMwhenPrintLabel = waitPackingTreeList[i].raw.printBOMwhenPrintLabel || '否';
+			}
+			showPackButton(isPrint, isReview, tousseType, printBOMwhenPrintLabel);
+		} else {
+			if (waitPackingTreeList.length > 0) {
+				var isPrint;
+				var isReview;
+				var tousseType;
+				var printBOMwhenPrintLabel = '否';
+				for (var i = 0; i < waitPackingTreeList.length; i++) {
+					var taskType = waitPackingTreeList[i].get('taskType');
+					if (taskType != taskType_recyclingRecord) {
+						isPrint = waitPackingTreeList[i].get('isPrint') || '';
+						isReview = waitPackingTreeList[i].get('isReview') || '';
+						tousseType = waitPackingTreeList[i].get('tousseType') || '';
 					}
+					if (sstsConfig.printBOMwhenPrintLabel) {
+						if (waitPackingTreeList[i].childNodes.length > 0) {
+							printBOMwhenPrintLabel = waitPackingTreeList[i].childNodes[0].raw.printBOMwhenPrintLabel || '否';
+						} else {
+							printBOMwhenPrintLabel = waitPackingTreeList[i].raw.printBOMwhenPrintLabel || '否';
+						}
+					}
 				}
-			}
-			if(isPrint){
-				showPackButton(isPrint, isReview, tousseType,printBOMwhenPrintLabel);
-			}else {
+				if (isPrint) {
+					showPackButton(isPrint, isReview, tousseType, printBOMwhenPrintLabel);
+				} else {
+					Ext4.getCmp('save_print').hide();
+					Ext4.getCmp('packingLableBtn').hide();
+				}
+			} else {
 				Ext4.getCmp('save_print').hide();
 				Ext4.getCmp('packingLableBtn').hide();
 			}
-		}else {
-			Ext4.getCmp('save_print').hide();
-			Ext4.getCmp('packingLableBtn').hide();
 		}
 	}
-}
 
-//GZTHZL-1:获取需要检查的包的材料
-function getPackingMaterialsForCheckFun(record,amount) {
-	var needInspectMaterials = false;
-	if(record.childNodes.length > 0){
-		needInspectMaterials = record.data.needInspectMaterials;
-	}else {
-		needInspectMaterials = record.parentNode.data.needInspectMaterials;
-	}
-	if(needInspectMaterials){
-		if(record.childNodes.length > 0){
-			var tousseID = record.data.tousseID;
-			var tousseName = record.data.tousseName;
-			var resultAmount = amount || record.data.amount;
-			if(record.data.checked){
-				var arr = getPackingMaterialsForCheck.get(tousseID) || [];
-				arr[0] = tousseName;
-				arr[1] = resultAmount;
-				getPackingMaterialsForCheck.set(tousseID,arr);
-			}else {
-				getPackingMaterialsForCheck.remove(tousseID);
-			}
-		}else {
-			var sumAmount = 0;
-			var tousseID = record.data.tousseID;
-			var tousseName = record.data.tousseName;
-			if(record.parentNode.data.checked){
-				var resultAmount = amount || record.parentNode.data.amount;
-				var arr = getPackingMaterialsForCheck.get(tousseID) || [];
-				arr[0] = tousseName;
-				arr[1] = resultAmount;
-				getPackingMaterialsForCheck.set(tousseID,arr);
-			}else {
-				for(var i=0;i<record.parentNode.childNodes.length;i++){
-					var checked = record.parentNode.childNodes[i].data.checked;
-					var resultAmount = amount || record.parentNode.childNodes[i].data.amount;
-					if(checked){
-						sumAmount += resultAmount;
-					}
-				}
-				if(sumAmount > 0){
+	//GZTHZL-1:获取需要检查的包的材料
+	function getPackingMaterialsForCheckFun(record, amount) {
+		var needInspectMaterials = false;
+		if (record.childNodes.length > 0) {
+			needInspectMaterials = record.data.needInspectMaterials;
+		} else {
+			needInspectMaterials = record.parentNode.data.needInspectMaterials;
+		}
+		if (needInspectMaterials) {
+			if (record.childNodes.length > 0) {
+				var tousseID = record.data.tousseID;
+				var tousseName = record.data.tousseName;
+				var resultAmount = amount || record.data.amount;
+				if (record.data.checked) {
 					var arr = getPackingMaterialsForCheck.get(tousseID) || [];
 					arr[0] = tousseName;
-					arr[1] = sumAmount;
-					getPackingMaterialsForCheck.set(tousseID,arr);
-				}else {
+					arr[1] = resultAmount;
+					getPackingMaterialsForCheck.set(tousseID, arr);
+				} else {
 					getPackingMaterialsForCheck.remove(tousseID);
 				}
+			} else {
+				var sumAmount = 0;
+				var tousseID = record.data.tousseID;
+				var tousseName = record.data.tousseName;
+				if (record.parentNode.data.checked) {
+					var resultAmount = amount || record.parentNode.data.amount;
+					var arr = getPackingMaterialsForCheck.get(tousseID) || [];
+					arr[0] = tousseName;
+					arr[1] = resultAmount;
+					getPackingMaterialsForCheck.set(tousseID, arr);
+				} else {
+					for (var i = 0; i < record.parentNode.childNodes.length; i++) {
+						var checked = record.parentNode.childNodes[i].data.checked;
+						var resultAmount = amount || record.parentNode.childNodes[i].data.amount;
+						if (checked) {
+							sumAmount += resultAmount;
+						}
+					}
+					if (sumAmount > 0) {
+						var arr = getPackingMaterialsForCheck.get(tousseID) || [];
+						arr[0] = tousseName;
+						arr[1] = sumAmount;
+						getPackingMaterialsForCheck.set(tousseID, arr);
+					} else {
+						getPackingMaterialsForCheck.remove(tousseID);
+					}
+				}
 			}
 		}
 	}
-}
 
-//GZTHZL-1:材料添加背景色
-function materialsAddBgColor(tousseDefinitionId,rowIndex,td) {
-	var tid = tousseDefinitionId;
-	if(!getPackingMaterialsForCheck.get(tid) && getPackingMaterialsForCheck.get(tid+'+标识牌')){
-		tid = tid+'+标识牌';
-	}
-	if(typeof tid == 'string'){
-		if(parseInt(tid.split('+')[0]) !== parseInt(clickItemId)){
-			return false;
+	//GZTHZL-1:材料添加背景色
+	function materialsAddBgColor(tousseDefinitionId, rowIndex, td) {
+		var tid = tousseDefinitionId;
+		if (!getPackingMaterialsForCheck.get(tid) && getPackingMaterialsForCheck.get(tid + '+标识牌')) {
+			tid = tid + '+标识牌';
 		}
-	}else {
-		if(parseInt(tid) !== parseInt(clickItemId)){
-			return false;
+		if (typeof tid == 'string') {
+			if (parseInt(tid.split('+')[0]) !== parseInt(clickItemId)) {
+				return false;
+			}
+		} else {
+			if (parseInt(tid) !== parseInt(clickItemId)) {
+				return false;
+			}
 		}
-	}
-	if(getPackingMaterialsForCheck.get(tid)){
-		var packingMaterialsArray = getPackingMaterialsForCheck.get(tid);
-		var tousseName = packingMaterialsArray[0];
-		var amount = packingMaterialsArray[1];
-		if(amount > 1){
-			showResult('一次只能检查一个物品，请先将【'+tousseName+'】的物品数量改成1后再进行检查并装配！')
-			return false
-		}
-		if(rowIndex == undefined){
-			for(var i=packingMaterialsArray.length;i>0;i--){
-				if(packingMaterialsArray[i] == true){
-					if(packingMaterialsArray[i+1]){
-						$('#materialGrid-body').find('tr.x4-grid-data-row').eq(i-1).find('td').eq(1).addClass('tousseNameBgColor');
-						packingMaterialsArray[i+1] = true;
-						getPackingMaterialsForCheck.set(tid,packingMaterialsArray);
+		if (getPackingMaterialsForCheck.get(tid)) {
+			var packingMaterialsArray = getPackingMaterialsForCheck.get(tid);
+			var tousseName = packingMaterialsArray[0];
+			var amount = packingMaterialsArray[1];
+			if (amount > 1) {
+				showResult('一次只能检查一个物品，请先将【' + tousseName + '】的物品数量改成1后再进行检查并装配！')
+				return false
+			}
+			if (rowIndex == undefined) {
+				for (var i = packingMaterialsArray.length; i > 0; i--) {
+					if (packingMaterialsArray[i] == true) {
+						if (packingMaterialsArray[i + 1]) {
+							$('#materialGrid-body').find('tr.x4-grid-data-row').eq(i - 1).find('td').eq(1).addClass('tousseNameBgColor');
+							packingMaterialsArray[i + 1] = true;
+							getPackingMaterialsForCheck.set(tid, packingMaterialsArray);
+						}
+						return false
 					}
-					return false
 				}
+			} else {
+				if (packingMaterialsArray[(rowIndex + 2)] !== true) {
+					$(td).addClass('tousseNameBgColor');
+					packingMaterialsArray[(rowIndex + 2)] = true;
+					getPackingMaterialsForCheck.set(tid, packingMaterialsArray);
+				} else {
+					$(td).removeClass('tousseNameBgColor');
+					packingMaterialsArray[(rowIndex + 2)] = $(td).find('div').text();
+					getPackingMaterialsForCheck.set(tid, packingMaterialsArray);
+				}
 			}
-		}else {
-			if(packingMaterialsArray[(rowIndex+2)] !== true){
-				$(td).addClass('tousseNameBgColor');
-				packingMaterialsArray[(rowIndex+2)] = true;
-				getPackingMaterialsForCheck.set(tid,packingMaterialsArray);
-			}else {
-				$(td).removeClass('tousseNameBgColor');
-				packingMaterialsArray[(rowIndex+2)] = $(td).find('div').text();
-				getPackingMaterialsForCheck.set(tid,packingMaterialsArray);
-			}
 		}
 	}
-}
 
-basketColumnTreeGrid = Ext4.create('columnTreeGrid', {
-	id : 'basketTreeGrid',
-	height: (document.body.clientHeight - 30)/2,
-	border : false,
-	store: basketStore,
-	columns:buildColumnTreeColumns('basketTreeGrid'),
-	listeners:{
-		// cellclick事件改为select事件，便于selenium进行测试
-		itemclick : function(view, record, item, index, e, eOpts) {
-			itemClickFunction(record,'basketTreeGrid',index);
-			setTimeout(function(){
-				updatePackageType('basketTreeGrid');
-				showOrHidePrintBtn();
-				if(sstsConfig.enablePackingMaterialsCheckFunction){
-					getPackingMaterialsForCheckFun(record);
+	basketColumnTreeGrid = Ext4.create('columnTreeGrid', {
+		id: 'basketTreeGrid',
+		height: (document.body.clientHeight - 30) / 2,
+		border: false,
+		store: basketStore,
+		columns: buildColumnTreeColumns('basketTreeGrid'),
+		listeners: {
+			// cellclick事件改为select事件，便于selenium进行测试
+			itemclick: function (view, record, item, index, e, eOpts) {
+				itemClickFunction(record, 'basketTreeGrid', index);
+				setTimeout(function () {
+					updatePackageType('basketTreeGrid');
+					showOrHidePrintBtn();
+					if (sstsConfig.enablePackingMaterialsCheckFunction) {
+						getPackingMaterialsForCheckFun(record);
+					}
+				}, 200);
+			},
+			load: {
+				fn: function (store) {
+					var root = basketStore.getRootNode();
+					//动态设置表格列的宽度
+					setGridColumnsWidth(root, this, 'basketTreeGrid');
 				}
-			}, 200);
-	   },
-	   load: {
-		fn: function(store){
-			var root = basketStore.getRootNode();
-			//动态设置表格列的宽度
-			setGridColumnsWidth(root,this,'basketTreeGrid');
-		}
-	},
-      checkchange:function( node, checked, eOpts ){
-		if(!node.get('leaf')){
-			Ext4.each(node.childNodes, function(pNode){
-				pNode.set("checked", checked);
-			});
-		}else {
-			var checkedArray = [];
-			Ext4.each(node.parentNode.childNodes, function(pNode){
-				checkedArray.push(pNode.get("checked"));
-			});
-			if(checkedArray.indexOf(false) == -1){
-				node.parentNode.set('checked',true);
-			}else {
-				node.parentNode.set('checked',false);
-			}
-		}
-		showNoteWindow(node); 	  
-		resetScanIDCardBarcodeVisibility(node);
-		// 显示丢失报损按钮
-		showOrHideErrorAndDamageBtn();
-		setPackageTypeReadOnlyByCondition();
-		clearRemarkByCondition();
-		if(!checked){
-			deselectCheckAll();
-		}
-      },
-      itemcontextmenu : taskItemMenu
-    },
-	tbar:[{
-		text: "扫描篮筐条码:"
-	},{
-		xtype : 'textfield',
-		id : 'basketBarcodeInput',
-		name : 'basketBarcodeInput',
-//		hidden:true,
-		width : 130,
-		listeners : {
-	        render : function(c) {
-	            c.getEl().on('keypress',function(e) {
-	                if (e.getKey() == 13) {
-	                	if(processActionBarcode(Ext4.getCmp('basketBarcodeInput'))){
-							return;
+			},
+			checkchange: function (node, checked, eOpts) {
+				if (!node.get('leaf')) {
+					Ext4.each(node.childNodes, function (pNode) {
+						pNode.set("checked", checked);
+					});
+				} else {
+					var checkedArray = [];
+					Ext4.each(node.parentNode.childNodes, function (pNode) {
+						checkedArray.push(pNode.get("checked"));
+					});
+					if (checkedArray.indexOf(false) == -1) {
+						node.parentNode.set('checked', true);
+					} else {
+						node.parentNode.set('checked', false);
+					}
+				}
+				showNoteWindow(node);
+				resetScanIDCardBarcodeVisibility(node);
+				// 显示丢失报损按钮
+				showOrHideErrorAndDamageBtn();
+				setPackageTypeReadOnlyByCondition();
+				clearRemarkByCondition();
+				if (!checked) {
+					deselectCheckAll();
+				}
+			},
+			itemcontextmenu: taskItemMenu
+		},
+		tbar: [{
+			text: "扫描篮筐条码:"
+		}, {
+			xtype: 'textfield',
+			id: 'basketBarcodeInput',
+			name: 'basketBarcodeInput',
+			//		hidden:true,
+			width: 130,
+			listeners: {
+				render: function (c) {
+					c.getEl().on('keypress', function (e) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(Ext4.getCmp('basketBarcodeInput'))) {
+								return;
+							}
+							var basketBarcode = Ext4.getCmp('basketBarcodeInput').getValue();
+							if (basketBarcode == '') {
+								showResult('篮筐条码为空', null, sstsConfig.messagePauseTimeOnPackingPage);
+								return;
+							}
+							scanBasketBarcodes(basketBarcode, 1);
 						}
-	                    var basketBarcode = Ext4.getCmp('basketBarcodeInput').getValue();
-	                    if(basketBarcode == '') {
-	                        showResult('篮筐条码为空' , null , sstsConfig.messagePauseTimeOnPackingPage);
-	                        return;
-	                    }
-	                    scanBasketBarcodes(basketBarcode,1);
-	                }
-	            });
-	        }
-	    }
-	},'-',{
-		text : '   '
-	},new Ext4.form.field.Checkbox({
-	    boxLabel : '全选',
-	    name : 'dealStatues',
-	    id:'checkAllTaskNode',
-	    inputValue : '0',
-	    checked : false,
-	    listeners : {
-	    	  afterrender:function(obj){  
-                    obj.getEl().dom.onclick = function(){
-                    	var checked = Ext4.getCmp('checkAllTaskNode').getValue();
-                        	checkedAllNode(checked);
-                        	resetScanIDCardBarcodeVisibility();
-                        };  
-                  }//,
-//                  change:function(obj,newValue, oldValue){  
-//                	  checkedAllNode(newValue);
-//                    } 
-		    }
-		}),'-',
+					});
+				}
+			}
+		}, '-', {
+			text: '   '
+		}, new Ext4.form.field.Checkbox({
+			boxLabel: '全选',
+			name: 'dealStatues',
+			id: 'checkAllTaskNode',
+			inputValue: '0',
+			checked: false,
+			listeners: {
+				afterrender: function (obj) {
+					obj.getEl().dom.onclick = function () {
+						var checked = Ext4.getCmp('checkAllTaskNode').getValue();
+						checkedAllNode(checked);
+						resetScanIDCardBarcodeVisibility();
+					};
+				}//,
+				//                  change:function(obj,newValue, oldValue){  
+				//                	  checkedAllNode(newValue);
+				//                    } 
+			}
+		}), '-',
 		{
-			text : '打印分组类型:'
+			text: '打印分组类型:'
 		},
 		{
-            xtype : 'combo',
-            id : 'printGroupType',
-            name : 'printGroupType',
-            editable:false,
-            valueField : 'value',
-            displayField : 'value',
-            store : new Ext4.data.ArrayStore( {
-                fields : [ 'value'],
-                data : [['默认'],['按科室分组'],['科室包名']]
-            }),
-            value : taskGroupObj.printGroupType,
-            forceSelection : true,
-            mode : 'local',
-            triggerAction : 'all',
-            anchor : '100%'
-        }],
+			xtype: 'combo',
+			id: 'printGroupType',
+			name: 'printGroupType',
+			editable: false,
+			valueField: 'value',
+			displayField: 'value',
+			store: new Ext4.data.ArrayStore({
+				fields: ['value'],
+				data: [['默认'], ['按科室分组'], ['科室包名']]
+			}),
+			value: taskGroupObj.printGroupType,
+			forceSelection: true,
+			mode: 'local',
+			triggerAction: 'all',
+			anchor: '100%'
+		}],
 		dockedItems: [{
-	        xtype: 'toolbar',
-	        dock: 'bottom',
-	        padding:'0 0 0 0',
-			border:false,
-			id : 'dockedItems',
-	        items: [{
-    					id : 'addErrorMaterial',
-    					text: "补充丢失器械",
-    					iconCls : 'btn_ext_application_add',
-    					handler : function() {
-    					    additionalMaterial(type_lost,"");
-    					}
-    				},{
-    					id : 'addDamageMaterial',
-    		            text : '补充报损器械',
-    		            iconCls : 'btn_ext_application_add',
-    		            handler : function() {
-    		            	additionalMaterial(type_damage,"");
-    		            }
-    		        },{
-    					id : 'packingComboTousseBtn',
-    		            text : '装配聚合包',
-    		            iconCls : 'btn_ext_application_todo',
-    		            hidden :!(sstsConfig.enableComboTousse),
-    		            handler : function() {
-							packingComboTousse();
-    		            }
-					},{
-						text : '打印回收清单',
-						hidden:SSTS_RecyclingDetail_Print,
-						iconCls : 'icon_print',
-						handler : function() {
-							recyclingDetailWindow();
+			xtype: 'toolbar',
+			dock: 'bottom',
+			padding: '0 0 0 0',
+			border: false,
+			id: 'dockedItems',
+			items: [{
+				id: 'addErrorMaterial',
+				text: "补充丢失器械",
+				iconCls: 'btn_ext_application_add',
+				handler: function () {
+					additionalMaterial(type_lost, "");
+				}
+			}, {
+				id: 'addDamageMaterial',
+				text: '补充报损器械',
+				iconCls: 'btn_ext_application_add',
+				handler: function () {
+					additionalMaterial(type_damage, "");
+				}
+			}, {
+				id: 'packingComboTousseBtn',
+				text: '装配聚合包',
+				iconCls: 'btn_ext_application_todo',
+				hidden: !(sstsConfig.enableComboTousse),
+				handler: function () {
+					packingComboTousse();
+				}
+			}, {
+				text: '打印回收清单',
+				hidden: SSTS_RecyclingDetail_Print,
+				iconCls: 'icon_print',
+				handler: function () {
+					recyclingDetailWindow();
+				}
+			}, {
+				text: '打印材料清单',
+				hidden: !(sstsConfig.showPrintBOMButton),
+				iconCls: 'icon_print',
+				handler: function () {
+					var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+					var selNodes = waitPackingTreeGrid.getView().getChecked();
+					if (selNodes.length == 0) {
+						showResult('请选择需要打印的包');
+						return;
+					}
+					var ids = [];
+					Ext4.each(selNodes, function (pNode) {
+						Ext4.each(pNode.childNodes, function (cNode) {
+							var tousseID = cNode.get('tousseID');
+							ids.push(tousseID);
+						});
+					});
+					printTousseDefinitionMaterial(ids.join(';'), false, null, 1, 'packingView');
+				}
+			}
+			]
+		}, {
+			xtype: 'toolbar',
+			dock: 'bottom',
+			padding: '0 0 0 0',
+			border: false,
+			id: 'dockedItemsHidden',
+			hidden: !sstsConfig.tousseSizeColor,
+			items: [
+				{
+					id: 'superBigTousse',
+					xtype: 'button',
+					text: '<span><i class="toussesColorShow superBigTousseColor"></i>超大包</span>',
+					hidden: !sstsConfig.tousseSizeColor
+				}, {
+					id: 'bigTousse',
+					xtype: 'button',
+					text: '<span><i class="toussesColorShow bigTousseColor"></i>大包</span>',
+					hidden: !sstsConfig.tousseSizeColor
+				}, {
+					id: 'middleTousse',
+					xtype: 'button',
+					text: '<span><i class="toussesColorShow middleTousseColor"></i>中包</span>',
+					hidden: !sstsConfig.tousseSizeColor
+				}, {
+					id: 'smallTousse',
+					xtype: 'button',
+					text: '<span><i class="toussesColorShow smallTousseColor"></i>小包</span>',
+					hidden: !sstsConfig.tousseSizeColor
+				}
+			]
+		}
+		]
+
+	});
+	var waitPackColumnTreeGrid = Ext4.create('columnTreeGrid', {
+		id: 'waitPackingTreeGrid',
+		border: false,
+		columns: buildColumnTreeColumns('waitPackingTreeGrid'),
+		height: (document.body.clientHeight - 30) / 2,
+		listeners: {
+			// cellclick事件改为select事件，便于selenium进行测试
+			itemclick: function (view, record, item, index, e, eOpts) {
+				itemClickFunction(record, 'waitPackingTreeGrid', index);
+				setTimeout(function () {
+					updatePackageType('waitPackingTreeGrid');
+					showOrHidePrintBtn();
+					if (sstsConfig.enablePackingMaterialsCheckFunction) {
+						if (record.data.tousseType == '敷料包' || record.data.taskType == 3) {
+							getPackingMaterialsForCheckFun(record);
 						}
-					},{
-						text : '打印材料清单',
-						hidden:!(sstsConfig.showPrintBOMButton),
-						iconCls : 'icon_print',
-						handler : function() {
-							var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-							var selNodes = waitPackingTreeGrid.getView().getChecked();
-							if(selNodes.length == 0){
-								showResult('请选择需要打印的包');
-								return;
-							}
-							var ids = [];
-							Ext4.each(selNodes, function(pNode) {
-								Ext4.each(pNode.childNodes, function(cNode){
-									var tousseID = cNode.get('tousseID');
-									ids.push(tousseID);
-								});
-							});
-							printTousseDefinitionMaterial(ids.join(';'),false,null,1,'packingView');
-						}
 					}
-    			]
-    		},{
-	        xtype: 'toolbar',
-	        dock: 'bottom',
-	        padding:'0 0 0 0',
-			border:false,
-			id : 'dockedItemsHidden',
-			hidden:!sstsConfig.tousseSizeColor,
-	        items: [
-        			{
-    					id : 'superBigTousse',
-    					xtype:'button',
-    		            text : '<span><i class="toussesColorShow superBigTousseColor"></i>超大包</span>',
-    		            hidden :!sstsConfig.tousseSizeColor
-		        	},{
-    					id : 'bigTousse',
-    					xtype:'button',
-    		            text : '<span><i class="toussesColorShow bigTousseColor"></i>大包</span>',
-    		            hidden :!sstsConfig.tousseSizeColor
-		        	},{
-    					id : 'middleTousse',
-    					xtype:'button',
-    		            text : '<span><i class="toussesColorShow middleTousseColor"></i>中包</span>',
-    		            hidden :!sstsConfig.tousseSizeColor
-    		        },{
-    					id : 'smallTousse',
-    					xtype:'button',
-    		            text : '<span><i class="toussesColorShow smallTousseColor"></i>小包</span>',
-    		            hidden :!sstsConfig.tousseSizeColor
-    		        }
-    			]
-    		}
-	 	]
-		
-});
-var waitPackColumnTreeGrid = Ext4.create('columnTreeGrid', {
-	id : 'waitPackingTreeGrid',
-	border : false,
-	columns:buildColumnTreeColumns('waitPackingTreeGrid'),
-	height: (document.body.clientHeight - 30)/2,
-	listeners:{
-		// cellclick事件改为select事件，便于selenium进行测试
-		itemclick : function(view, record, item, index, e, eOpts) {
-			itemClickFunction(record,'waitPackingTreeGrid',index);
-			setTimeout(function(){
-				updatePackageType('waitPackingTreeGrid');
-				showOrHidePrintBtn();
-				if(sstsConfig.enablePackingMaterialsCheckFunction){
-					if(record.data.tousseType == '敷料包' || record.data.taskType == 3){
-						getPackingMaterialsForCheckFun(record);
+				}, 200);
+			},
+			load: {
+				fn: function (store) {
+					var root = waitPackingTaskStore.getRootNode();
+					var waitPackingTreeGrid = Ext4.getCmp("waitPackingTreeGrid");
+					//动态设置表格列的宽度
+					setGridColumnsWidth(root, waitPackingTreeGrid, 'waitPackingTreeGrid');
+				}
+			},
+			checkchange: function (node, checked, eOpts) {
+				if (!node.get('leaf')) {
+					Ext4.each(node.childNodes, function (pNode) {
+						pNode.set("checked", checked);
+					});
+				} else {
+					var checkedArray = [];
+					Ext4.each(node.parentNode.childNodes, function (pNode) {
+						checkedArray.push(pNode.get("checked"));
+					});
+					if (checkedArray.indexOf(false) == -1) {
+						node.parentNode.set('checked', true);
+					} else {
+						node.parentNode.set('checked', false);
 					}
 				}
-			}, 200);
+				showNoteWindow(node);
+				resetScanIDCardBarcodeVisibilityWaitPacking(node);
+				// 显示丢失报损按钮
+				showOrHideErrorAndDamageBtn();
+				setPackageTypeReadOnlyByCondition();
+				clearRemarkByCondition();
+			},
+			itemcontextmenu: taskItemMenu
 		},
-		load: {
-			fn: function(store){
-				var root = waitPackingTaskStore.getRootNode();
-				var waitPackingTreeGrid = Ext4.getCmp("waitPackingTreeGrid");
-				//动态设置表格列的宽度
-				setGridColumnsWidth(root,waitPackingTreeGrid,'waitPackingTreeGrid');
+		store: waitPackingTaskStore,
+		tbar: waitPackingTbar
+	});
+
+	function search() {
+		var searchColumns = '';
+		Ext4.getCmp('searchMenu').items.each(function (item) {
+			if (item.checked) {
+				searchColumns += item.name + ';';
 			}
+		});
+		searchColumns = searchColumns.substring(0, searchColumns.length - 1);
+		listStore.proxy.extraParams.query = Ext4.getCmp('searchKeyWord').getValue();
+		listStore.proxy.extraParams.fields = searchColumns;
+		listStore.loadPage(1);
+		listStore.reload();
+		Ext4.getCmp('searchKeyWord').setValue('');
+	}
+	var tbar = ['->', {
+		width: 70,
+		text: '搜索列',
+		id: 'searchButton',
+		menu: {
+			id: 'searchMenu',
+			items: [{
+				xtype: 'menucheckitem',
+				name: 'depart',
+				checked: true,
+				text: '科室'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'supplierName',
+				checked: true,
+				text: '供应商'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'tousseName',
+				checked: true,
+				text: '器械包'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'splitTousseName',
+				checked: true,
+				text: '拆包名称'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'amount',
+				checked: true,
+				text: '数量'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'packer',
+				checked: true,
+				text: '配包人'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'reviewer',
+				checked: true,
+				text: reviewViewText + '人'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'foreignMaterialsAmount',
+				checked: true,
+				text: '材料汇总'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'doctor',
+				checked: true,
+				text: '医生'
+			}, {
+				xtype: 'menucheckitem',
+				name: 'patient',
+				checked: true,
+				text: '患者姓名'
+			}]
 		},
-        checkchange:function( node, checked, eOpts ){
-			if(!node.get('leaf')){
-				Ext4.each(node.childNodes, function(pNode){
-					pNode.set("checked", checked);
-				});
-			}else {
-				var checkedArray = [];
-				Ext4.each(node.parentNode.childNodes, function(pNode){
-					checkedArray.push(pNode.get("checked"));
-				});
-				if(checkedArray.indexOf(false) == -1){
-					node.parentNode.set('checked',true);
-				}else {
-					node.parentNode.set('checked',false);
-				}
+		listeners: {
+			focus: function (thisButton, The, eOpts) {
+				Ext4.getCmp('searchKeyWord').focus();
 			}
-        	showNoteWindow(node);
-        	resetScanIDCardBarcodeVisibilityWaitPacking(node);
-        	// 显示丢失报损按钮
-       		showOrHideErrorAndDamageBtn();
-        	setPackageTypeReadOnlyByCondition();
-        	clearRemarkByCondition();
-        },
-        itemcontextmenu : taskItemMenu
-	},
-	store: waitPackingTaskStore,
-	tbar : waitPackingTbar
-});
-
-function search() {
-	var searchColumns = '';
-	Ext4.getCmp('searchMenu').items.each(function (item) {
-		if (item.checked) {
-			searchColumns += item.name + ';';
 		}
-	});
-	searchColumns = searchColumns.substring(0, searchColumns.length - 1);
-	listStore.proxy.extraParams.query = Ext4.getCmp('searchKeyWord').getValue();
-	listStore.proxy.extraParams.fields = searchColumns;
-	listStore.loadPage(1);
-	listStore.reload();
-	Ext4.getCmp('searchKeyWord').setValue('');
-}
-var tbar = ['->', {
-	width: 70,
-	text: '搜索列',
-	id: 'searchButton',
-	menu: {
-		id: 'searchMenu',
-		items: [{
-			xtype: 'menucheckitem',
-			name: 'depart',
-			checked: true,
-			text: '科室'
+	}, {
+			xtype: 'textfield',
+			name: 'searchKeyWord',
+			id: 'searchKeyWord',
+			enableKeyEvents: true,
+			listeners: {
+				keydown: function (thisTextfield, e, eOpts) {
+					if (e.keyCode == 13) {
+						search(listStore);
+					}
+				}
+			}
 		}, {
-			xtype: 'menucheckitem',
-			name: 'supplierName',
-			checked: true,
-			text: '供应商'
-		},{
-			xtype: 'menucheckitem',
-			name: 'tousseName',
-			checked: true,
-			text: '器械包'
-		}, {
-			xtype: 'menucheckitem',
-			name: 'splitTousseName',
-			checked: true,
-			text: '拆包名称'
-		},{
-			xtype: 'menucheckitem',
-			name: 'amount',
-			checked: true,
-			text: '数量'
-		}, {
-			xtype: 'menucheckitem',
-			name: 'packer',
-			checked: true,
-			text: '配包人'
-		},{
-			xtype: 'menucheckitem',
-			name: 'reviewer',
-			checked: true,
-			text: reviewViewText+'人'
-		}, {
-			xtype: 'menucheckitem',
-			name: 'foreignMaterialsAmount',
-			checked: true,
-			text: '材料汇总'
-		},{
-			xtype: 'menucheckitem',
-			name: 'doctor',
-			checked: true,
-			text: '医生'
-		},{
-			xtype: 'menucheckitem',
-			name: 'patient',
-			checked: true,
-			text: '患者姓名'
-		}]
-	},
-	listeners: {
-		focus: function (thisButton, The, eOpts) {
-			Ext4.getCmp('searchKeyWord').focus();
-		}
-	}
-}, {
-	xtype: 'textfield',
-	name: 'searchKeyWord',
-	id: 'searchKeyWord',
-	enableKeyEvents: true,
-	listeners: {
-		keydown: function (thisTextfield, e, eOpts) {
-			if (e.keyCode == 13) {
+			text: '搜索',
+			handler: function (thisButton) {
 				search(listStore);
 			}
-		}
-	}
-}, {
-	text: '搜索',
-	handler: function (thisButton) {
-		search(listStore);
-	}
-}];
+		}];
 
-listStore = new Ext4.data.JsonStore({
-	proxy: {
-		type: 'ajax',
-		url: WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do',
-		reader: {
-			root: 'rows'
+	listStore = new Ext4.data.JsonStore({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do',
+			reader: {
+				root: 'rows'
+			},
+			extraParams: {}
 		},
-		extraParams: {}
-	},
-	sorters: [{
-		property: 'id',
-		direction: 'desc'
-	}],
-	fields: readerDetail,
-	listeners:{
-		beforeload: function(thiz, options) {
-			if(!isQueryParamsValid()){
-				return false;
+		sorters: [{
+			property: 'id',
+			direction: 'desc'
+		}],
+		fields: readerDetail,
+		listeners: {
+			beforeload: function (thiz, options) {
+				if (!isQueryParamsValid()) {
+					return false;
+				}
+				var p = getParamsJsonObj();
+				Ext4.apply(listStore.proxy.extraParams, p);
 			}
-			var p = getParamsJsonObj();
-			Ext4.apply(listStore.proxy.extraParams,p);
 		}
-	}
-});
+	});
 
-listStore.loadPage(1);
+	listStore.loadPage(1);
 
-listGrid = new Ext4.grid.GridPanel({
-	title: '',
-	columns: columns,
-	id:'todayHisPackingRecordPanel',
-	frame: false,
-	autoScroll: false,
-	store: listStore,
-	tbar: tbar,
-	dockedItems: [{
-		xtype: 'pagingtoolbar',
-		store: listStore,   // same store GridPanel is using  
-		dock: 'bottom',
-		displayInfo: true
-	}],
-	viewConfig: {
-		autoFill: true
-	},
-	listeners:{
-		itemclick: function (dv, record, item, index, e) {
-			if(e.target.className == 'x4-grid-row-checker'){
-				return;
-			}
-			var packingRecordId = record.get('id');
-			var cfg = {
-					packingRecordId:packingRecordId,
-					SSTS_HistoryPacking_Update:SSTS_HistoryPacking_Update,
-					SSTS_HistoryPacking_Change_Patient:SSTS_HistoryPacking_Change_Patient,
-					onClose: function(){
+	listGrid = new Ext4.grid.GridPanel({
+		title: '',
+		columns: columns,
+		id: 'todayHisPackingRecordPanel',
+		frame: false,
+		autoScroll: false,
+		store: listStore,
+		tbar: tbar,
+		dockedItems: [{
+			xtype: 'pagingtoolbar',
+			store: listStore,   // same store GridPanel is using  
+			dock: 'bottom',
+			displayInfo: true
+		}],
+		viewConfig: {
+			autoFill: true
+		},
+		listeners: {
+			itemclick: function (dv, record, item, index, e) {
+				if (e.target.className == 'x4-grid-row-checker') {
+					return;
+				}
+				var packingRecordId = record.get('id');
+				var cfg = {
+					packingRecordId: packingRecordId,
+					SSTS_HistoryPacking_Update: SSTS_HistoryPacking_Update,
+					SSTS_HistoryPacking_Change_Patient: SSTS_HistoryPacking_Change_Patient,
+					onClose: function () {
 						packingRecordStore.reload();
 					}
+				}
+				rePrintBarcodeWinForPacking2(cfg);
+			},
+			sortchange: function (ct, column, direction, eOpts) {
+				var title = column.textEl.getHTML();
+				var dataIndex = column.dataIndex;
+				if (title == "装配时间") {
+					var sortType = Ext4.util.Format.uppercase(direction);//获取排序方式“DESC”或“ASC”
+					var oldDirection = Ext4.getCmp('direction').getValue();
+					if (oldDirection !== sortType) {
+						Ext4.getCmp('direction').setValue(sortType);
+						listStore.loadPage(1);
+					}
+				}
 			}
-			rePrintBarcodeWinForPacking2(cfg);
 		},
-		sortchange: function (ct, column, direction, eOpts) {
-			var title = column.textEl.getHTML();
-			var dataIndex = column.dataIndex;
-			if (title == "装配时间") {
-				var sortType = Ext4.util.Format.uppercase(direction);//获取排序方式“DESC”或“ASC”
-				var oldDirection = Ext4.getCmp('direction').getValue();
-				if(oldDirection !== sortType){
-					Ext4.getCmp('direction').setValue(sortType);
-					listStore.loadPage(1);
+		selModel: new Ext4.selection.CheckboxModel()
+	});
+
+	var mainTabCls = /*(Ext4.isIE8 || Ext4.isIE6) ? 'mainTabCls' :*/ '';
+	var tabs2 = Ext4.widget('tabpanel', {
+		activeTab: 0,
+		plain: true,
+		border: false,
+		componentCls: mainTabCls,
+		renderTo: Ext4.get('mainPackingView'),
+		listeners: {
+			beforetabchange: function (tabs, newTab, oldTab) {
+				if (newTab.title == '今天本组装配记录') {
+					packingRecordStore.reload();
 				}
 			}
-		}
-	},
-	selModel: new Ext4.selection.CheckboxModel()
-});
+		},
+		items: [{
+			id: 'packingViewTab0',
+			title: ' 待装配任务  ',
+			layout: 'border',
+			height: document.body.clientHeight,
+			items: [{
+				region: 'west',
+				margin: '0 0 0 0',
+				width: '42%',
+				height: document.body.clientHeight,
+				items: [basketColumnTreeGrid, waitPackColumnTreeGrid]
+			}, formPanel, materialGrid
+			]
+		}, {
+			id: 'packingViewTab1',
+			title: '今天本组装配记录',
+			layout: 'border',
+			height: document.body.clientHeight - 25,
+			tbar: [{
+				xtype: 'button',
+				text: '导出excel',
+				id: "exportPackingRecordsToexcel",
+				handler: function () {
+					reloadReport();
+					timeOut();
+				}
+			}, {
+				xtype: 'button',
+				text: '生成代理灭菌单',
+				hidden: !(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople),
+				id: "createProxyDisinfection",
+				handler: function () {
+					var selectedRecords = listGrid.getSelectionModel().getSelection();
+					addAndEditProxyDisinfection(0, selectedRecords);
+				}
+			}, {
+				xtype: 'button',
+				text: '打印装配物品表',
+				hidden: !sstsConfig.packingView_currentTaskGroup_showPrintBtn,
+				id: "printPackingRecords",
+				handler: function () {
+					var params = getParamsJsonObj();
+					var s = JSON.stringify(params);
+					//    		    		var url = WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do?time='+new Date();
+					//    		    		var myMask = new Ext4.LoadMask({msg:"正在打印，请稍候...",target:Ext4.getCmp('packingViewTab1')});
+					//	                    myMask.show();
+					//	                    
+					//	                    var store = Ext4.getCmp("todayHisPackingRecordPanel").getStore();
+					//                    	var count = store.getCount();
+					//                    	if(count == 0){
+					//                    		showResult('没有要打印的记录' , null , sstsConfig.messagePauseTimeOnPackingPage);
+					//                    		myMask.destroy();
+					//                    		return;
+					//                    	}
+					//                    	var goods = [];
+					//                		for(var i = 0;i < count;++i){
+					//                			var record = store.getAt(i);
+					//                			goods.push(record.data);
+					//                		}
+					//                		var jsonObj = {
+					//                				goods: goods,
+					//                				printType: 0
+					//                		}
+					//                		defaultprintPackingRecords(jsonObj);
+					//                    	myMask.destroy();
+					var url = WWWROOT + '/disinfectSystem/packingAction!loadPackingRecordForPrint.do';
+					var myMask = new Ext4.LoadMask({ msg: "正在打印，请稍候...", target: Ext4.getCmp('packingViewTab1') });
+					myMask.show();
+					Ext4.Ajax.request({
+						url: url,
+						params: params,
+						success: function (result) {
 
-var mainTabCls = /*(Ext4.isIE8 || Ext4.isIE6) ? 'mainTabCls' :*/ '';
-var tabs2 = Ext4.widget('tabpanel', {
-    activeTab: 0,
-    plain: true,
-    border : false,
-    componentCls:mainTabCls,
-    renderTo:Ext4.get('mainPackingView'),
-    listeners: {
-        beforetabchange: function(tabs, newTab, oldTab) {
-            if (newTab.title == '今天本组装配记录'){
-            	packingRecordStore.reload();
-            }
-        }
-    },
-    items: [{
-    			id: 'packingViewTab0',
-            	title: ' 待装配任务  ',
-            	layout: 'border',
-            	height : document.body.clientHeight,
- 	            items: [{
-					region: 'west',
-					margin: '0 0 0 0',
-					width : '42%',
-					height : document.body.clientHeight,
-					items: [basketColumnTreeGrid,waitPackColumnTreeGrid]
-				},formPanel,materialGrid
- 	            ]
-    		},{
-    			id: 'packingViewTab1',
-    			title: '今天本组装配记录',
-    			layout : 'border',
-    			height : document.body.clientHeight-25,
-    			tbar:[{
-    		    	xtype:'button',
-    		    	text : '导出excel',
-    		    	id:"exportPackingRecordsToexcel",
-    		    	handler: function(){
-    		    		reloadReport();
-						timeOut();
-    		    	}
-    		    },{
-    		    	xtype:'button',
-    		    	text : '生成代理灭菌单',
-					hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople),
-    		    	id:"createProxyDisinfection",
-    		    	handler: function(){
-    		    		var selectedRecords = listGrid.getSelectionModel().getSelection();
-						addAndEditProxyDisinfection(0,selectedRecords);
-    		    	}
-    		    },{
-    		    	xtype:'button',
-    		    	text : '打印装配物品表',
-    		    	hidden: !sstsConfig.packingView_currentTaskGroup_showPrintBtn,
-    		    	id:"printPackingRecords",
-    		    	handler: function(){
-    		    		var params = getParamsJsonObj();
-    		    		var s = JSON.stringify(params);
-//    		    		var url = WWWROOT + '/disinfectSystem/packingAction!loadPackingRecord.do?time='+new Date();
-//    		    		var myMask = new Ext4.LoadMask({msg:"正在打印，请稍候...",target:Ext4.getCmp('packingViewTab1')});
-//	                    myMask.show();
-//	                    
-//	                    var store = Ext4.getCmp("todayHisPackingRecordPanel").getStore();
-//                    	var count = store.getCount();
-//                    	if(count == 0){
-//                    		showResult('没有要打印的记录' , null , sstsConfig.messagePauseTimeOnPackingPage);
-//                    		myMask.destroy();
-//                    		return;
-//                    	}
-//                    	var goods = [];
-//                		for(var i = 0;i < count;++i){
-//                			var record = store.getAt(i);
-//                			goods.push(record.data);
-//                		}
-//                		var jsonObj = {
-//                				goods: goods,
-//                				printType: 0
-//                		}
-//                		defaultprintPackingRecords(jsonObj);
-//                    	myMask.destroy();
-    		    		var url = WWWROOT + '/disinfectSystem/packingAction!loadPackingRecordForPrint.do';
-    		    		var myMask = new Ext4.LoadMask({msg:"正在打印，请稍候...",target:Ext4.getCmp('packingViewTab1')});
-	                    myMask.show();
-	                    Ext4.Ajax.request({
-	                        url : url,
-	                        params : params,
-	                        success : function(result){
-	                        	
-	                        	var jsonObj = Ext4.JSON.decode(result.responseText);
-	                        	var rows = jsonObj.rows;
-	                        	if(!jsonObj.rows || jsonObj.rows.length == 0){
-	                        		showResult('没有要打印的记录' , null , sstsConfig.messagePauseTimeOnPackingPage);
-	                        		myMask.destroy();
-	                        		return;
-	                        	}
-	                        	jsonObj.goods = jsonObj.rows;
-	                        	jsonObj.printType = 0;
-	                        	defaultprintPackingRecords(jsonObj);
-	                        	myMask.destroy();
-	                        },
-	                        failure : function(){myMask.destroy();}
-	                    });
-    		    	}
-    		    }],
-    			items : [{
-					layout : 'column',
-					region : 'north',
-					height : 60,
-//					width : 800,
-					items : [{
-						xtype:'hidden',
-						id:'direction',
-						name:'direction'
-					},{
-//						width : 140,
-						columnWidth : 0.2,
-						layout : 'form',
-						items : [{
-							xtype : 'timefield',
-							id : 'startTimeSearch',
-							name : 'startTimeSearch',
-							fieldLabel : '开始时间',
-							altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-							readOnly : false,
-							labelWidth : 90,
-							labelAlign:'right',
-							width : 75,
-							format : 'H:i',
-							value : '00:00'
-						}]
-					}, {
-//						width : 140,
-						columnWidth : 0.2,
-						layout : 'form',
-						items : [{
-							xtype : 'timefield',
-							id : 'endTimeSearch',
-							name : 'endTimeSearch',
-							fieldLabel : '结束时间',
-							altFormats:'H:i|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-							readOnly : false,
-							labelWidth : 90,
-							labelAlign:'right',
-							width : 75,
-							value : '23:59',
-							format : 'H:i'
-						}]
-					},{
-//						width : 250,
-						columnWidth : 0.3,
-						layout : 'form',
-						items : [{
-							xtype : 'combo',
-							id : 'tousseName',
-							name : 'tousseName',
-							fieldLabel : '器械包名称',
-							queryParam : 'spell',
-							labelWidth : 90,
-							labelAlign:'right',
-							minChars : 0,
-							valueField : 'name',
-							displayField : 'displayName',
-							store : new Ext4.data.Store({
-//						        //limit参数，每页显示条数，默认为25
-//						        pageSize: isIE6OrIE7 ? 15 : 50,
-								proxy : {
-									type : 'ajax',
-									url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
-									reader : {
-										type : 'json',
-						                totalProperty : 'totalCount',
-										root : 'data'
-									}
-								},
-								fields : [
-								    {name : 'id',mapping : 'id'}, 
-								    {name : 'spelling',mapping : 'spelling'}, 
-								    {name : 'name',mapping : 'name'}, 
-								    {name : 'displayName',mapping : 'displayName'}, 
-								    {name : 'amount',mapping : 'amount'}
-								  ]
-							}),
-							forceSelection : false,
-							lazyInit : true,
-							triggerAction : 'all',
-							hideTrigger : true,
-							typeAhead : false,
-							anchor : '95%',
-							listeners : {
-								select : function(combo, record, index) {
-									combo.setValue(record[0].data.name);
+							var jsonObj = Ext4.JSON.decode(result.responseText);
+							var rows = jsonObj.rows;
+							if (!jsonObj.rows || jsonObj.rows.length == 0) {
+								showResult('没有要打印的记录', null, sstsConfig.messagePauseTimeOnPackingPage);
+								myMask.destroy();
+								return;
+							}
+							jsonObj.goods = jsonObj.rows;
+							jsonObj.printType = 0;
+							defaultprintPackingRecords(jsonObj);
+							myMask.destroy();
+						},
+						failure: function () { myMask.destroy(); }
+					});
+				}
+			}],
+			items: [{
+				layout: 'column',
+				region: 'north',
+				height: 60,
+				//					width : 800,
+				items: [{
+					xtype: 'hidden',
+					id: 'direction',
+					name: 'direction'
+				}, {
+					//						width : 140,
+					columnWidth: 0.2,
+					layout: 'form',
+					items: [{
+						xtype: 'timefield',
+						id: 'startTimeSearch',
+						name: 'startTimeSearch',
+						fieldLabel: '开始时间',
+						altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+						readOnly: false,
+						labelWidth: 90,
+						labelAlign: 'right',
+						width: 75,
+						format: 'H:i',
+						value: '00:00'
+					}]
+				}, {
+					//						width : 140,
+					columnWidth: 0.2,
+					layout: 'form',
+					items: [{
+						xtype: 'timefield',
+						id: 'endTimeSearch',
+						name: 'endTimeSearch',
+						fieldLabel: '结束时间',
+						altFormats: 'H:i|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+						readOnly: false,
+						labelWidth: 90,
+						labelAlign: 'right',
+						width: 75,
+						value: '23:59',
+						format: 'H:i'
+					}]
+				}, {
+					//						width : 250,
+					columnWidth: 0.3,
+					layout: 'form',
+					items: [{
+						xtype: 'combo',
+						id: 'tousseName',
+						name: 'tousseName',
+						fieldLabel: '器械包名称',
+						queryParam: 'spell',
+						labelWidth: 90,
+						labelAlign: 'right',
+						minChars: 0,
+						valueField: 'name',
+						displayField: 'displayName',
+						store: new Ext4.data.Store({
+							//						        //limit参数，每页显示条数，默认为25
+							//						        pageSize: isIE6OrIE7 ? 15 : 50,
+							proxy: {
+								type: 'ajax',
+								url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
+								reader: {
+									type: 'json',
+									totalProperty: 'totalCount',
+									root: 'data'
 								}
+							},
+							fields: [
+								{ name: 'id', mapping: 'id' },
+								{ name: 'spelling', mapping: 'spelling' },
+								{ name: 'name', mapping: 'name' },
+								{ name: 'displayName', mapping: 'displayName' },
+								{ name: 'amount', mapping: 'amount' }
+							]
+						}),
+						forceSelection: false,
+						lazyInit: true,
+						triggerAction: 'all',
+						hideTrigger: true,
+						typeAhead: false,
+						anchor: '95%',
+						listeners: {
+							select: function (combo, record, index) {
+								combo.setValue(record[0].data.name);
 							}
-						}]
-					},{
-//						width : 250,
-						columnWidth : 0.3,
-						layout : 'form',
-						items : [{
-							xtype : 'combo',
-							id : 'orgUnit',
-							name : 'orgUnit',
-							fieldLabel : '科室',
-							labelWidth : 90,
-							labelAlign:'right',
-							queryParam : 'spell',
-							minChars : 0,
-							valueField : 'name',
-							displayField : 'name',
-							pageSize : 100,
-							store : appDepartJsonStore,
-							forceSelection : false,
-							lazyInit : true,
-							triggerAction : 'all',
-							hideTrigger : true,
-							typeAhead : false,
-							anchor : '95%'
-						}]
-					},{
-//						width : 200,
-						columnWidth : 0.2,
-						layout : 'form',
-						items : [{
-							xtype : 'textfield',
-							fieldLabel : '器械包条码',
-							allowBlank : true,
-							name : "scanTousseBarcode",
-							id : "scanTousseBarcode",
-							labelWidth : 90,
-							labelAlign:'right',
-//							anchor : '100%',
-							listeners : {
-								render : function(p) {
-									p.getEl().on('keypress',function(e) {
-										if (e.getKey() == 13) {//回车键
-											var barcode = Ext4.getCmp('scanTousseBarcode').getValue();
-											if(!isUndefinedOrNullOrEmpty(barcode)){
-												initQueryValueAndReload();
-											}
+						}
+					}]
+				}, {
+					//						width : 250,
+					columnWidth: 0.3,
+					layout: 'form',
+					items: [{
+						xtype: 'combo',
+						id: 'orgUnit',
+						name: 'orgUnit',
+						fieldLabel: '科室',
+						labelWidth: 90,
+						labelAlign: 'right',
+						queryParam: 'spell',
+						minChars: 0,
+						valueField: 'name',
+						displayField: 'name',
+						pageSize: 100,
+						store: appDepartJsonStore,
+						forceSelection: false,
+						lazyInit: true,
+						triggerAction: 'all',
+						hideTrigger: true,
+						typeAhead: false,
+						anchor: '95%'
+					}]
+				}, {
+					//						width : 200,
+					columnWidth: 0.2,
+					layout: 'form',
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '器械包条码',
+						allowBlank: true,
+						name: "scanTousseBarcode",
+						id: "scanTousseBarcode",
+						labelWidth: 90,
+						labelAlign: 'right',
+						//							anchor : '100%',
+						listeners: {
+							render: function (p) {
+								p.getEl().on('keypress', function (e) {
+									if (e.getKey() == 13) {//回车键
+										var barcode = Ext4.getCmp('scanTousseBarcode').getValue();
+										if (!isUndefinedOrNullOrEmpty(barcode)) {
+											initQueryValueAndReload();
 										}
-									});
-									p.getEl().on('focus',function(e) {
-										Ext4.getCmp('scanTousseBarcode').setValue("");
-									});
-								}
+									}
+								});
+								p.getEl().on('focus', function (e) {
+									Ext4.getCmp('scanTousseBarcode').setValue("");
+								});
 							}
-						}]
-					},{
-//						width :200,
-						columnWidth : 0.2,
-						layout : 'form',
-						items : [{
-							xtype : 'textfield',
-							fieldLabel : '配包者',
-							allowBlank : true,
-							name : "q_packer",
-							id : "q_packer",
-							labelWidth : 90,
-							labelAlign:'right',
-//							anchor : '100%',
-							listeners : {
-								render : function(p) {
-									p.getEl().on('keypress',function(e) {
-										if (e.getKey() == 13) {//回车键
-											var barcode = Ext4.getCmp('q_packer').getValue();
-											if(!isUndefinedOrNullOrEmpty(barcode)){
-												initQueryValueAndReload();
-											}
+						}
+					}]
+				}, {
+					//						width :200,
+					columnWidth: 0.2,
+					layout: 'form',
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '配包者',
+						allowBlank: true,
+						name: "q_packer",
+						id: "q_packer",
+						labelWidth: 90,
+						labelAlign: 'right',
+						//							anchor : '100%',
+						listeners: {
+							render: function (p) {
+								p.getEl().on('keypress', function (e) {
+									if (e.getKey() == 13) {//回车键
+										var barcode = Ext4.getCmp('q_packer').getValue();
+										if (!isUndefinedOrNullOrEmpty(barcode)) {
+											initQueryValueAndReload();
 										}
-									});
-									p.getEl().on('focus',function(e) {
-										Ext4.getCmp('q_packer').setValue("");
-									});
-								}
+									}
+								});
+								p.getEl().on('focus', function (e) {
+									Ext4.getCmp('q_packer').setValue("");
+								});
 							}
-						}]
-					}, {
-						width : 80,
-						layout : 'form',
-						items : [{
-							xtype : 'button',
-							text : '查询',
-							minWidth : 70,
-							iconCls : 'icon_search',
-							handler : function() {
-								search();
-							}
-						}]
-					}, {
-						width : 80,
-						layout : 'form',
-						items : [{
-							xtype : 'button',
-							text : '重置',
-							minWidth : 70,
-							iconCls : 'icon_set',
-							handler : function() {
-								Ext4.getCmp('tousseName').setValue("");
-								Ext4.getCmp('orgUnit').setValue("");
-								Ext4.getCmp('scanTousseBarcode').setValue("");
-								Ext4.getCmp('q_packer').setValue("");
-								
-								Ext4.getCmp('startTimeSearch').setValue("00:00");
-								Ext4.getCmp('endTimeSearch').setValue("23:59");
-//								$Id('tousseName').value = "";
-							}
-						}]
+						}
 					}]
-				
-    			},{
-    				region : 'center',
-    				margin : '0 0 0 0',
-		            layout:'fit',
-    				
-		            items: listGrid
-	            
-    			}]
-    		}
-    ]
-});
+				}, {
+					width: 80,
+					layout: 'form',
+					items: [{
+						xtype: 'button',
+						text: '查询',
+						minWidth: 70,
+						iconCls: 'icon_search',
+						handler: function () {
+							search();
+						}
+					}]
+				}, {
+					width: 80,
+					layout: 'form',
+					items: [{
+						xtype: 'button',
+						text: '重置',
+						minWidth: 70,
+						iconCls: 'icon_set',
+						handler: function () {
+							Ext4.getCmp('tousseName').setValue("");
+							Ext4.getCmp('orgUnit').setValue("");
+							Ext4.getCmp('scanTousseBarcode').setValue("");
+							Ext4.getCmp('q_packer').setValue("");
 
+							Ext4.getCmp('startTimeSearch').setValue("00:00");
+							Ext4.getCmp('endTimeSearch').setValue("23:59");
+							//								$Id('tousseName').value = "";
+						}
+					}]
+				}]
 
-//packingRecordStore.loadPage(1);
-Ext4.getCmp('basketBarcodeInput').focus('', 10); 
+			}, {
+				region: 'center',
+				margin: '0 0 0 0',
+				layout: 'fit',
 
-if (jobType_pack_name != "") {
-	Ext4.getCmp('operator').setValue(jobType_pack_name);
-}
-if (jobType_review_name != "") {
-	Ext4.getCmp('reviewer').setValue(jobType_review_name);
-}
+				items: listGrid
 
-document.onkeydown = showKeyDown;
-//监听空格键
-function showKeyDown() {
-	if(event.keyCode == 17){
-		if(sstsConfig.enablePackingMaterialsCheckFunction){
-			if(getPackingMaterialsForCheck.size() == 1){
-				var tousseDefinitionId = getPackingMaterialsForCheck.element(0).key;
-				materialsAddBgColor(tousseDefinitionId);
-			}else if(getPackingMaterialsForCheck.size() > 1){
-				showResult('一次只能检查一种物品，请勿勾选多种物品！');
-				return false
+			}]
+		}
+		]
+	});
+
+
+	//packingRecordStore.loadPage(1);
+	Ext4.getCmp('basketBarcodeInput').focus('', 10);
+
+	if (jobType_pack_name != "") {
+		Ext4.getCmp('operator').setValue(jobType_pack_name);
+	}
+	if (jobType_review_name != "") {
+		Ext4.getCmp('reviewer').setValue(jobType_review_name);
+	}
+
+	document.onkeydown = showKeyDown;
+	//监听空格键
+	function showKeyDown() {
+		if (event.keyCode == 17) {
+			if (sstsConfig.enablePackingMaterialsCheckFunction) {
+				if (getPackingMaterialsForCheck.size() == 1) {
+					var tousseDefinitionId = getPackingMaterialsForCheck.element(0).key;
+					materialsAddBgColor(tousseDefinitionId);
+				} else if (getPackingMaterialsForCheck.size() > 1) {
+					showResult('一次只能检查一种物品，请勿勾选多种物品！');
+					return false
+				}
 			}
 		}
 	}
-}
-    
-/**
- * 空闲时刷新（每空闲5分钟刷新一次）
- * 如果有鼠标或者键盘事件，则重新计时
- */
-var inactivityTime = function () {
-    var t;
-    document.onmousemove = resetTimer;
-    document.onkeypress = resetTimer;
 
-    function resetTimer() {
-        clearInterval(t);
-        t = setInterval(reflushWaitPackingTreeGrid, 5*60*1000)
-    }
-    resetTimer();
-};
+	/**
+	 * 空闲时刷新（每空闲5分钟刷新一次）
+	 * 如果有鼠标或者键盘事件，则重新计时
+	 */
+	var inactivityTime = function () {
+		var t;
+		document.onmousemove = resetTimer;
+		document.onkeypress = resetTimer;
 
-if(allowPackingWhenUnSupplementMaterial){
-	var hisPackingRecordGrid = Ext4.getCmp("todayHisPackingRecordPanel");
-	hisPackingRecordGrid.on('itemmouseenter',function(view,record,mode,index,e) {
-		if (index !== false) {
-			var recordId = record.get('id');
-			var tableContent = record.data['htmlContent'];
-			if (!tableContent) {
-				var content = "";
-				Ext4.Ajax.request({
-					url : WWWROOT + '/disinfectSystem/packingAction!loadUnSupplementMaterialsByPackingRecord.do',
-					params : {
-						id : recordId
-					},
-					success : function(response, options) {
-						var invoiceItems = eval(response.responseText);
-						if (invoiceItems != null) {
-							for ( var i = 0; i < invoiceItems.length; i++) {
-								content += "<tr height=25><td align='left' width='250px'>&nbsp"
+		function resetTimer() {
+			clearInterval(t);
+			t = setInterval(reflushWaitPackingTreeGrid, 5 * 60 * 1000)
+		}
+		resetTimer();
+	};
+
+	if (allowPackingWhenUnSupplementMaterial) {
+		var hisPackingRecordGrid = Ext4.getCmp("todayHisPackingRecordPanel");
+		hisPackingRecordGrid.on('itemmouseenter', function (view, record, mode, index, e) {
+			if (index !== false) {
+				var recordId = record.get('id');
+				var tableContent = record.data['htmlContent'];
+				if (!tableContent) {
+					var content = "";
+					Ext4.Ajax.request({
+						url: WWWROOT + '/disinfectSystem/packingAction!loadUnSupplementMaterialsByPackingRecord.do',
+						params: {
+							id: recordId
+						},
+						success: function (response, options) {
+							var invoiceItems = eval(response.responseText);
+							if (invoiceItems != null) {
+								for (var i = 0; i < invoiceItems.length; i++) {
+									content += "<tr height=25><td align='left' width='250px'>&nbsp"
 										+ invoiceItems[i].materialName
 										+ "</td><td align='center' width='100px'>"
 										+ invoiceItems[i].amount
 										+ "</td><td align='center' width='100px'>"
 										+ invoiceItems[i].type
 										+ "</td></tr>";
+								}
 							}
+							tableContent = ("<table height='100%' width='400px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9' height=25><td width='300px' align='center'><h3>材料名称</h3></td><td width='100px' align='center'><h3>数量</h3></td><td width='100px' align='center'><h3>类型</h3></td>");
+							tableContent += "</tr>" + content + "</table></br>";
+							// 重新查找record，有可能之前的已经不存在
+							var curRecord = findRecordByNameAndValueFromStore(hisPackingRecordGrid.getStore(), 'id', recordId);
+							if (!isUndefinedOrNull(curRecord)) {
+								curRecord.set("htmlContent", tableContent);
+							}
+						},
+						failure: function (response, options) {
 						}
-						tableContent = ("<table height='100%' width='400px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9' height=25><td width='300px' align='center'><h3>材料名称</h3></td><td width='100px' align='center'><h3>数量</h3></td><td width='100px' align='center'><h3>类型</h3></td>");
-						tableContent += "</tr>" + content + "</table></br>";
-						// 重新查找record，有可能之前的已经不存在
-						var curRecord = findRecordByNameAndValueFromStore(hisPackingRecordGrid.getStore(),'id',recordId);
-						if(!isUndefinedOrNull(curRecord)){
-							curRecord.set("htmlContent",tableContent);
-						}
-					},
-					failure : function(response, options) {
-					}
-				});
-			} else {
-				var rowEl = Ext4.fly(e.getTarget());
-				rowEl.set({'data-qtip' : tableContent,'data-qwidth':420,'data-qtitle':'&nbsp<font size=10>未补充材料列表:</font>'},false);
+					});
+				} else {
+					var rowEl = Ext4.fly(e.getTarget());
+					rowEl.set({ 'data-qtip': tableContent, 'data-qwidth': 420, 'data-qtitle': '&nbsp<font size=10>未补充材料列表:</font>' }, false);
+				}
 			}
-		}
-	});
-}
+		});
+	}
 
 
-/*Ext4.create('Ext4.container.Viewport', {
-    layout: 'border',
-    items: [{
-        region: 'center',
-        border: false,
-        items:tabs2
-    }]
-});*/
-Ext4.EventManager.onWindowResize(function(width,height){//改变窗口的时候会提示出窗口的宽高
-	Ext4.ComponentManager.each(function(cmpId,cmp,length){  
-		if(cmp.hasOwnProperty("renderTo") && cmp.doLayout){  
-			cmp.doLayout();  
-		}  
-	});  
-});
+	/*Ext4.create('Ext4.container.Viewport', {
+		layout: 'border',
+		items: [{
+			region: 'center',
+			border: false,
+			items:tabs2
+		}]
+	});*/
+	Ext4.EventManager.onWindowResize(function (width, height) {//改变窗口的时候会提示出窗口的宽高
+		Ext4.ComponentManager.each(function (cmpId, cmp, length) {
+			if (cmp.hasOwnProperty("renderTo") && cmp.doLayout) {
+				cmp.doLayout();
+			}
+		});
+	});
 
-//查询全部丢失、报损数量
-getErrorAndDamgeCount();
-//空闲时刷新（每空闲5分钟刷新一次）
-inactivityTime();
+	//查询全部丢失、报损数量
+	getErrorAndDamgeCount();
+	//空闲时刷新（每空闲5分钟刷新一次）
+	inactivityTime();
 });
 
 var inactivityTimes = function () {
-    var t;
+	var t;
 
-    function resetTimer() {
-        clearInterval(t);
-        t = setInterval(function(){
-			var title = windowLocalStorage('get','title');
-			if(title.indexOf('装配')>-1){
-				if(pageLoad){
+	function resetTimer() {
+		clearInterval(t);
+		t = setInterval(function () {
+			var title = windowLocalStorage('get', 'title');
+			if (title.indexOf('装配') > -1) {
+				if (pageLoad) {
 					websocketCallBacks();
 					pageLoad = false;
 				}
 			}
 		}, 1000)
 	}
-	
-    resetTimer();
+
+	resetTimer();
 };
 
 /**
@@ -6320,21 +6324,21 @@
 
 inactivityTimes();
 
-function websocketCallBack(){
+function websocketCallBack() {
 	pageLoad = true;
 }
 
 //获取篮筐内的条码
-function getBasketBarcode(){
+function getBasketBarcode() {
 	var rootNode = Ext4.getCmp('basketTreeGrid').getStore().getRootNode();
 	var basketBarcodeArr = [];
-	if(rootNode.childNodes.length > 0){
-		for(var i=0;i<rootNode.childNodes.length;i++){
+	if (rootNode.childNodes.length > 0) {
+		for (var i = 0; i < rootNode.childNodes.length; i++) {
 			var data = rootNode.childNodes[i];
-			for(var j=0;j<data.childNodes.length;j++){
+			for (var j = 0; j < data.childNodes.length; j++) {
 				var childData = data.childNodes[j];
 				var basketBarcode = childData.data.basketBarcode;
-				if(basketBarcodeArr.indexOf(basketBarcode) == -1){
+				if (basketBarcodeArr.indexOf(basketBarcode) == -1) {
 					basketBarcodeArr.push(basketBarcode);
 				}
 			}
@@ -6345,80 +6349,80 @@
 }
 
 //动态修改列宽
-function setGridColumnsWidth(root,grid,treeId){
+function setGridColumnsWidth(root, grid, treeId) {
 	var tousseNameMaxLenArray = [];
 	var basketNameMaxLenArray = [];
 	var handleTdWidth = 40;
 	var isHasErrorBtn = false;
 	var isHasDamagesBtn = false;
 	var isHasErrorAndDamagesBtn = false;
 	var isHasSplitForeignTousseBtn = false;
-	Ext4.each(root.childNodes, function(pNode){
+	Ext4.each(root.childNodes, function (pNode) {
 		var tousseName = pNode.data.tousseName;
-		tousseNameMaxLenArray.push(textSize(fontSize+"px","宋体",tousseName).width || 0);
-		Ext4.each(pNode.childNodes, function(lastNode){
+		tousseNameMaxLenArray.push(textSize(fontSize + "px", "宋体", tousseName).width || 0);
+		Ext4.each(pNode.childNodes, function (lastNode) {
 			var basketName = lastNode.data.basketName;
-			basketNameMaxLenArray.push(textSize(fontSize+"px","宋体",basketName).width || 0);
+			basketNameMaxLenArray.push(textSize(fontSize + "px", "宋体", basketName).width || 0);
 			lastNode.set("checked", false);
-			if(pNode.get("checked") == true){
+			if (pNode.get("checked") == true) {
 				lastNode.set("checked", true);
 			}
 			//ZSWY-152：操作列自适应宽度
 			var status = lastNode.get('status');
-			if(status == '待装配'){
+			if (status == '待装配') {
 				var errors = lastNode.get('errors');
 				var damages = lastNode.get('damages');
-				if(errors.length > 0 && damages.length > 0){
+				if (errors.length > 0 && damages.length > 0) {
 					isHasErrorAndDamagesBtn = true;
 				}
-				if(errors.length > 0){
+				if (errors.length > 0) {
 					isHasErrorBtn = true;
 				}
-				if(damages.length > 0){
+				if (damages.length > 0) {
 					isHasDamagesBtn = true;
 				}
 			}
-			if(lastNode.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid'){
-				if(!allowForeignToussePartiallyPacking){
+			if (lastNode.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid') {
+				if (!allowForeignToussePartiallyPacking) {
 					isHasSplitForeignTousseBtn = true;
 				}
 			}
 		});
 	});
 	//ZSWY-152：设置操作列最大的宽度
-	if(isHasErrorAndDamagesBtn){
+	if (isHasErrorAndDamagesBtn) {
 		handleTdWidth += 80;
-	}else if(isHasErrorBtn){
+	} else if (isHasErrorBtn) {
 		handleTdWidth += 40;
-	}else if(isHasDamagesBtn){
+	} else if (isHasDamagesBtn) {
 		handleTdWidth += 40;
 	}
-	
-	if(isHasSplitForeignTousseBtn){
+
+	if (isHasSplitForeignTousseBtn) {
 		handleTdWidth += 40;
 	}
 
 	var gridColumns = grid.headerCt.getGridColumns();
-	for(var i=0;i<gridColumns.length;i++){
-		if(gridColumns[i].text == '物品名称'){
+	for (var i = 0; i < gridColumns.length; i++) {
+		if (gridColumns[i].text == '物品名称') {
 			//设置物品名称列的宽度
-			if(tousseNameMaxLenArray.length > 0){
-				var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
-				gridColumns[i].setWidth(tousseNameMaxLenght+90);
+			if (tousseNameMaxLenArray.length > 0) {
+				var tousseNameMaxLenght = Math.max.apply(null, tousseNameMaxLenArray);
+				gridColumns[i].setWidth(tousseNameMaxLenght + 90);
 			}
 		}
-		if(gridColumns[i].text == '操作'){
+		if (gridColumns[i].text == '操作') {
 			//设置操作列最大的宽度
 			gridColumns[i].setWidth(handleTdWidth);
 		}
-		if(gridColumns[i].text == '清洗篮筐'){
+		if (gridColumns[i].text == '清洗篮筐') {
 			//设置清洗篮筐列最大的宽度
-			if(basketNameMaxLenArray.length > 0){
-				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
-				if(basketNameMaxLenght !== 0){
-					if(basketNameMaxLenght < 216){
-						gridColumns[i].setWidth(basketNameMaxLenght+30);
-					}else {
+			if (basketNameMaxLenArray.length > 0) {
+				var basketNameMaxLenght = Math.max.apply(null, basketNameMaxLenArray);
+				if (basketNameMaxLenght !== 0) {
+					if (basketNameMaxLenght < 216) {
+						gridColumns[i].setWidth(basketNameMaxLenght + 30);
+					} else {
 						gridColumns[i].setWidth(210);
 					}
 				}
@@ -6427,38 +6431,38 @@
 	}
 }
 
-function websocketCallBacks(){
+function websocketCallBacks() {
 	//刷新装配和待装配任务列表(须参考需求的预期结果进行前端业务的开发:ZSWY-110 多人同时进行装配和审核时界面上的待处理任务要自动实时刷新)
 	var basketBarcodeArrAll = getBasketBarcode();
-	if(basketBarcodeArrAll.length > 0){
+	if (basketBarcodeArrAll.length > 0) {
 		Ext4.getCmp('basketTreeGrid').getStore().reload();
-		if(!splitForeignTousseFlag){
+		if (!splitForeignTousseFlag) {
 			Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
 		}
-		for(var i=0;i<basketBarcodeArrAll.length;i++){
-		 	Ext4.Ajax.request({
-			    url : WWWROOT + '/disinfectSystem/packingAction!loadPackingTaskByBasketBarCode.do',
-			    params : {
-					basketBarcode :basketBarcodeArrAll[i],
-			    	taskGroup:taskGroup
-			    },
-			    success : function(result){
-			    	Ext4.getCmp('basketBarcodeInput').setValue('');
-			    	var jsonObj = Ext4.JSON.decode(result.responseText);
-			    	if(!jsonObj.success){
-			    		showResult(jsonObj.message , null , sstsConfig.messagePauseTimeOnPackingPage);
-			    		return;
-			    	}
-			    	var taskList = jsonObj.data;
-			    	var nLength = taskList?taskList.length:0;
-			    	if(nLength == 0){
-						showResult('该篮筐在'+taskGroup+'内无装配任务！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		for (var i = 0; i < basketBarcodeArrAll.length; i++) {
+			Ext4.Ajax.request({
+				url: WWWROOT + '/disinfectSystem/packingAction!loadPackingTaskByBasketBarCode.do',
+				params: {
+					basketBarcode: basketBarcodeArrAll[i],
+					taskGroup: taskGroup
+				},
+				success: function (result) {
+					Ext4.getCmp('basketBarcodeInput').setValue('');
+					var jsonObj = Ext4.JSON.decode(result.responseText);
+					if (!jsonObj.success) {
+						showResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage);
+						return;
 					}
-					
-			    	var speakBasket = new SpeakBasket();
-					
-			    	for(var n = 0;n < nLength; n++){
-			    		var taskVO = taskList[n];
+					var taskList = jsonObj.data;
+					var nLength = taskList ? taskList.length : 0;
+					if (nLength == 0) {
+						showResult('该篮筐在' + taskGroup + '内无装配任务！', null, sstsConfig.messagePauseTimeOnPackingPage);
+					}
+
+					var speakBasket = new SpeakBasket();
+
+					for (var n = 0; n < nLength; n++) {
+						var taskVO = taskList[n];
 						var td_id = taskVO.tousseID;
 						var videoNames = taskVO.uuid_vedioNames;
 						var tousseName = taskVO.tousseName;
@@ -6467,7 +6471,7 @@
 						var tousseType = taskVO.tousseType;
 						var packageType = taskVO.packageType;
 						//var packageSize = taskVO.packageSize;
-					
+
 						var sterilingMethod = taskVO.sterilingMethod;
 						var isTraceable = taskVO.isTraceable;
 						var isPrint = taskVO.isPrint;
@@ -6478,90 +6482,90 @@
 						var errorRemark = taskVO.errorRemark;
 						var damageRemark = taskVO.damageRemark;
 						var needInspectMaterials = taskVO.needInspectMaterials;
-						
+
 						var parentNode = null;
 						var isChecked = false;
-						rootNode.cascade(function(n) {
-							if(!n.get('leaf') && n.get('tousseName') == tousseName){
+						rootNode.cascade(function (n) {
+							if (!n.get('leaf') && n.get('tousseName') == tousseName) {
 								parentNode = n;
 							}
-							if(n.get('checked')){
+							if (n.get('checked')) {
 								isChecked = true;
 							}
-						 });
+						});
 						var newParentNode = false;
 						var checked = false;
-						if(parentNode == null){
-							if(n == 0 && !isChecked){
+						if (parentNode == null) {
+							if (n == 0 && !isChecked) {
 								checked = true;
 							}
 							var params = {
-								taskId:'',
-								td_id:td_id,
-								invoicePlanId:'',
-								videoNames:videoNames,
-								tousseName:tousseName,
-								amount:0,
-								washTime:'',
-								basketBarcode:'',
-								basketName:'',
-								taskStatus:'',
-								department:'',
-								tousseType1:tousseType,
-								packageType:packageType,
-								packageSize:'',
-								sterilingMethod:sterilingMethod,
-								dateTime:'',
-								isTraceable:isTraceable,
-								isPrint:isPrint,
-								isReview:isReview,
-								errors:'',
-								damages:'',
-								replenishMaterils:rMaterils,
-								taskType:'',
-								supplierName:'',
-								haveIDCard:haveIDCard,
-								childUrgentAmount:urgentAmount,
-								urgentAmount:urgentAmount,
-								idCardBarcode:taskVO.idCardBarcode,
-								allowModifyPackageType:taskVO.allowModifyPackageType,
-								errorRemark:taskVO.errorRemark,
-								damageRemark:taskVO.damageRemark,
-								urgentLevel:taskVO.urgentLevel,
-								serialNumber:'',
-								recyclingItemRemark:'',
-								cleaned:taskVO.cleaned,
-								note:taskVO.note,
-								urgentLevelObj:taskVO.urgentLevelObj,
-								colorCode:taskVO.colorCode,
-								errorDamageRemarkId:'',
-								errorDamageRemarkInfo:'',
-								tousseID:td_id,
-								maxAmount:0,
-								needInspectMaterials:needInspectMaterials
+								taskId: '',
+								td_id: td_id,
+								invoicePlanId: '',
+								videoNames: videoNames,
+								tousseName: tousseName,
+								amount: 0,
+								washTime: '',
+								basketBarcode: '',
+								basketName: '',
+								taskStatus: '',
+								department: '',
+								tousseType1: tousseType,
+								packageType: packageType,
+								packageSize: '',
+								sterilingMethod: sterilingMethod,
+								dateTime: '',
+								isTraceable: isTraceable,
+								isPrint: isPrint,
+								isReview: isReview,
+								errors: '',
+								damages: '',
+								replenishMaterils: rMaterils,
+								taskType: '',
+								supplierName: '',
+								haveIDCard: haveIDCard,
+								childUrgentAmount: urgentAmount,
+								urgentAmount: urgentAmount,
+								idCardBarcode: taskVO.idCardBarcode,
+								allowModifyPackageType: taskVO.allowModifyPackageType,
+								errorRemark: taskVO.errorRemark,
+								damageRemark: taskVO.damageRemark,
+								urgentLevel: taskVO.urgentLevel,
+								serialNumber: '',
+								recyclingItemRemark: '',
+								cleaned: taskVO.cleaned,
+								note: taskVO.note,
+								urgentLevelObj: taskVO.urgentLevelObj,
+								colorCode: taskVO.colorCode,
+								errorDamageRemarkId: '',
+								errorDamageRemarkInfo: '',
+								tousseID: td_id,
+								maxAmount: 0,
+								needInspectMaterials: needInspectMaterials
 							}
 							parentNode = addTaskNode(params);
 							newParentNode = true;
-						}else{
+						} else {
 							var uamountStr = parentNode.get('urgentAmount');
-							if(isNumeric(urgentAmount)){
-								if(isNumeric(uamountStr)){
-									parentNode.set('urgentAmount',parseInt(uamountStr) + parseInt(urgentAmount));
-								}else{
-									parentNode.set('urgentAmount',urgentAmount);
+							if (isNumeric(urgentAmount)) {
+								if (isNumeric(uamountStr)) {
+									parentNode.set('urgentAmount', parseInt(uamountStr) + parseInt(urgentAmount));
+								} else {
+									parentNode.set('urgentAmount', urgentAmount);
 								}
 							}
 							var errorRemark = parentNode.get('errorRemark');
 							var damageRemark = parentNode.get('damageRemark');
-							errorRemark = errorRemark ? errorRemark + ";" + taskVO.errorRemark:taskVO.errorRemark;
-							damageRemark = damageRemark ? damageRemark + ";" + taskVO.damageRemark:taskVO.damageRemark;
-							parentNode.set('errorRemark',errorRemark);
-							parentNode.set('damageRemark',damageRemark);
+							errorRemark = errorRemark ? errorRemark + ";" + taskVO.errorRemark : taskVO.errorRemark;
+							damageRemark = damageRemark ? damageRemark + ";" + taskVO.damageRemark : taskVO.damageRemark;
+							parentNode.set('errorRemark', errorRemark);
+							parentNode.set('damageRemark', damageRemark);
 						}
 						var cLength = taskVO.children.length;
-						
+
 						var haveForeignTousseNode = false;
-						
+
 						var childNodes = parentNode.childNodes;
 						var childNodeLength = childNodes.length;
 						for (var j = 0; j < cLength; j++) {
@@ -6585,65 +6589,65 @@
 							var replenishMaterils = task.replenishMaterils;
 							var taskType = task.taskType;
 							var supplierName = task.supplierName;
-							var packageSize = task.packageSize;		
-							var maxAmount = task.maxAmount;							
-							
-							if(task.tousseType == '外来器械包'){
+							var packageSize = task.packageSize;
+							var maxAmount = task.maxAmount;
+
+							if (task.tousseType == '外来器械包') {
 								haveForeignTousseNode = true;
 							}
-							
+
 							var sigle = true;
 							speakBasket.addGoods(basketName, tousseName, amount);
 							for (var m = 0; m < childNodeLength; m++) {
 								var cNode = childNodes[m];
-								if(cNode.get('taskId') == taskId){
+								if (cNode.get('taskId') == taskId) {
 									sigle = false;
-									if(haveForeignTousseNode && allowForeignToussePartiallyPacking){
+									if (haveForeignTousseNode && allowForeignToussePartiallyPacking) {
 										var cNodeBasketName = cNode.get('basketName');
 										var cNodeBasketBarcode = cNode.get('basketBarcode');
 										var basketBarcodeArr = cNodeBasketBarcode.split(';');
-										if(!Ext4.Array.contains(basketBarcodeArr,basketBarcode)){
-											cNode.set('basketName',cNodeBasketName+';'+basketName);
-											cNode.set('basketBarcode',cNodeBasketBarcode+';'+basketBarcode);
+										if (!Ext4.Array.contains(basketBarcodeArr, basketBarcode)) {
+											cNode.set('basketName', cNodeBasketName + ';' + basketName);
+											cNode.set('basketBarcode', cNodeBasketBarcode + ';' + basketBarcode);
 										}
 									}
 									break;
 								}
 							}
-							if(sigle){
+							if (sigle) {
 								task.td_id = td_id;
 								task.videoNames = videoNames;
 								task.tousseType1 = tousseType;
 								task.packageType = packageType;
 								task.sterilingMethod = sterilingMethod;
 								task.maxAmount = maxAmount;
 
-								var childNode =	addTaskNode(task);
+								var childNode = addTaskNode(task);
 								parentNode.appendChild(childNode);
 								var pNewAmount = parentNode.get('amount') + amount;
-								parentNode.set('amount',pNewAmount);
-								parentNode.set('maxAmount',pNewAmount);
-								parentNode.set('unPackingAmount',pNewAmount);
+								parentNode.set('amount', pNewAmount);
+								parentNode.set('maxAmount', pNewAmount);
+								parentNode.set('unPackingAmount', pNewAmount);
 							}
 						}
-						if(newParentNode){
+						if (newParentNode) {
 							rootNode.appendChild(parentNode);
 							//外来器械默认展开节点
-							if(haveForeignTousseNode){
+							if (haveForeignTousseNode) {
 								parentNode.expand();
 							}
 						}
-						if(sstsConfig.packingView_autoSelectTousseWhenScanBasket && checked){
-							basketColumnTreeGrid.getView().fireEvent('itemClick','',parentNode,'','');
+						if (sstsConfig.packingView_autoSelectTousseWhenScanBasket && checked) {
+							basketColumnTreeGrid.getView().fireEvent('itemClick', '', parentNode, '', '');
 							Ext4.getCmp('basketBarcodeInput').focus('', 10);
 						}
 					}
-			    	speakBasket.speakContent();
+					speakBasket.speakContent();
 				},
-			    failure : function(){myMask.hide();}
-			}); 
+				failure: function () { myMask.hide(); }
+			});
 		}
-	}else{
+	} else {
 		reflushWaitPackingTreeGrid();
 	}
 }
\ No newline at end of file