Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js
===================================================================
diff -u -r30710 -r30712
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30710)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30712)
@@ -25,7 +25,6 @@
 		]
 	}
 };
-
 var appropriationOutListConfig = {
 	headerFooter: [
 		// 页眉名称
@@ -53,7 +52,6 @@
 		]
 	}
 };
-
 var appropriationListConfig = {
 	headerFooter: [
 		// 页眉名称
@@ -81,7 +79,6 @@
 		]
 	}
 }
-
 var godownEntryOutListConfig = {
 	headerFooter: [
 		// 页眉名称
@@ -107,7 +104,6 @@
 		]
 	}
 }
-
 var godownStockTakeListConfig = {
 	headerFooter: [
 		// 页眉名称
@@ -133,7 +129,6 @@
 		]
 	}
 }
-
 var godownEntryListPrintConfig = {
 	headerFooter: [
 		// 页眉名称
@@ -217,7 +212,6 @@
 		}
 	]
 }
-
 var batchPrintMaterialInvoicesConfig = {
 	headerFooter: [
 		// 页眉名称
@@ -450,7 +444,6 @@
 	}
 
 }
-
 var appropriationConfig = {
 	headerFooter: [
 		// 标题
@@ -531,7 +524,6 @@
 		]
 	}
 }
-
 var materialEntryConfig = {
 	headerFooter: [
 		// 标题
@@ -570,7 +562,6 @@
 		]
 	}
 }
-
 // 一次性物品盘盈盘亏单
 var godownStockTakeConfig = {
 	headerFooter: [
@@ -626,7 +617,6 @@
 		]
 	}
 }
-
 // 一次性物品入库单
 var godownEntryConfig = {
 	headerFooter: [
@@ -681,7 +671,6 @@
 		]
 	}
 }
-
 var purchasePlanConfig = {
 	headerFooter: [
 		// 标题
@@ -720,7 +709,6 @@
 		]
 	}
 }
-
 // 加大标签配置，100x100mm
 var exLargeLabelConfig = {
 	headerContent: [
@@ -807,7 +795,6 @@
 		]
 	}
 }
-
 var foreignTousseMiddleLableConfig = {
 	customPrint: printForeignTousseMiddleLable_gzzyyfs
 }
@@ -893,10 +880,180 @@
 	LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT", "Full-Page");
 }
 
+/**
+ * 定制标识牌中标签的打印格式
+ */
+var idCardMiddleLabelConfig = {
+	customPrint: printIDCardMiddleLabel_zsdxfsdeyy
+}
+
+function printIDCardMiddleLabel_zsdxfsdeyy(idCardInstance) {
+	if (isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)) {
+		alert('包定义不能为空!');
+		return;
+	}
+	doGetLodop();
+	var barcode = idCardInstance.barcode;
+	var date = idCardInstance.printDate;
+	var name = idCardInstance.tousseDefinition.name;
+	var packageType = idCardInstance.tousseDefinition.packageType;
+	var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod;
+	var userName = idCardInstance.userName;
+	var unit = idCardInstance.unit;
+	var description = idCardInstance.description;
+	var idCardQuestionList = idCardInstance.idCardQuestionList;
+	var tableHtml = "<table border ='0' width='260px' align='center' cellspacing=0>";
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='6' style='font-size: 25px;' border='0'><center><B>" + name + "</B></center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "</table>";
+	tableHtml += "<table border ='1' width='340px' align='center' cellspacing=0>";
+	tableHtml += "<tr>";
+	tableHtml += "<td style='font-size: 15px;' width='150px'><center>器械名称</center></td>";
+	tableHtml += "<td style='font-size: 15px;' width='40px' align='center'>数量</td>";
+	tableHtml += "<td style='font-size: 15px;' width='150px'><center>器械名称</center></td>";
+	tableHtml += "<td style='font-size: 15px;' width='40px' align='center'>数量</td>";
+	tableHtml += "</tr>";
+
+	var materials = [];
+	if (!isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition) && !isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.materialInstances)) {
+		materials = idCardInstance.tousseDefinition.materialInstances;
+	}
+	var total = materials.length;
+	var isEven = true;  //判断材料的数量是奇数还是偶数
+	if (total % 2 != 0) {
+		isEven = false;
+		total++;
+	}
+	total /= 2;
+	var amount = 0;
+	//之所以用这种方式是因为用户习惯从上往下清点材料，而不是从左往右
+	for (var i = 0; i < total; i++) {
+		var materialInstance = materials[i];
+		var materialDefinition = materials[i].materialDefinition;
+		var materialName = materialDefinition.name;
+		var specification = materialDefinition.specification;
+		var type = materialDefinition.type;
+		if (specification != 'null' && specification != "") {
+			materialName += "[" + specification + "]";
+		}
+		var count = materialInstance.count;
+		if (type != '一次性物品') {
+			amount += parseInt(count);
+		}
+
+		tableHtml += "<tr>";
+		tableHtml += "<td style='font-size: 15px;' align='left'>" + materialName;
+		tableHtml += "</td><td style='font-size: 15px;' align='center'><center>" + count + "</center></td>";
+
+		if (i == total - 1 && !isEven) {
+			tableHtml += "<td style='font-size: 15px' align='left'></td>";
+			tableHtml += "<td style='font-size: 15px' align='center'><center></center></td>";
+		} else {
+			var record2 = materials[i + total];
+			var materialName2 = record2.materialDefinition.name;
+			var specification2 = record2.materialDefinition.specification;
+			var type2 = record2.materialDefinition.type;
+			if (specification2 != 'null' && specification2 != "") {
+				materialName2 += "[" + specification2 + "]";
+			}
+			var count2 = record2.count;
+			if (type2 != '一次性物品') {
+				amount += parseInt(count2);
+			}
+			tableHtml += "<td style='font-size: 15px;' align='left'>" + materialName2;
+			tableHtml += "</td><td style='font-size: 15px;' align='center'><center>" + count2 + "</center>";
+			tableHtml += "</td>";
+		}
+
+		tableHtml += "</tr>";
+	}
+
+	if (description !== null) {
+		//打印备注
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' height='25px'>" + description + "</td>";
+		tableHtml += "</tr>";
+	}
+
+	if (idCardQuestionList && idCardQuestionList.length > 0) {
+		for (var i = 0; i < idCardQuestionList.length; i++) {
+			var html = idCardQuestionList[i].serialNumber + '.' + idCardQuestionList[i].registTime + ' ' + idCardQuestionList[i].question + ' ' + idCardQuestionList[i].registUser + '/' + idCardQuestionList[i].discoverUser + '\n';
+			tableHtml += "<tr>";
+			tableHtml += "<td colspan='4' style='word-wrap:break-word;word-break:break-all;border-top:0'>" + html + "</td>";
+			tableHtml += "</tr>";
+		}
+	}
+
+	tableHtml += "</table>";
+
+	tableHtml += "<table border ='0' width='340px' align='center' cellspacing=0>";
+	//条码，打印人和时间和器械数量
+	if (barcode != '' && userName != '' && date != '') {
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' rowspan='3' style='font-size: 12px;' align='center'>";
+		tableHtml += "<img src='" + getPrintBarcodeURL({ barcode: barcode }) + "'/>";
+		tableHtml += "</br><center>" + barcode;
+		tableHtml += "</center></td>";
+		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: bottom;' align='left' border='0'>包装类型：" + packageType;
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' style='font-size: 15px;' align='left' border='0'>灭菌程序：" + sterilingMethod;
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: top;' align='center' border='0'>器械总数量:" + amount + "件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+	} else {
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>包装类型：" + packageType;
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>灭菌程序：" + sterilingMethod;
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>器械总数量：" + amount + "件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+	}
+
+	//告警语
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='4' style='font-size: 23px;font-weight:bold;' border='0'><center><B>*需要回收，切勿丢失*</B></center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "</table>";
+
+	//上油记录
+	tableHtml += "<table border ='1' width='340px' align='center' cellspacing=0 style='margin-top:10px'>";
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='10' style='font-size: 22px;' border='0'><center>上油记录</center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "<tr>";
+	for (var i = 0; i < 4; i++) {
+		tableHtml += "<td width='40px' style='font-size: 12px;' align='center'>日期</td>";
+		tableHtml += "<td width='40px' style='font-size: 12px;' align='center'>上油者</td>";
+	}
+	tableHtml += "</tr>";
+	for (var i = 0; i < 7; i++) {
+		tableHtml += "<tr>";
+		for (var j = 0; j < 8; j++) {
+			tableHtml += "<td height='38px'></td>";
+		}
+		tableHtml += "</tr>";
+	}
+	tableHtml += "</table>";
+
+	LODOP.ADD_PRINT_HTM(0, 0, "98%", "100%", "<body leftmargin='8px' topmargin=0>" + tableHtml + "</body>");
+	LODOP.PRINT();
+}
+
 var foreignTousseLargeLabelConfig = {
 	customPrint: foreignTousseLargeLabel_gzzyyfs
 }
-
 function foreignTousseLargeLabel_gzzyyfs(printSummaryObj) {
 	var name = printSummaryObj.name;
 	var barcode = printSummaryObj.barcode;
@@ -995,7 +1152,6 @@
 	LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", "<body leftmargin=0 topmargin=0>" + tableHtml + "</body>");
 	LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT", "Full-Page");
 }
-
 var foreignProxyDisinfectionLabelConfig = {
 	// 可带表格线的table定义
 	table: {
@@ -1114,179 +1270,7 @@
 		}
 	]
 }
-
 /**
- * 定制标识牌中标签的打印格式
- */
-var idCardMiddleLabelConfig = {
-	customPrint: printIDCardMiddleLabel_zsdxfsdeyy
-}
-
-function printIDCardMiddleLabel_zsdxfsdeyy(idCardInstance) {
-	if (isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)) {
-		alert('包定义不能为空!');
-		return;
-	}
-	doGetLodop();
-	var barcode = idCardInstance.barcode;
-	var date = idCardInstance.printDate;
-	var name = idCardInstance.tousseDefinition.name;
-	var packageType = idCardInstance.tousseDefinition.packageType;
-	var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod;
-	var userName = idCardInstance.userName;
-	var unit = idCardInstance.unit;
-	var description = idCardInstance.description;
-	var idCardQuestionList = idCardInstance.idCardQuestionList;
-	var tableHtml = "<table border ='0' width='380px' align='center' cellspacing=0>";
-	tableHtml += "<tr>";
-	tableHtml += "<td colspan='6' style='font-size: 25px;' border='0'><center><B>" + name + "</B></center></td>";
-	tableHtml += "</tr>";
-	tableHtml += "</table>";
-	tableHtml += "<table border ='1' width='380px' align='center' cellspacing=0>";
-	tableHtml += "<tr>";
-	tableHtml += "<td style='font-size: 15px;' width='150px'><center>器械名称</center></td>";
-	tableHtml += "<td style='font-size: 15px;' width='40px' align='center'>数量</td>";
-	tableHtml += "<td style='font-size: 15px;' width='150px'><center>器械名称</center></td>";
-	tableHtml += "<td style='font-size: 15px;' width='40px' align='center'>数量</td>";
-	tableHtml += "</tr>";
-
-	var materials = [];
-	if (!isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition) && !isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.materialInstances)) {
-		materials = idCardInstance.tousseDefinition.materialInstances;
-	}
-	var total = materials.length;
-	var isEven = true;  //判断材料的数量是奇数还是偶数
-	if (total % 2 != 0) {
-		isEven = false;
-		total++;
-	}
-	total /= 2;
-	var amount = 0;
-	//之所以用这种方式是因为用户习惯从上往下清点材料，而不是从左往右
-	for (var i = 0; i < total; i++) {
-		var materialInstance = materials[i];
-		var materialDefinition = materials[i].materialDefinition;
-		var materialName = materialDefinition.name;
-		var specification = materialDefinition.specification;
-		var type = materialDefinition.type;
-		if (specification != 'null' && specification != "") {
-			materialName += "[" + specification + "]";
-		}
-		var count = materialInstance.count;
-		if (type != '一次性物品') {
-			amount += parseInt(count);
-		}
-
-		tableHtml += "<tr>";
-		tableHtml += "<td style='font-size: 15px;' align='left'>" + materialName;
-		tableHtml += "</td><td style='font-size: 15px;' align='center'><center>" + count + "</center></td>";
-
-		if (i == total - 1 && !isEven) {
-			tableHtml += "<td style='font-size: 15px' align='left'></td>";
-			tableHtml += "<td style='font-size: 15px' align='center'><center></center></td>";
-		} else {
-			var record2 = materials[i + total];
-			var materialName2 = record2.materialDefinition.name;
-			var specification2 = record2.materialDefinition.specification;
-			var type2 = record2.materialDefinition.type;
-			if (specification2 != 'null' && specification2 != "") {
-				materialName2 += "[" + specification2 + "]";
-			}
-			var count2 = record2.count;
-			if (type2 != '一次性物品') {
-				amount += parseInt(count2);
-			}
-			tableHtml += "<td style='font-size: 15px;' align='left'>" + materialName2;
-			tableHtml += "</td><td style='font-size: 15px;' align='center'><center>" + count2 + "</center>";
-			tableHtml += "</td>";
-		}
-
-		tableHtml += "</tr>";
-	}
-
-	if (description !== null) {
-		//打印备注
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' height='25px'>" + description + "</td>";
-		tableHtml += "</tr>";
-	}
-
-	if (idCardQuestionList && idCardQuestionList.length > 0) {
-		for (var i = 0; i < idCardQuestionList.length; i++) {
-			var html = idCardQuestionList[i].serialNumber + '.' + idCardQuestionList[i].registTime + ' ' + idCardQuestionList[i].question + ' ' + idCardQuestionList[i].registUser + '/' + idCardQuestionList[i].discoverUser + '\n';
-			tableHtml += "<tr>";
-			tableHtml += "<td colspan='4' style='word-wrap:break-word;word-break:break-all;border-top:0'>" + html + "</td>";
-			tableHtml += "</tr>";
-		}
-	}
-
-	tableHtml += "</table>";
-
-	tableHtml += "<table border ='0' width='380px' align='center' cellspacing=0>";
-	//条码，打印人和时间和器械数量
-	if (barcode != '' && userName != '' && date != '') {
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='2' rowspan='3' style='font-size: 12px;' align='center'>";
-		tableHtml += "<img src='" + getPrintBarcodeURL({ barcode: barcode }) + "'/>";
-		tableHtml += "</br><center>" + barcode;
-		tableHtml += "</center></td>";
-		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: bottom;' align='left' border='0'>包装类型：" + packageType;
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='2' style='font-size: 15px;' align='left' border='0'>灭菌程序：" + sterilingMethod;
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: top;' align='center' border='0'>器械总数量:" + amount + "件";
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-	} else {
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>包装类型：" + packageType;
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>灭菌程序：" + sterilingMethod;
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>器械总数量：" + amount + "件";
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-	}
-
-	//告警语
-	tableHtml += "<tr>";
-	tableHtml += "<td colspan='4' style='font-size: 23px;font-weight:bold;' border='0'><center><B>*需要回收，切勿丢失*</B></center></td>";
-	tableHtml += "</tr>";
-	tableHtml += "</table>";
-
-	//上油记录
-	tableHtml += "<table border ='1' width='380px' align='center' cellspacing=0 style='margin-top:10px'>";
-	tableHtml += "<tr>";
-	tableHtml += "<td colspan='10' style='font-size: 22px;' border='0'><center>上油记录</center></td>";
-	tableHtml += "</tr>";
-	tableHtml += "<tr>";
-	for (var i = 0; i < 4; i++) {
-		tableHtml += "<td width='40px' style='font-size: 12px;' align='center'>日期</td>";
-		tableHtml += "<td width='40px' style='font-size: 12px;' align='center'>上油者</td>";
-	}
-	tableHtml += "</tr>";
-	for (var i = 0; i < 7; i++) {
-		tableHtml += "<tr>";
-		for (var j = 0; j < 8; j++) {
-			tableHtml += "<td height='38px'></td>";
-		}
-		tableHtml += "</tr>";
-	}
-	tableHtml += "</table>";
-
-	LODOP.ADD_PRINT_HTM(0, 0, "98%", "100%", "<body leftmargin='8px' topmargin=0>" + tableHtml + "</body>");
-	LODOP.PRINT();
-}
-
-/**
  * 器械包管理界面的包定义材料清单
  */
 var tousseDefinitionMaterialsConfig_qifuyy = {
@@ -1320,7 +1304,6 @@
 
 	LODOP.ADD_PRINT_HTM(0, 0, "95%", "100%", "<body leftmargin='8px' topmargin=0>" + tableHtml + "</body>");
 }
-
 var printConfig = {
 	//发货计划单
 	invoicePlan: invoicePlanPrintConfig,
@@ -1365,8 +1348,6 @@
 	foreignProxyDisinfectionLabel: foreignProxyDisinfectionLabelConfig,
 	//外来器械申请单
 	foreignTousseAppliation: foreignTousseAppliationPrintConfig,
-	//定制标识牌中标签的打印格式
-	idCardMiddleLabel: idCardMiddleLabelConfig,
 	// 入库单列表
 	godownEntryList: godownEntryListPrintConfig,
 	//盘盈盘亏列表
@@ -1375,10 +1356,23 @@
 	godownEntryOutList: godownEntryOutListConfig,
 	//调拨单
 	appropriationList: appropriationListConfig,
+	//定制标识牌中标签的打印格式
+	idCardMiddleLabel: idCardMiddleLabelConfig,
 	//调拨入库单
 	appropriationInList: appropriationInListConfig,
 	//调拨出库单
 	appropriationOutList: appropriationOutListConfig,
 	//打印器械包明细单
-	tousseDefinitionMaterials: tousseDefinitionMaterialsConfig_qifuyy
+	tousseDefinitionMaterials: tousseDefinitionMaterialsConfig_qifuyy,
+	//标识牌打印配置，可设置标识牌打印的logo文件名、打印纸张的类型及大小、材料明细表格的位置
+	idcardPrintConfig: {
+		//logo图片文件名，位于ROOT/disinfectsystem/config/${projectName}/img文件夹
+		"logoFileName": "logo_idcard.png",
+		//logo图片打印的位置，上边距，左边距，宽度，高度
+		"logoPosition": [10, 5, "70mm", "14.55mm"],
+		//设置纸张类型为连续纸，纸张宽度为100mm，打印完毕后的下边距为50mm
+		"pageSize": [3, "100mm", "50mm", "CreateCustomPage"],
+		//材料明细表格的位置
+		"tablePosition": ["20mm", 10, "95%", "100%"]
+	}
 };
\ No newline at end of file