Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r20171 -r20211 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 20171) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 20211) @@ -3532,7 +3532,15 @@ listeners: { itemclick: function (dv, record, item, index, e) { var packingRecordId = record.get('id'); - rePrintBarcodeWinForPacking(packingRecordId,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient); + var cfg = { + packingRecordId:packingRecordId, + SSTS_HistoryPacking_Update:SSTS_HistoryPacking_Update, + SSTS_HistoryPacking_Change_Patient:SSTS_HistoryPacking_Change_Patient, + onClose: function(){ + packingRecordStore.reload(); + } + } + rePrintBarcodeWinForPacking2(cfg); } } }) Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r20076 -r20211 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 20076) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 20211) @@ -6,12 +6,29 @@ function rePrintBarcodeWinForPacking(packingRecordId,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient) { var loadTousseURL = WWWROOT + '/disinfectSystem/packingAction!loadPackedTousses.do?packingRecordId='+packingRecordId; viewType = 'historyPacking'; - rePrintBarcodeWin(loadTousseURL,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient); + var cfg = { + loadTousseURL:loadTousseURL, + SSTS_HistoryPacking_Update:SSTS_HistoryPacking_Update, + SSTS_HistoryPacking_Change_Patient:SSTS_HistoryPacking_Change_Patient + } + rePrintBarcodeWin(cfg); } +function rePrintBarcodeWinForPacking2(cfg) { + var packingRecordId = cfg.packingRecordId; + var loadTousseURL = WWWROOT + '/disinfectSystem/packingAction!loadPackedTousses.do?packingRecordId='+packingRecordId; + viewType = 'historyPacking'; + cfg.loadTousseURL = loadTousseURL; + rePrintBarcodeWin(cfg); +} function rePrintBarcodeWinForScanBasket(ids,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient) { var loadTousseURL = WWWROOT + '/disinfectSystem/packingAction!loadTousseByIds.do?ids='+ids; viewType = 'historyPacking'; - rePrintBarcodeWin(loadTousseURL,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient); + var cfg = { + loadTousseURL:loadTousseURL, + SSTS_HistoryPacking_Update:SSTS_HistoryPacking_Update, + SSTS_HistoryPacking_Change_Patient:SSTS_HistoryPacking_Change_Patient + } + rePrintBarcodeWin(cfg); } function rePrintBarcodeWinForForeignProxyDisinfection(foreignProxyDisinfectionid,_applicant,_depart) { var loadTousseURL = WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!loadTousses.do?foreignProxyDisinfectionid='+foreignProxyDisinfectionid; @@ -20,7 +37,12 @@ depart = _depart; hiddentPacker2 = true; hiddentReviewer2 = true; - rePrintBarcodeWin(loadTousseURL,SSTS_ForeignProxyDisinfection_Update,true); + var cfg = { + loadTousseURL:loadTousseURL, + SSTS_HistoryPacking_Update:SSTS_ForeignProxyDisinfection_Update, + SSTS_HistoryPacking_Change_Patient:true + } + rePrintBarcodeWin(cfg); } function showSelectTousseDiscardCauseWin(){ return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400"); @@ -57,7 +79,10 @@ rePrintWin_tousseStore.removeAll(); rePrintWin_tousseStore.load(); } -function rePrintBarcodeWin(loadTousseURL,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient) { +function rePrintBarcodeWin(cfg) { + var loadTousseURL = cfg.loadTousseURL; + var SSTS_HistoryPacking_Update = cfg.SSTS_HistoryPacking_Update; + var SSTS_HistoryPacking_Change_Patient = cfg.SSTS_HistoryPacking_Change_Patient; var selectModel = new top.Ext.grid.CheckboxSelectionModel(); rePrintWin_tousseStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ @@ -668,6 +693,11 @@ plain : true, items : [rePrintPanel] }); + rePrintWin.on('close',function(w){ + if(cfg.onClose){ + cfg.onClose(); + } + }); rePrintWin.show(); } /******** 重打标签窗口end ********/ Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js =================================================================== diff -u -r17512 -r20211 --- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 17512) +++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 20211) @@ -343,7 +343,15 @@ recordGrid.on("rowclick",function(thiz, rowIndex, e){ var record = this.getStore().getAt(rowIndex); var packingRecordId = record.get('id'); - rePrintBarcodeWinForPacking(packingRecordId,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient); + var cfg = { + packingRecordId:packingRecordId, + SSTS_HistoryPacking_Update:SSTS_HistoryPacking_Update, + SSTS_HistoryPacking_Change_Patient:SSTS_HistoryPacking_Change_Patient, + onClose: function(){ + recordGrid.dwrReload(); + } + } + rePrintBarcodeWinForPacking2(cfg); }); var viewport = new Ext.Viewport({