Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js =================================================================== diff -u -r35344 -r38123 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js (.../selectDepartExt4.js) (revision 35344) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js (.../selectDepartExt4.js) (revision 38123) @@ -119,6 +119,27 @@ } saveDeparts(ids) + } else if (formName == 'notificationOrgUnit') { + var idArr = []; + var idString = []; + for (var i = 0; i < departListStore.getCount(); i++) { + var record = departListStore.getAt(i); + nameArr[i] = record.get('name'); + codeArr[i] = record.get('departCode'); + idArr[i] = record.get('orgUnitId'); + } + + if (nameArr.length !== 0 && codeArr.length !== 0) { + nameString = nameArr.join(';'); + codeString = codeArr.join(';'); + idString = idArr.join(';'); + } + + if (top.Ext4.getCmp("notificationOrgUnitIds") && top.Ext4.getCmp("notificationOrgUnitNames")) { + top.Ext4.getCmp("notificationOrgUnitNames").setValue(nameString); + top.Ext4.getCmp("notificationOrgUnitIds").setValue(idString); + top.Ext4.getCmp("notificationOrgUnitCodes").setValue(codeString); + } } else { for (var i = 0; i < departListStore.getCount(); i++) { var record = departListStore.getAt(i); @@ -194,7 +215,7 @@ departJsonStore.load(); - if (((departNames || '') !== '') && ((codes || '') !== '')) { + if (((departNames || '') !== '') && ((codes || '') !== '') || (orgUnitIds || '') !== '') { var departNameArr = departNames.split(';'); var codeArr = codes.split(';'); var orgUnitIdArr = []; Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r38053 -r38123 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 38053) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 38123) @@ -2298,6 +2298,29 @@ showWarningWin(); } +if(sstsConfig.enableUrgentVoiceNotificationsFunction){ + Ext4.Ajax.request({ + url : WWWROOT + '/disinfectSystem/baseData/notification/urgentNotificationController/urgentNotification.mhtml', + method : 'POST', + success: function(response) { + var result = Ext4.decode(response.responseText); + if(result.success && result.data){ + var msg = ''; + for(var i=0;i 4) { + this.setValue(9999) + } + } + } + }] + }, { + layout: 'column', + border: 0, + style: 'margin-bottom:10px', + columnWidth: 1, + id:'notificationOrgUnitBox', + items: [{ + columnWidth: .8, + layout: 'form', + items: [{ + xtype:'hidden', + id:'notificationOrgUnitIds', + name:'notificationOrgUnitIds' + },{ + xtype:'hidden', + id:'notificationOrgUnitCodes', + name:'notificationOrgUnitCodes' + },{ + xtype: 'textfield', + fieldLabel: '通知科室', + id: 'notificationOrgUnitNames', + name: 'notificationOrgUnitNames', + allowBlank: true, + readOnly: true, + anchor: '98%' + }] + }, { + columnWidth: .2, + layout: 'form', + border: 0, + items: [{ + xtype: 'button', + text: '选择科室', + listeners: { + click: function () { + var notificationOrgUnitNames = top.Ext4.getCmp('notificationOrgUnitNames').getValue(); + var notificationOrgUnitIds = top.Ext4.getCmp("notificationOrgUnitIds").getValue(); + var notificationOrgUnitCodes = top.Ext4.getCmp("notificationOrgUnitCodes").getValue(); + openSelectReceiverOrganization(notificationOrgUnitNames, notificationOrgUnitCodes, 'notificationOrgUnit', notificationOrgUnitIds); + } + } + }] + }] + }, { + columnWidth: 0.5, + layout: 'form', + border: 0, + style: 'margin-bottom:10px', hidden: !isShowInfo, items: [{ xtype: 'combo', - labelWidth: 120, fieldLabel: "补充额外信息", id: 'additionalInfo', name: 'additionalInfo', @@ -434,19 +545,30 @@ ] }); + var height = 150; + if(isShowInfo){ + height += 200; + } + if(showVoiceNotifications){ + height += 90; + } + urgentLevelWin = top.Ext4.create('Ext4.window.Window', { id: 'urgentLevelWin', layout: 'fit', title: '加急级别信息', width: 600, - height: isShowInfo ? 350 : 150, + height: height, modal: true, border: false, plain: true, items: [formObj] }); urgentLevelWin.show(); + top.Ext4.getCmp('notificationOrgUnitBox').hide(); + top.Ext4.getCmp('urgentVoiceNotificationsCountBox').hide(); + if (id != 0) { formObj.form.load({ url: WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!loadUrgentLevel.do', @@ -497,6 +619,11 @@ top.Ext4.getCmp('urgentContactNotBlank').disable(); top.Ext4.getCmp('urgentContactInfoNotBlank').disable(); } + //GDSRMYY-604:新增可设置语音通知功能 + if(sstsConfig.enableUrgentVoiceNotificationsFunction && action.result.data.notification == '是'){ + top.Ext4.getCmp('urgentVoiceNotificationsCountBox').show(); + top.Ext4.getCmp('notificationOrgUnitBox').show(); + } }, failure: function (form, action) { showResult("加载失败"); @@ -705,6 +832,7 @@ return } } + formObj.form.submit({ url: WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!saveUrgentLevel.do', method: 'POST', Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp =================================================================== diff -u -r36082 -r38123 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp (.../urgentLevelView.jsp) (revision 36082) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp (.../urgentLevelView.jsp) (revision 38123) @@ -12,6 +12,7 @@ + Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r38078 -r38123 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 38078) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 38123) @@ -376,6 +376,8 @@ checkTousseLocatedInOperatingRoomWhenAddUseRecord:true, //保存时不关闭当前表单页面 theCurrentFormIsNotClosedWhenSaving:["useRecord"], + //启用加急语音通知功能 + enableUrgentVoiceNotificationsFunction:true, //PDA桌面图标别名设置(GDSRMYY-581) aliasNameOfPDADesktopIcons:{"instrumentGoodsManagement":"v1"} } \ No newline at end of file