Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp
===================================================================
diff -u -r22295 -r23432
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp (.../expensiveGoodsGodownEntryView.jsp) (revision 22295)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp (.../expensiveGoodsGodownEntryView.jsp) (revision 23432)
@@ -27,12 +27,14 @@
+
+
+<%@ include file="/disinfectsystem/print/print.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r23424 -r23432
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 23424)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 23432)
@@ -460,4 +460,30 @@
})]
});
objectDataSourceManager.registerDataSource(idCardDataSource);
+// 高值耗材
+var expensiveGoodsDataSource = new ObjectDataSource({
+ name: '高值耗材',
+ objectProperties: [new ObjectDataSourceProperty({
+ propName: 'barcode',
+ displayName: '条码',
+ textForPreview: '010000110'
+ }),new ObjectDataSourceProperty({
+ propName: 'name',
+ displayName: '名字',
+ textForPreview: '耗材一'
+ }),new ObjectDataSourceProperty({
+ propName: 'expDate',
+ displayName: '失效期',
+ textForPreview: '2018-05-29'
+ }),new ObjectDataSourceProperty({
+ propName: 'supplierName',
+ displayName: '供应商',
+ textForPreview: '新华'
+ }),new ObjectDataSourceProperty({
+ propName: 'specification',
+ displayName: '规格',
+ textForPreview: '1个每包'
+ })]
+});
+objectDataSourceManager.registerDataSource(expensiveGoodsDataSource);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r23219 -r23432
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 23219)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 23432)
@@ -569,6 +569,10 @@
}
}
});
+ var expensiveGoodsPaperTypeStore = new Ext.data.JsonStore({
+ fields : [ 'name'],
+ url : WWWROOT + '/disinfectSystem/labelTemplateAction!getAllExpensiveGoodsPaperTypeStore.do'
+ });
var tabsItemArr = new Array();
@@ -973,6 +977,30 @@
}]
},{
layout:'form',
+ labelWidth : 180,
+ columnWidth: .25,
+ items:[{
+ xtype : 'combo',
+ fieldLabel : '高值耗材打印标签',
+ id : 'expensiveGoodsPaperType',
+ name : 'expensiveGoodsPaperType',
+ valueField : 'name',
+ displayField : 'name',
+// store : new Ext.data.SimpleStore( {
+// fields : [ 'value'],
+// data : [['大标签'],['中标签'],['小标签']]
+// }),
+ store:expensiveGoodsPaperTypeStore,
+// mode : 'local',
+ editable : false,
+ forceSelection : true,
+ editable :false,
+ allowBlank : false,
+ triggerAction : 'all',
+ anchor : '100%'
+ }]
+ },{
+ layout:'form',
labelWidth : fontSize == 12 ? 180 : 210,
labelAlign:"right",
columnWidth: .25,
@@ -2533,6 +2561,7 @@
showResult('外来器械包打印标签不能为空！');
return false;
}
+ var expensiveGoodsPaperType = Ext.getCmp("expensiveGoodsPaperType").getValue();
var bigPackageSterilizerType = Ext.getCmp("bigPackageSterilizerType").getValue();
if(bigPackageSterilizerType == ""){
showResult('超大、重外来器械灭菌方式不能为空！');
@@ -2648,6 +2677,7 @@
autoSignInvoice : autoSignInvoice,//
bigPackageSterilizerType : bigPackageSterilizerType,//
barcodePaperType : barcodePaperType,//
+ expensiveGoodsPaperType : expensiveGoodsPaperType,//
basketLoadeTousseAmount : basketLoadeTousseAmount,//
customTousseDefaultTaskGroup : customTousseDefaultTaskGroup,//
customToussePrice : customToussePrice,//
@@ -2735,6 +2765,9 @@
if(supplyRoomConfig.barcodePaperType!=null){
Ext.getCmp('barcodePaperType').setValue(supplyRoomConfig.barcodePaperType);
}
+ if(supplyRoomConfig.expensiveGoodsPaperType!=null){
+ Ext.getCmp('expensiveGoodsPaperType').setValue(supplyRoomConfig.expensiveGoodsPaperType);
+ }
if(supplyRoomConfig.disposableGoodsExpTime!=null){
Ext.getCmp('disposableGoodsExpTime').setValue(supplyRoomConfig.disposableGoodsExpTime);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/commonExpensiveGoodsEntry.js
===================================================================
diff -u -r22252 -r23432
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/commonExpensiveGoodsEntry.js (.../commonExpensiveGoodsEntry.js) (revision 22252)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/commonExpensiveGoodsEntry.js (.../commonExpensiveGoodsEntry.js) (revision 23432)
@@ -232,6 +232,15 @@
this.printBarcode = function(items,saveAndPrintNew){
if(items!=null && items.length > 0){
// var exitBatch = true;
+ var printConfigPrefix = 'expensiveGoodsEntry';
+
+ DWREngine.setAsync(false);
+ SupplyRoomConfigTableManager.getExpensiveGoodsPaperType(function(type){
+ if(!isUndefinedOrNullOrEmpty(type)){
+ printConfigPrefix = type;
+ }
+ });
+ DWREngine.setAsync(true);
if(saveAndPrintNew){
for ( var i = 0; i < items.length; i++) {
var resultItem = items[i];
@@ -243,7 +252,16 @@
var model = resultItem.model;
// if(newBatch == true || newBatch == 'true'){
// exitBatch = false;
- printExpensiveGoodsInfo(barcode,name,expDate,supplierName,0,model);
+ var printSummaryObj = {
+ 'barcode': barcode,
+ 'name': name,
+ 'expDate': expDate,
+ 'supplierName': supplierName,
+ 'printType': 0,
+ printConfigPrefix: printConfigPrefix,
+ 'specification': model
+ }
+ printExpensiveGoodsInfo(printSummaryObj);
// }
}
// if(exitBatch){
@@ -258,7 +276,16 @@
var expDate = resultItem.expDate;
var supplierName = resultItem.supplierName;
var model = resultItem.model;
- printExpensiveGoodsInfo(barcode,name,expDate,supplierName,0,model);
+ var printSummaryObj = {
+ 'barcode': barcode,
+ 'name': name,
+ 'expDate': expDate,
+ 'supplierName': supplierName,
+ 'printType': 0,
+ printConfigPrefix: printConfigPrefix,
+ 'specification': model
+ }
+ printExpensiveGoodsInfo(printSummaryObj);
}
}
}else{
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r23418 -r23432
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 23418)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 23432)
@@ -2681,28 +2681,31 @@
LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
};
//打印高值耗材物品实例标签条码
-function printExpensiveGoodsInfo(barcode,name,expDate,supplierName,printType,specification) {
+function printExpensiveGoodsInfo(printSummaryObj) {
+
+ var barcode = printSummaryObj.barcode;
if (!isUndefinedOrNullOrEmpty(barcode)) {
- formTypeOfPrinted = 'expensiveGoodsEntry';
+
+ formTypeOfPrinted = printSummaryObj.printConfigPrefix;
+
+ if(isTemplatePageType(formTypeOfPrinted)){
+ if(invokeTemplatePrintFunction(formTypeOfPrinted,printSummaryObj)){
+ return;
+ }
+ }
+
doGetLodop();
LODOP.PRINT_INIT("");
setPrinterByConfig();
var myObj = printConfig[formTypeOfPrinted];
if(!isUndefinedOrNullOrEmpty(myObj)){
- var printSummaryObj = {
- 'barcode': barcode,
- 'name': name,
- 'expDate': expDate,
- 'supplierName': supplierName,
- 'printType': printType,
- 'specification': specification
- }
+
print2(printSummaryObj);
}else{
- createExpensivdGoodsInfo(barcode,name,expDate,supplierName,specification);
+ createExpensivdGoodsInfo(printSummaryObj);
}
- if(printType == 0){//直接打印
+ if(printSummaryObj.printType == 0){//直接打印
LODOP.PRINT();
}else{//打印预览
LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1);
@@ -2712,7 +2715,12 @@
alert("打印内容为空");
}
}
-function createExpensivdGoodsInfo(barcode,name,expDate,supplierName,specification) {
+function createExpensivdGoodsInfo(printSummaryObj) {
+ var barcode = printSummaryObj.barcode;
+ var name = printSummaryObj.name;
+ var expDate = printSummaryObj.expDate;
+ var supplierName = printSummaryObj.supplierName;
+ var specification = printSummaryObj.specification;
doGetLodop();
var tableHtml ="