Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp
===================================================================
diff -u -r24210 -r24242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp (.../sterilisationView.jsp) (revision 24210)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp (.../sterilisationView.jsp) (revision 24242)
@@ -12,8 +12,12 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/include_Ext42_Js.jsp"%>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js
===================================================================
diff -u -r24092 -r24242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js (.../sterilisationView.js) (revision 24092)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js (.../sterilisationView.js) (revision 24242)
@@ -180,7 +180,7 @@
}
});
DWREngine.setAsync(true);
- defaultPrint(barcode,name,unit);
+ print_sterilisationMethod(barcode,name,unit,'preview');
}
}else{
MsgTip.msg('提示','未选择打印的内容!',true,3);
@@ -222,4 +222,19 @@
} ]
});
- });
\ No newline at end of file
+ });
+
+function print_sterilisationMethod(barcode,name,unitName,printType) {
+ var obj = {
+ barcode:barcode,
+ name:name,
+ unitName:unitName,
+ defaultPrintFun: function(){
+ defaultPrint(barcode,name,unitName);
+ },
+ dataSourceName: '灭菌程序',
+ styleName: '默认',
+ _printType: printType
+ }
+ printObjWithdefaultPrintFun(obj);
+};
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp
===================================================================
diff -u -r24210 -r24242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp (.../cleanMethodView.jsp) (revision 24210)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp (.../cleanMethodView.jsp) (revision 24242)
@@ -10,8 +10,12 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/include_Ext42_Js.jsp"%>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js
===================================================================
diff -u -r12331 -r24242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js (.../cleanMethodView.js) (revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.js (.../cleanMethodView.js) (revision 24242)
@@ -140,7 +140,7 @@
}
});
DWREngine.setAsync(true);
- defaultPrint(barcode,name,unit);
+ print_cleanMethod(barcode,name,unit,'preview');
}
}else{
MsgTip.msg('提示','未选择打印的内容!',true,3);
@@ -182,4 +182,19 @@
} ]
});
- });
\ No newline at end of file
+ });
+
+function print_cleanMethod(barcode,name,unitName,printType) {
+ var obj = {
+ barcode:barcode,
+ name:name,
+ unitName:unitName,
+ defaultPrintFun: function(){
+ defaultPrint(barcode,name,unitName);
+ },
+ dataSourceName: '清洗程序',
+ styleName: '默认',
+ _printType: printType
+ }
+ printObjWithdefaultPrintFun(obj);
+};
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
===================================================================
diff -u -r24092 -r24242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js (.../sterilisationForm.js) (revision 24092)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js (.../sterilisationForm.js) (revision 24242)
@@ -282,10 +282,10 @@
});
DWREngine.setAsync(true);
if(type == 0){//直接打印
- defaultPrint(barcodeStr,name,unit);
+ print_sterilisationMethod(barcodeStr,name,unit,'print');
}else{//打印预览
var barcode = top.Ext.getCmp('barcode').getValue();
- preview(barcode,name,unit);
+ print_sterilisationMethod(barcode,name,unit,'preview');
}
}
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r24240 -r24242
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 24240)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 24242)
@@ -611,4 +611,40 @@
textForPreview: '妇幼医院'
})]
});
-objectDataSourceManager.registerDataSource(sterilizerDataSource);
\ No newline at end of file
+objectDataSourceManager.registerDataSource(sterilizerDataSource);
+// 清洗程序
+var cleanMethodDataSource = new ObjectDataSource({
+ name: '清洗程序',
+ objectProperties: [new ObjectDataSourceProperty({
+ propName: 'barcode',
+ displayName: '条码',
+ textForPreview: '010000110'
+ }),new ObjectDataSourceProperty({
+ propName: 'name',
+ displayName: '名字',
+ textForPreview: '清洗程序 P1'
+ }),new ObjectDataSourceProperty({
+ propName: 'unitName',
+ displayName: '单位名称',
+ textForPreview: '妇幼医院'
+ })]
+});
+objectDataSourceManager.registerDataSource(cleanMethodDataSource);
+//灭菌程序
+var sterilisationMethodDataSource = new ObjectDataSource({
+ name: '灭菌程序',
+ objectProperties: [new ObjectDataSourceProperty({
+ propName: 'barcode',
+ displayName: '条码',
+ textForPreview: '010000110'
+ }),new ObjectDataSourceProperty({
+ propName: 'name',
+ displayName: '名字',
+ textForPreview: '灭菌程序 P1'
+ }),new ObjectDataSourceProperty({
+ propName: 'unitName',
+ displayName: '单位名称',
+ textForPreview: '妇幼医院'
+ })]
+});
+objectDataSourceManager.registerDataSource(sterilisationMethodDataSource);
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js
===================================================================
diff -u -r13080 -r24242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js (.../cleanMethodForm.js) (revision 13080)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js (.../cleanMethodForm.js) (revision 24242)
@@ -142,10 +142,10 @@
});
DWREngine.setAsync(true);
if(type == 0){//直接打印
- defaultPrint(barcode,name,unit);
+ print_cleanMethod(barcode,name,unit,'print');
}else{//打印预览
var barcodeStr = top.Ext.getCmp('barcode').getValue();
- preview(barcodeStr,name,unit);
+ print_cleanMethod(barcodeStr,name,unit,'preview');
}
}