Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomForm.js
===================================================================
diff -u -r27230 -r34242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomForm.js (.../operationRoomForm.js) (revision 27230)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomForm.js (.../operationRoomForm.js) (revision 34242)
@@ -137,6 +137,7 @@
id : 'parentOperationRoom',
fieldLabel : '上级手术间',
anchor : '95%',
+ height:22,
value : parentOperationRoom,
disabled : true,
cls:'fieldReadOnlyNoRemove',
@@ -199,12 +200,42 @@
}
}
}]
+ },{
+ columnWidth : 1,
+ layout : 'form',
+ labelAlign:"right",
+ items:[{
+ xtype : 'textfield',
+ name : 'barcode',
+ id : 'barcode',
+ fieldLabel : '条形码',
+ anchor : '95%',
+ height:22,
+ disabled : true,
+ cls:'fieldReadOnlyNoRemove',
+ allowBlank : true
+ }]
}]
}],
buttons : [{
+ text : '打印预览',
+ hidden:!id,
+ handler : function(){
+ var barcode = top.Ext.getCmp('barcode').getValue();
+ var name = top.Ext.getCmp('operationRoomName').getValue();
+ print_operationRoom(barcode,name,'',PRINT_TYPE_PREVIEW);
+ }
+ }, {
+ text : '打印',
+ hidden:!id,
+ handler : function(){
+ var barcode = top.Ext.getCmp('barcode').getValue();
+ var name = top.Ext.getCmp('operationRoomName').getValue();
+ print_operationRoom(barcode,name,'');
+ }
+ }, {
text : '保存',
id : 'saveBtn',
-// hidden : id ? SSTS_IPAndOrgUnitMapping_Update : false, //如果没有修改的权限，隐藏此按钮，因为用户可能通过点击链接来修改
handler : save
}, {
text : '取消',
@@ -235,6 +266,7 @@
success : function(form, action) {
var data = action.result.data;
top.Ext.getCmp('orgUnit').setValue(data.orgUnitName);
+ top.Ext.getCmp('barcode').setValue(data.barcodeDevice?data.barcodeDevice.barcode:'');
},
failure : function(form, action) {
}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp
===================================================================
diff -u -r29513 -r34242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp (.../operationRoom.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp (.../operationRoom.jsp) (revision 34242)
@@ -1,6 +1,8 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/include_Ext42_Js.jsp"%>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
手术间管理
@@ -11,6 +13,10 @@
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomView.js
===================================================================
diff -u -r18022 -r34242
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomView.js (.../operationRoomView.js) (revision 18022)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomView.js (.../operationRoomView.js) (revision 34242)
@@ -116,7 +116,23 @@
alert('请输入手术间名称！');
}
}
-
+function print_operationRoom(barcode, name, unitName, printType) {
+ var obj = {
+ barcode: barcode,
+ name: name,
+ unitName: unitName,
+ defaultPrintFun: function () {
+ if(printType == PRINT_TYPE_PREVIEW){
+ preview(barcode,name,unitName);
+ }else{
+ defaultPrint(barcode,name,unitName);
+ }
+ },
+ dataSourceName: '手术间',
+ styleName: '默认'
+ }
+ printObjWithdefaultPrintFun(obj);
+};
Ext.onReady(function(){
Ext.QuickTips.init();
@@ -138,6 +154,8 @@
},{
name : 'parentOperationRoomCoding'
},{
+ name : 'barcodeDevice'
+ },{
name : 'isInvoice'
}];
var tbar = [{
@@ -158,6 +176,22 @@
handler : function() {
deleteOperationRoom(grid);
}
+ }, '-', {
+ text : '打印条码',
+ iconCls : 'icon_print',
+ handler:function (){
+ var sm = grid.getSelectionModel();
+ if(sm.getSelected()){
+ var recs=sm.getSelections();
+ for(var i=0;i