Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r40504 -r40784 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40504) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40784) @@ -552,6 +552,37 @@ firstTousseBagsList.tousseInstanceId = tousseInstanceId; firstTousseBagsList.responsiblePerson = responsiblePerson; + if (top.Ext.getCmp("materialWrapper")) { + var firstMaterialItems = top.Ext.getCmp("materialWrapper").items.items; + var firstMaterialArrHidden = [] + for (var m = 0; m < firstMaterialItems.length; m++) { + var materiaItemsId = firstMaterialItems[m].id; + if (materiaItemsId.indexOf("materialC") >= 0 || materiaItemsId.indexOf("materialAmountC") >= 0) { + if (firstMaterialItems[m].items.items[0] && firstMaterialItems[m].items.items[0].fieldLabel == "抽检器械" && m > 1) { + + if (firstMaterialArrHidden[0] && firstMaterialArrHidden[0] !== '') { + firstMaterialInfos.push({ + material: firstMaterialArrHidden[0], + amount: firstMaterialArrHidden[1] + }) + } + + firstMaterialArrHidden = []; + } + if (top.Ext.getCmp(materiaItemsId)) { + firstMaterialArrHidden.push(firstMaterialItems[m].items.items[0].el.dom.value); + } + } + } + + if (firstMaterialArrHidden[0] && firstMaterialArrHidden[0] !== '') { + firstMaterialInfos.push({ + material: firstMaterialArrHidden[0], + amount: firstMaterialArrHidden[1] + }) + } + } + var tosseAndMaterialFirstWrapper = top.Ext.getCmp("tosseAndMaterial").items.items; var tousseBags = setTousseArgument(tosseAndMaterialFirstWrapper); @@ -4426,7 +4457,7 @@ * @param {清洗记录的ID} washRecordId * @param {选中的器械包数组} tousseItems */ -function addQualityMonitoringByResponPart(responPartName, washRecordId, tousseItems, ids) { +function addQualityMonitoringByResponPart(responPartName, washRecordId, tousseItems, ids, remarks) { if (ids || isReturnGoods) { sessionItem = { responPartName: responPartName, @@ -4532,6 +4563,9 @@ top.Ext.getCmp('formName').setValue(''); top.Ext.getCmp('responsibilityPart').disable(); } + if(remarks && remarks !== '' && top.Ext.getCmp('remark')){ + top.Ext.getCmp('remark').setValue(remarks) + } }, 500); }