Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js =================================================================== diff -u -r40346 -r40932 --- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js (.../useRecordViewForm.js) (revision 40346) +++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js (.../useRecordViewForm.js) (revision 40932) @@ -1689,6 +1689,30 @@ } } +//SZSDSRMYY-212:快速回收 +function quickRecycing(useRecordWin, useRecordID, barcodes, urgentLevelIdsForUseRecord) { + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/useRecordAction!quickRecycing.do', + params: { id: useRecordID, barcodes: barcodes, urgentLevelIdsForUseRecord: JSON.stringify(urgentLevelIdsForUseRecord) }, + success: function (response, options) { + var result = Ext.decode(response.responseText); + if (result.success == 'true' || result.success == true) { + showResult('回收成功'); + useRecordWin.close(); + grid.dwrReload(); + } else { + showResult(result.msg) + top.Ext.getCmp('quickRecycingID').enable(); + } + + }, failure: function (response, options) { + var result = Ext.decode(response.responseText); + showResult('选中的器械包已被快速回收,请刷新页面并确认。'); + top.Ext.getCmp('quickRecycingID').enable(); + } + }); +} + /** * 如果点击添加按钮,则传过来的ID为空 * @@ -1722,6 +1746,40 @@ useRecordWin.close(); } }; + //SZSDSRMYY-212:快速回收 + var fastRecyclingBtn = { + text: '快速回收', + id: 'quickRecycingID', + hidden: !sstsConfig.disableUseRecordQuickRecycling, + handler: function () { + var records = top.Ext.getCmp('tousseInstanceGrid').getSelectionModel().getSelections(); + if (records.length == 0) { + showResult('请选择要快速回收的器械包。'); + return false; + } + var urgentLevelIdsForUseRecord = []; + var barcodes = ''; + for (var i = 0; i < records.length; i++) { + var currentRecord = records[i]; + if (currentRecord.data.tousseType == '聚合包') { + showResult(currentRecord.data.showTousseName + "是聚合包,不能进行快速回收"); + return; + } + if (currentRecord.data.comboTousseInstanceId) { + showResult(currentRecord.data.showTousseName + "是聚合包内的子包,不能进行快速回收"); + return; + } + urgentLevelIdsForUseRecord.push({ + barcode: currentRecord.get('barcode'), + urgentLevelIdForUseRecord: currentRecord.get('urgentLevelIdForUseRecord') + }); + barcodes += currentRecord.get('barcode') + ";"; + } + var qrButton = top.Ext.getCmp('quickRecycingID'); + qrButton.disable(); + quickRecycing(useRecordWin, id, barcodes, urgentLevelIdsForUseRecord); + } + }; if (id != '') {// 编辑 useItemsStore.on("beforeload", function (thiz, options) { @@ -1760,7 +1818,7 @@ }); useItemsStore.load(); if (status == unAudited) { - tbar = [saveBtn, cancelBtn]; + tbar = [fastRecyclingBtn, saveBtn, cancelBtn]; } else { tbar = [cancelBtn]; } Index: ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml =================================================================== diff -u -r40635 -r40932 --- ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 40635) +++ ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 40932) @@ -106,6 +106,8 @@ + +