Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js =================================================================== diff -u -r27313 -r39487 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js (.../interfereSterilizationView1.js) (revision 27313) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js (.../interfereSterilizationView1.js) (revision 39487) @@ -20,6 +20,24 @@ } } +//NFYY-116:激活自动匹配 +function startStdScheduler(){ + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!startStdScheduler.do', + success: function (response, options) { + var result = Ext.decode(response.responseText); + var success = result.success; + showResult(result.message); + if (success) { + grid.dwrReload(); + } + }, + failure: function (response, options) { + showResult("匹配失败!"); + } + }); +} + //验证器械包预警期、失效期 function checkDate(v, p, record,rowIndex,columnIndex,store){ var validUntil = record.data.validUntil; @@ -348,7 +366,13 @@ }); grid = new Ext.ux.ForgonPageGrid({ id : 'tousseInstanceGrid1', - tbar : [], + tbar : [{ + text: '激活自动匹配', + iconCls: 'btn_ext_startStdScheduler', + handler: function () { + startStdScheduler(); + } + }], pageSize : 20, renderTo : 'gridDiv', defaultSortField : 'startDate', Index: ssts-web/src/main/webapp/images/web/startStdScheduler.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/ext/fontSize15/styles/common.css =================================================================== diff -u -r39281 -r39487 --- ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 39281) +++ ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 39487) @@ -395,6 +395,9 @@ .btn_ext_play { background-image:url( ../../../images/web/play.png ) !important; } +.btn_ext_startStdScheduler{ + background-image:url( ../../../images/web/startStdScheduler.png) !important; +} #invoicePlan_recyclingApplicationForm-xcollapsed .x-tool-expand-east { height: 100% !important; Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js =================================================================== diff -u -r37679 -r39487 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 37679) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 39487) @@ -72,6 +72,24 @@ }); } +//NFYY-116:激活自动匹配 +function startStdScheduler(){ + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!startStdScheduler.do', + success: function (response, options) { + var result = Ext.decode(response.responseText); + var success = result.success; + showResult(result.message); + if (success) { + grid.dwrReload(); + } + }, + failure: function (response, options) { + showResult("匹配失败!"); + } + }); +} + function nameAndFrequency(v, p, record) { var name = record.data['sterilizerName']; if (name != "" && (v != "" && v != null)) { @@ -305,6 +323,12 @@ handler: function () { updateWashStatus(washfaild); } + }, '-', { + text: '激活自动匹配', + iconCls: 'btn_ext_startStdScheduler', + handler: function () { + startStdScheduler(); + } }, { id: 'washSaveSubmitResult', xtype: 'hidden', Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css =================================================================== diff -u -r38494 -r39487 --- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 38494) +++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 39487) @@ -410,6 +410,9 @@ .btn_ext_one_key_scan { background-image:url( ../../../images/web/invoice_one_key_scan.png) !important; } +.btn_ext_startStdScheduler{ + background-image:url( ../../../images/web/startStdScheduler.png) !important; +} .tableBorder { margin: 0 !important;