Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r40776 -r40783 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 40776) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 40783) @@ -4446,13 +4446,37 @@ tousseName: hideTousseName, tousseID: hideTousseId }]; + var remarks = ''; + if(sstsConfig.enableAutoExtractionOfKeyDataToQualityTecordsDuringPacking){ + var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); + var selNodes = waitPackingTreeGrid.getView().getChecked(); + var arr = []; + Ext4.each(selNodes, function (pNode) { + if (pNode.childNodes.length == 0) { + arr.push(pNode.raw) + } + }); + if(arr.length == 1){ + if(arr[0].idNumber !== ''){ + remarks += '标识牌编号:'+ arr[0].idNumber +';' + } + if(arr[0].errorDamageRemarkInfo !== ''){ + remarks += arr[0].errorDamageRemarkInfo + } + if(arr[0].recyclingItemRemark !== ''){ + remarks += arr[0].recyclingItemRemark +';' + } + }else if(arr.length > 1){ + showResult('勾选多个物品登记质量监测时无法获取相关的备注信息。'); + } + } if (washRecordIds.length > 1) { - addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); + addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks); showMultipleResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); } else if (washRecordIds.length == 1) { - addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); + addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks); } else { - addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems); + addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems, '', remarks); } } }) @@ -4470,13 +4494,37 @@ tousseName: hideTousseName, tousseID: hideTousseId }]; + var remarks = ''; + if(sstsConfig.enableAutoExtractionOfKeyDataToQualityTecordsDuringPacking){ + var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); + var selNodes = waitPackingTreeGrid.getView().getChecked(); + var arr = []; + Ext4.each(selNodes, function (pNode) { + if (pNode.childNodes.length == 0) { + arr.push(pNode.raw) + } + }); + if(arr.length == 1){ + if(arr[0].idNumber !== ''){ + remarks += '标识牌编号:'+ arr[0].idNumber +';' + } + if(arr[0].errorDamageRemarkInfo !== ''){ + remarks += arr[0].errorDamageRemarkInfo + } + if(arr[0].recyclingItemRemark !== ''){ + remarks += arr[0].recyclingItemRemark +';' + } + }else if(arr.length > 1){ + showResult('勾选多个物品登记质量监测时无法获取相关的备注信息。'); + } + } if (washRecordIds.length > 1) { - addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); + addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks); showMultipleResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); } else if (washRecordIds.length == 1) { - addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); + addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks); } else { - addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems); + addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems, '', remarks); } } }) Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js =================================================================== diff -u -r40302 -r40783 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 40302) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 40783) @@ -352,6 +352,8 @@ enablePackingViewCurrentTaskGroupErrorDamage:true, //是否启用装配管理的加急功能 enableSetUrgentOfPackin:true, +//启用装配时自动提取关键信息到质量监测记录 +enableAutoExtractionOfKeyDataToQualityTecordsDuringPacking:true, //启用发货记录的结算科室干预拆分功能 enableSettleDepartIntervenesInTheSplitOfInvoiceView:true } \ No newline at end of file