Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r38099 -r38104
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 38099)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 38104)
@@ -3702,10 +3702,36 @@
customPrint: printBarcodeInformation_DisposablegoodsGodownentry_default
}
+ var arr = [];
+ for (var i = 0; i < allTemplateArray.length; ++i) {
+ var t = allTemplateArray[i];
+ if (t.dataSourceName == '条码信息') {
+ arr.push(t);
+ }
+ }
+
var configObj = printConfig['barcodeInformation_DisposablegoodsGodownentry'];
+
if (isUndefinedOrNullOrEmpty(configObj)) {
- configObj = barcodeInformation_DisposablegoodsGodownentry_default;
+ if (arr.length == 0) {
+ configObj = barcodeInformation_DisposablegoodsGodownentry_default;
+ }else {
+ var pageType = arr[0].fullName;
+ var infoObj = JSON.parse(barcodeInformation.information);
+ var obj = {
+ barcode:barcodeInformation.barcode,
+ disposableGoodsName:infoObj.disposableGoodsName || '',
+ price:infoObj.price || '',
+ supplierName:infoObj.supplierName || '',
+ certification:infoObj.certification || '',
+ hospitalName:infoObj.hospitalName || ''
+ }
+ if (invokeTemplatePrintFunction(pageType, obj)) {
+ return;
+ }
+ }
}
+
setPrinterByConfig();
// 自定义打印
if (!isUndefinedOrNullOrEmpty(configObj.customPrint)) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.jsp
===================================================================
diff -u -r29513 -r38104
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.jsp (.../barcodeInformation.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.jsp (.../barcodeInformation.jsp) (revision 38104)
@@ -8,7 +8,8 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
-
+<%@ include file="/common/includeExtJs4_2.jsp"%>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r37220 -r38104
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 37220)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 38104)
@@ -659,6 +659,36 @@
})]
});
objectDataSourceManager.registerDataSource(fixedBarcodeDataSource);
+// DGSETYY-96：条码信息
+var barcodeInfoDataSource = new ObjectDataSource({
+ name: '条码信息',
+ objectProperties: [new ObjectDataSourceProperty({
+ propName: 'barcode',
+ displayName: '条码',
+ textForPreview: '010000110'
+ }),new ObjectDataSourceProperty({
+ propName: 'disposableGoodsName',
+ displayName: '物品名称',
+ textForPreview: '物品'
+ }),new ObjectDataSourceProperty({
+ propName: 'price',
+ displayName: '价格',
+ textForPreview: '1.1'
+ }),new ObjectDataSourceProperty({
+ propName: 'supplierName',
+ displayName: '供应商',
+ textForPreview: '新华'
+ }),new ObjectDataSourceProperty({
+ propName: 'certification',
+ displayName: '注册证号',
+ textForPreview: '000000001'
+ }),new ObjectDataSourceProperty({
+ propName: 'hospitalName',
+ displayName: '医院名称',
+ textForPreview: '东莞市儿童医院'
+ })]
+});
+objectDataSourceManager.registerDataSource(barcodeInfoDataSource);
// 人员
var userDataSource = new ObjectDataSource({
name: '用户',