Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r36712 -r36771
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 36712)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 36771)
@@ -50,6 +50,11 @@
var tousseDeliverOccasionAfterPreRecycling = '<%=SupplyRoomConfig.TOUSSEDELIVEROCCASION_AFTERPRERECYCLING %>';
var tousseDeliverOccasionAfterRecycling = '<%=SupplyRoomConfig.TOUSSEDELIVEROCCASION_AFTERRECYCLING %>';
+//ZJYY-140：PDA归还交接手写签名：不启用、启用非必填、启用且必填
+var pdahandoversignature_disable = '<%=SupplyRoomConfig.PDAHANDOVERSIGNATURE_DISABLE %>';//不启用
+var pdahandoversignature_enableAndEmpty = '<%=SupplyRoomConfig.PDAHANDOVERSIGNATURE_ENABLEANDEMPTY %>';//启用非必填
+var pdahandoversignature_enableAndNotEmpty = '<%=SupplyRoomConfig.PDAHANDOVERSIGNATURE_ENABLEANDNOTEEMPTY %>';//启用且必填
+
//发货数量依据-发货单发货数量来源
var invoiceOriginApplication = '<%=SupplyRoomConfig.INVOICE_ORIGIN_APPLICATION %>';
var invoiceOriginRecycling = '<%=SupplyRoomConfig.INVOICE_ORIGIN_RECYCLING %>';
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r36707 -r36771
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 36707)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 36771)
@@ -1940,6 +1940,29 @@
allowBlank: true,
triggerAction: 'all'
}]
+ }, {
+ layout: 'form',
+ labelWidth: 150,
+ columnWidth: .25,
+ hidden:!sstsConfig.enableReturnHandoverOfForeignTousseFunction,
+ items: [{
+ xtype: 'combo',
+ fieldLabel: 'PDA归还交接手写签名',
+ id: 'pdaHandoverSignature',
+ name: 'pdaHandoverSignature',
+ valueField: 'value',
+ displayField: 'value',
+ mode: 'local',
+ anchor: '100%',
+ editable: false,
+ store: new Ext.data.SimpleStore({
+ fields: ['value'],
+ data: [[pdahandoversignature_disable], [pdahandoversignature_enableAndEmpty], [pdahandoversignature_enableAndNotEmpty]]
+ }),
+ forceSelection: true,
+ allowBlank: true,
+ triggerAction: 'all'
+ }]
}
]
@@ -3740,6 +3763,10 @@
var foreignTousseAppEndTime = Ext.getCmp("foreignTousseAppEndTime").getValue();
var isFtOnlyImplantConvert = Ext.getCmp("isFtOnlyImplantConvert").getValue();
+ var pdaHandoverSignature = '';
+ if(sstsConfig.enableReturnHandoverOfForeignTousseFunction){
+ pdaHandoverSignature = Ext.getCmp("pdaHandoverSignature").getValue();
+ }
var unitName = Ext.getCmp("unitName").getValue();
var basketLoadeTousseAmount = Ext.getCmp("basketLoadeTousseAmount").getValue();
var customTousseDefaultTaskGroup = Ext.getCmp("customTousseDefaultTaskGroup").getValue();
@@ -3875,6 +3902,7 @@
foreignTousseIsSecondRecycle: foreignTousseIsSecondRecycle,
foreignTousseAppEndTime: foreignTousseAppEndTime,
isFtOnlyImplantConvert: isFtOnlyImplantConvert,
+ pdaHandoverSignature: pdaHandoverSignature,
ftDefaultSterilingMethod: ftDefaultSterilingMethod,//
ftPrintOrgSource: ftPrintOrgSource,
ftPrintAmount: ftPrintAmount,
@@ -4226,6 +4254,7 @@
Ext.getCmp('foreignTousseIsSecondRecycle').setValue(supplyRoomConfig.foreignTousseIsSecondRecycle);
Ext.getCmp('foreignTousseAppEndTime').setValue(supplyRoomConfig.foreignTousseAppEndTime);
Ext.getCmp('isFtOnlyImplantConvert').setValue(isFtOnlyImplantConvert);
+ Ext.getCmp('pdaHandoverSignature').setValue(supplyRoomConfig.pdaHandoverSignature || pdahandoversignature_enableAndNotEmpty);
Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource);
Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount);
Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource);
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r36566 -r36771
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 36566)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 36771)
@@ -210,6 +210,142 @@
}
}
+//ZJYY-140：显示手写签名
+function showSignature(id,displaySupplierName){
+ var displayReceiveMan = top.Ext4.getCmp('hiddenReceiveMan').getValue();
+ var displayReturnMan = top.Ext4.getCmp('hiddenReturnMan').getValue();
+ var displayReturnTime = top.Ext4.getCmp('hiddenReturnTime').getValue();
+ var signatureForm = new top.Ext4.form.Panel({
+ id : 'signatureForm',
+ frame : true,
+ border : 0,
+ labelSeparator : '：',
+ bodyPadding : '5 5 0',
+ autoScroll : true,
+ buttonAlign : 'center',
+ fieldDefaults : {
+ labelAlign : 'right',
+ labelWidth : 80
+ },
+ layout : 'column',
+ items : [{
+ columnWidth : 1,
+ defaultType : 'textfield',
+ border : false,
+ layout : 'form',
+ anchor : "90%",
+ bodyStyle: 'background:transparent;',
+ items : {
+ fieldLabel : '归还人',
+ id : 'displayReturnMan',
+ name : 'displayReturnMan',
+ fieldCls : 'fieldReadOnlyNoRemoveAndTop',
+ readOnly : true,
+ value:displayReturnMan
+ }
+ },{
+ columnWidth : 1,
+ defaultType : 'textfield',
+ border : false,
+ layout : 'form',
+ anchor : "90%",
+ bodyStyle: 'background:transparent;',
+ items : {
+ fieldLabel : '接收人',
+ id : 'displayReceiveMan',
+ name : 'displayReceiveMan',
+ fieldCls : 'fieldReadOnlyNoRemoveAndTop',
+ readOnly : true,
+ value:displayReceiveMan
+ }
+ },{
+ columnWidth : 1,
+ defaultType : 'textfield',
+ border : false,
+ layout : 'form',
+ anchor : "90%",
+ bodyStyle: 'background:transparent;',
+ items : {
+ fieldLabel : '供应商',
+ id : 'displaySupplierName',
+ name : 'displaySupplierName',
+ fieldCls : 'fieldReadOnlyNoRemoveAndTop',
+ readOnly : true,
+ value:displaySupplierName
+ }
+ },{
+ columnWidth : 1,
+ defaultType : 'textfield',
+ border : false,
+ layout : 'form',
+ anchor : "90%",
+ bodyStyle: 'background:transparent;',
+ items : {
+ fieldLabel : '归还时间',
+ id : 'displayReturnTime',
+ name : 'displayReturnTime',
+ fieldCls : 'fieldReadOnlyNoRemoveAndTop',
+ readOnly : true,
+ value:displayReturnTime
+ }
+ },{
+ columnWidth : 1,
+ defaultType : 'textfield',
+ border : false,
+ layout : 'form',
+ anchor : "90%",
+ bodyStyle: 'background:transparent;',
+ items : {
+ fieldLabel : '签名图片',
+ fieldCls : 'fieldReadOnlyNoRemoveAndTop',
+ readOnly : true
+ }
+ },{
+ columnWidth : 1,
+ border : false,
+ layout : 'form',
+ anchor : "90%",
+ bodyStyle: 'background:transparent;',
+ items : [new top.Ext4.Panel({
+ id: 'imagePanel',
+ layout: 'fit',
+ height:190,
+ 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);',
+ complete: 'off'
+ }
+ }]
+ })]
+ }]
+ });
+
+ var browseImage = top.Ext4.getCmp('browseImage')
+ var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getImage.do?objectId='+id+'&page=1&imageType='+encodeURIComponent("外来器械归还交接签名(竖屏版)")+'&showSourceImg=true' + '&time=' + new Date().getTime();
+ browseImage.autoEl.src = url;
+ var signatureWindow = new top.Ext4.window.Window({
+ title : '手写签名记录',
+ height : 380,
+ width : 550,
+ resizable :false,
+ modal : true,
+ border : false,
+ plain : true,
+ layout : 'fit',
+ buttonAlign : 'center',
+ items:[signatureForm]
+ });
+ signatureWindow.show();
+}
+
function showPatientInfo(patientInfo){
top.Ext4.getCmp('patient').setValue(patientInfo.patientName);
top.Ext4.getCmp('patientAge').setValue(patientInfo.patientAge);
@@ -1371,7 +1507,7 @@
* @param formType 操作类型
* @param ismodify 是点击修改按钮还是点击姓名列的文字链接打开弹窗的,false是点击修改按钮
*/
-function openForeignTousseForm(id, formType,ismodify){
+function openForeignTousseForm(id, formType,ismodify,recyclingStatus){
if(ismodify == undefined){
ismodify = true;
}
@@ -2610,15 +2746,15 @@
tousseId = record.get('tousseId') || '';
}
var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=application&tousseDefinitionID='+tousseId+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgName)+'&number='+currentPage;
-
- //var btnHtml = "![](\""+WWWROOT+"/images/web/image_.gif\")
";
- var btnHtml = "";
- if(sstsConfig.showCameraPhoto){
- /* if(id){
- //只有再次打开该单修改时,才能查看图片
- btnHtml += " ![](\""+WWWROOT+"/images/web/photo_16x16.gif\")
";
- } */
- //btnHtml += " ![](\""+WWWROOT+"/images/web/photo.png\")
";
+ var supplierName = record.get('supplierName');
+ //ZJYY-140：显示手写签名的图标
+ var btnHtml = '';
+ if(sstsConfig.enableReturnHandoverOfForeignTousseFunction && (recyclingStatus == '已提前归还' || recyclingStatus == '已确认归还')){
+ btnHtml += "![](\""+WWWROOT+"/images/web/application_view_list.png\")
";
+ }
+
+ btnHtml += " ";
+ if(sstsConfig.showCameraPhoto){
if(id == ""){
tousseDefinitionId = null;
}
@@ -3714,6 +3850,18 @@
flex : .67
}]
},{
+ xtype:'hidden',
+ id:'hiddenReceiveMan',
+ name:'hiddenReceiveMan'
+ },{
+ xtype:'hidden',
+ id:'hiddenReturnMan',
+ name:'hiddenReturnMan'
+ },{
+ xtype:'hidden',
+ id:'hiddenReturnTime',
+ name:'hiddenReturnTime'
+ },{
layout : 'form',
columnWidth : 1,
labelWidth :70,
@@ -3960,7 +4108,6 @@
top.Ext4.getCmp('returnContactPhoneNumberWrapper').show();
top.Ext4.getCmp('returnContactPhoneNumber').show();
}
-
//设置申请科室
var depart = action.result.data.depart;
var departCoding = action.result.data.departCoding;
@@ -4007,6 +4154,10 @@
top.Ext4.getCmp("applyRecycleDifferentMsg").setValue(applyRecycleDifferentMsg);
top.Ext4.getCmp("applyRecycleDifferentMsgBox").show();
}
+
+ top.Ext4.getCmp("hiddenReceiveMan").setValue(action.result.data.returneeOfSupplier);
+ top.Ext4.getCmp("hiddenReturnMan").setValue(action.result.data.returnMan);
+ top.Ext4.getCmp("hiddenReturnTime").setValue(action.result.data.returnTime);
},
failure : function(form, action) {
showResult("加载失败，请联系管理员！");
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r36600 -r36771
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 36600)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 36771)
@@ -64,7 +64,7 @@
showResult("一次只能修改一个"+entityName+"！");
return false;
}
- openForeignTousseForm(records[0].data.id,"apply",ismodify);
+ openForeignTousseForm(records[0].data.id,"apply",ismodify,records[0].data.recyclingStatus);
}
/**