Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js =================================================================== diff -u -r30713 -r30731 --- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js (.../config.js) (revision 30713) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js (.../config.js) (revision 30731) @@ -139,6 +139,8 @@ printInvoiceVersion:2, // 批量打印发货单,打印消毒物品和器械包是否分开两个按钮 splitTousseAndDisinfectInvoiceBtn:false, + //启用提示上传设备物理参数图片 + enablePromptUploadDeviceParameterPicture:true, //使用记录转换申请单后同科室物品合并 useRecordConvertRecyclingApplicationMergeRegular : "depart" } \ No newline at end of file Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r30713 -r30731 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 30713) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 30731) @@ -1782,4 +1782,57 @@ method : 'POST', params : {currentOrgUnitCode: currentOrgUnitId} }); +} + +//SZYK-27:提示上传设备运行物理参数 +showPromptUploadDeviceParameterPicture() + +function showPromptUploadDeviceParameterPicture(){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!promptUploadDeviceParameterPicture.do', + method : 'POST', + success : function someFn(response, request){ + var result = Ext.decode(response.responseText, true); + if(result.data.length > 0){ + var tipGrid = new Ext.grid.GridPanel({ + store: new Ext.data.Store({ + reader : new Ext.data.JsonReader({ + fields : ["content"] + }) + }), + columns: [ + {header: "提示内容", width: 600, dataIndex: 'content'} + ], + stripeRows: true, + viewConfig: { + forceFit:true + }, + hideHeaders:true, + height:200, + width:580 + }); + var data = []; + for(var i = 0;i < result.data.length;i++){ + //需要提示的告警类型 + var content = result.data[i]; + data.push({ + content:content + }); + } + tipGrid.getStore().loadData(data); + var tipWindow = new Ext.Window({ + autoHeight:true, + title : '提示信息', + width:600, + height:400, + draggable:true, + modal:true, + closeAction:'close', + items:[tipGrid] + }); + tipWindow.show(); + Ext.QuickTips.init(); + } + } + }); } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js =================================================================== diff -u -r28685 -r30731 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js (.../rinserForm.js) (revision 28685) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js (.../rinserForm.js) (revision 30731) @@ -477,6 +477,24 @@ mode : 'local', triggerAction : 'all', anchor : '95%' + },{ + xtype : 'combo', + fieldLabel : "提示上传设备物理参数图片", + store : new Ext.data.SimpleStore({ + fields : ['value'], + data : [['是'],['否']] + }), + hidden:!sstsConfig.enablePromptUploadDeviceParameterPicture, + valueField : 'value', + displayField : 'value', + mode : 'local', + value:'否', + forceSelection : true, + allowBlank : false, + triggerAction : 'all', + name : "promptUploadDevParamPic", + id : "promptUploadDevParamPic", + anchor : '95%' }] }, { columnWidth : 0.5, @@ -487,7 +505,7 @@ store : configStore, cm : cm, width : 200, - height: 414, + height: 454, frame : false, viewConfig: { forceFit:true Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r30246 -r30731 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 30246) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 30731) @@ -806,6 +806,31 @@ name : 'bioMonitoringInterval', anchor : '95%' }] + },{ + layout:'form', + labelWidth : 100, + columnWidth: 0.5, + height:38, + hidden:!sstsConfig.enablePromptUploadDeviceParameterPicture, + items:[{ + columnWidth : 0.5, + xtype : 'combo', + fieldLabel : "提示上传设备物理参数图片", + store : new Ext.data.SimpleStore({ + fields : ['value'], + data : [['是'],['否']] + }), + valueField : 'value', + displayField : 'value', + mode : 'local', + value:'否', + forceSelection : true, + allowBlank : false, + triggerAction : 'all', + name : "promptUploadDevParamPic", + id : "promptUploadDevParamPic", + anchor : '95%' + }] }] }, { columnWidth : 0.4,