Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js =================================================================== diff -u -r22579 -r25227 --- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 22579) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 25227) @@ -814,11 +814,36 @@ var rows = top.Ext.getCmp('auxiliaryInvoice_sendOutGoodsDetail').getSelectionModel().getSelections();// 返回值为 var addTousses = []; if (rows) { + // 收集ids + var ids = []; for ( var i = 0; i < rows.length; i++) { + ids.push(rows[i].data.id); + } + var idToMonitoringInfoMap = {}; + var defMonitoringInfo = { + noBiologicalMonitoring: false, + biologicalMonitoringNoResult: false, + biologicalMonitoringFail: false, + needRoutineMonitoringWarming: false, + urgentDelivery: null, + isRoutine: "是" + } + // 请求后台 + DWREngine.setAsync(false); + InvoiceTableManager.getRoutineMonitoringInfoByIds(ids.join(','),function(result){ + idToMonitoringInfoMap = Ext.decode(result); + }); + DWREngine.setAsync(true); + for ( var i = 0; i < rows.length; i++) { // var name = rows[i].data['name']; // var amount = rows[i].data['count']; // recyclingapplicationStore.remove(rows[i]); var goods = rows[i].data; + var monitoringInfo = idToMonitoringInfoMap[rows[i].data.id]; + if(!monitoringInfo){ + monitoringInfo = defMonitoringInfo; + } + Ext.apply(goods,monitoringInfo); // 生物监测 if (sstsConfig.biologicalMonitoringEnable) { //发货时对含植入物的器械包,进行是否紧急发货以及生物监测情况的提示 if (goods.biologicalMonitoringFail) { //生物监测不合格