Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r35529 -r35541
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 35529)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 35541)
@@ -1247,6 +1247,30 @@
}
}
}]
+ }, {
+ layout: 'form',
+ labelWidth: 180,
+ columnWidth: .25,
+ hidden: SSTS_WriteSign_manager,
+ items: [{
+ xtype: 'combo',
+ fieldLabel: '手写签名方式',
+ id: 'handWrittenSignatureMode',
+ name: 'handWrittenSignatureMode',
+ valueField: 'value',
+ displayField: 'value',
+ mode: 'local',
+ anchor: '100%',
+ editable: false,
+ store: new Ext.data.SimpleStore({
+ fields: ['value'],
+ data: [['只允许手写签名'], ['支持扫码加载']]
+ }),
+ forceSelection: true,
+ allowBlank: true,
+ value:'只允许手写签名',
+ triggerAction: 'all'
+ }]
}
]
}, {
@@ -3582,6 +3606,12 @@
dashboardsQueryCycle = Ext.getCmp("dashboardsQueryCycle").getValue();
}
+ var handWrittenSignatureMode = '只允许手写签名';
+ if(!SSTS_WriteSign_manager){
+ handWrittenSignatureMode = Ext.getCmp("handWrittenSignatureMode").getValue();
+ }
+
+
var myMask = new Ext.LoadMask(Ext.getBody(), { msg: "正在保存..." });
myMask.show();
@@ -3680,6 +3710,7 @@
autoSignAfterPutInStorage:autoSignAfterPutInStorage,
noOperationTime:noOperationTime,
dashboardsQueryCycle:dashboardsQueryCycle,
+ handWrittenSignatureMode:handWrittenSignatureMode,
dashboardsScreenSaver:dashboardsScreenSaver,
receiptor: receiptor //自动签收发货单的签收人名字
},
@@ -3963,6 +3994,9 @@
if(supplyRoomConfig.dashboardsQueryCycle){
Ext.getCmp('dashboardsQueryCycle').setValue(supplyRoomConfig.dashboardsQueryCycle);
}
+ if(!SSTS_WriteSign_manager){
+ Ext.getCmp('handWrittenSignatureMode').setValue(supplyRoomConfig.handWrittenSignatureMode || '');
+ }
var isFtOnlyImplantConvert = (supplyRoomConfig.isFtOnlyImplantConvert == true || supplyRoomConfig.isFtOnlyImplantConvert == 'true')?'是':'否';
Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
===================================================================
diff -u -r29300 -r35541
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js (.../invoiceSignViewVersion2.js) (revision 29300)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js (.../invoiceSignViewVersion2.js) (revision 35541)
@@ -22,8 +22,30 @@
grid.dwrReload();
}
+function showImagePanel(objectId) {
+ var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getImage.do?objectId='+objectId+'&page=1&imageType='+encodeURIComponent("PDA端签收签名(横屏版)")+'&showSourceImg=true' + '&time=' + new Date().getTime();
+ var imageBrowse = Ext.get('imageBrowse');
+ var img = imageBrowse.dom;
+ img.src = url;
+ img.onload = function () {
+ if (img.width > img.height) {
+ img.style.height = '100%';
+ img.style.width = 'auto';
+ } else {
+ img.style.height = 'auto';
+ img.style.width = '100%';
+ }
+ img.style.display = 'block';
+ };
+}
+
Ext.onReady(function() {
Ext4.tip.QuickTipManager.init();
+ var enableHandwrittenSignatureFunction = sstsConfig.enableHandwrittenSignatureFunction;
+ var height = document.body.clientHeight-60;
+ if(enableHandwrittenSignatureFunction){
+ height = document.body.clientHeight - 360;
+ }
var readerDetail = [
{name : 'id'},
{name : 'signUserName'},
@@ -81,14 +103,22 @@
}, [
{name : 'tousseName'},
{name : 'barcode'},
+ {name : 'id'},
{name : 'amount'}
])
});
invoiceSignDetailStore.on("beforeload", function(thiz, options) {
thiz.baseParams["signRecordId"] = invoiceSignRecordId;
});
+ invoiceSignDetailStore.on("load", function (store, recordArry, options) {
+ if(recordArry.length > 0){
+ if(enableHandwrittenSignatureFunction){
+ var id = recordArry[0].data.id
+ showImagePanel(id);
+ }
+ }
+ });
-
var invoiceSignDetailStoreCm = new Ext.grid.ColumnModel([
{header : "物品名称",dataIndex : 'tousseName',width : 190},
{header : "器械包条码",dataIndex :'barcode',width : 80},
@@ -101,13 +131,21 @@
store : invoiceSignDetailStore,
cm : invoiceSignDetailStoreCm,
enableHdMenu : false,
- width :423,
- height :425,
loadMask : true,
+ height:height,
autoExpandColumn : 'amount',
frame : false,
enableKeyEvents: true,
bodyStyle : 'border:1px solid #afd7af',
+ listeners: {
+ 'rowclick': function(grid, rowIndex, e) {
+ if(enableHandwrittenSignatureFunction){
+ var id = invoiceSignDetailStore.getAt(rowIndex).data.id;
+ showImagePanel(id)
+ }
+
+ }
+ },
viewConfig: {
forceFit:true
}
@@ -172,7 +210,47 @@
xtype : 'panel',
layout: 'fit',
width: "33%",
- items:centerGrid
+ height: document.body.clientHeight,
+ items:[{
+ region:'vbox',
+ height: document.body.clientHeight,
+ items:[{
+ flex:1,
+ height: height,
+ width:'100%',
+ items:centerGrid
+ },{
+ flex:2,
+ width:'100%',
+ height:300,
+ hidden:!enableHandwrittenSignatureFunction,
+ items:[new Ext.Panel({
+ title:'手写签名',
+ items: [{
+ xtype: 'panel',
+ id: 'pageToolbar',
+ }, new Ext.Panel({
+ id: 'imagePanel',
+ layout: 'fit',
+ height:270,
+ style:'text-align: center;',
+ items: [{
+ xtype: 'box',
+ id: 'browseImage',
+ fieldLabel: "预览图片",
+ autoEl: {
+ id: 'imageBrowse',
+ tag: 'img',
+ autoHeight: true,
+ src: '',
+ style: 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);display: none;margin:0 auto',
+ complete: 'off'
+ }
+ }]
+ })]
+ })]
+ }]
+ }]
},{
region:'east',
xtype : 'panel',
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r35217 -r35541
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 35217)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 35541)
@@ -749,6 +749,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r35124 -r35541
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 35124)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 35541)
@@ -73,6 +73,16 @@
SSTS_RealTimeDashboards = false;
}
+
+/**
+ * 《手写签名功能管理》菜单
+ */
+ var SSTS_WriteSign_manager = true;
+
+ if (sstsConfig.enableHandwrittenSignatureFunction) {
+ SSTS_WriteSign_manager = false;
+ }
+
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
===================================================================
diff -u -r35029 -r35541
--- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js (.../config.js) (revision 35029)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js (.../config.js) (revision 35541)
@@ -98,6 +98,8 @@
loginSecurirtyConfig: {"loginFailuresCount":5 , "lockTimeInMinutes": 15, "sessionTimeout": 30},
//启用数据实时看板功能
enableRealTimeDashboardsForDataFunction:true,
+ //是否启用手写签名功能
+ enableHandwrittenSignatureFunction:true,
//外来器械申请单默认科室配置
foreignTousseAppliationDefaultDepartment:{
'0316':{// 登录人所在的科室编码