Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15030 -r15036
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15030)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15036)
@@ -41,8 +41,10 @@
 		LODOP.SET_PRINT_STYLEA(item.name, 'Deleted', !item.checked);
 	}
 }
-function addOrRemove(add,vName,value) {
+function addOrRemove(add,propName) {
 	getLODOP2();
+	var vName = 'obj.'+propName
+	var value = obj[propName];
 	if(add){
 		if(LODOP.GET_VALUE("ItemIsAdded", vName)){
 			LODOP.SET_PRINT_STYLEA(vName, 'Deleted', 0);// 恢复删除的项
@@ -152,10 +154,7 @@
 };
 
 function cancel() {
-	var href = WWWROOT
-			+ '/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp?id='
-			+ id;
-	location.href = href;
+	window.close();
 }
 function saveConfig() {
 	getProgram();
@@ -215,11 +214,81 @@
 			}
 		}, {
 			xtype : 'checkboxfield',
-			id: 'checkbox_operator',
+			id: 'cmp_name',
+			boxLabel  : '包名称',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'name');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_operator',
 			boxLabel  : '配包人',
 			handler : function(checkbox,checked) {
-				addOrRemove(checked,'obj.operator',obj.operator);
+				addOrRemove(checked,'operator');
 			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_reviewer',
+			boxLabel  : '审核人',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'reviewer');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_sterilizationDate',
+			boxLabel  : '灭菌日期',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'sterilizationDate');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_validDate',
+			boxLabel  : '失效日期',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'validDate');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_sterilizer',
+			boxLabel  : '炉号',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'sterilizer');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_frequency',
+			boxLabel  : '炉次',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'frequency');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_hospitalName',
+			boxLabel  : '医院名称',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'hospitalName');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_patient',
+			boxLabel  : '病人姓名',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'patient');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_toolAmount',
+			boxLabel  : '工具件数',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'toolAmount');
+			}
+		}, {
+			xtype : 'checkboxfield',
+			id: 'cmp_implantAmount',
+			boxLabel  : '植入物件数',
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,'implantAmount');
+			}
 		} ],
 		buttons : [ {
 			id : 'pre',
@@ -257,19 +326,7 @@
 				hideMessageBox(true);
 				var result = Ext4.JSON.decode(response.responseText);
 				if (result.success && result.data) {
-					// top.Ext4.ComponentQuery.query("#configForm
-					// #id")[0].setValue(result.data.id);
-					// top.Ext4.ComponentQuery.query("#configForm
-					// #name")[0].setValue(result.data.name);
 					currentConfig = result.data;
-					// top.Ext4.ComponentQuery.query("#configForm
-					// #width")[0].setValue(result.data.width);
-					// top.Ext4.ComponentQuery.query("#configForm
-					// #height")[0].setValue(result.data.height);
-					// top.Ext4.ComponentQuery.query("#configForm
-					// #description")[0].setValue(result.data.description);
-					// top.Ext4.ComponentQuery.query("#configForm
-					// #programCodes")[0].setValue(result.data.programCodes);
 					DisplayDesign();
 //					restoreDesign();
 				} else {