Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js =================================================================== diff -u -r30540 -r30631 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 30540) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 30631) @@ -255,5 +255,7 @@ //启用历史回收记录列表的回收数量小于申请数量的回收单的背景颜色提醒 enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount:true, //显示在线帮助按钮 - showOnlineHelpButton:true + showOnlineHelpButton:true, + //装配模块登记质量监测记录时的默认责任环节(可选值为：回收清点、清洗消毒、装配管理、审核打包、灭菌管理、发货管理、院感管理、其他环节、全部环节) + defaultResponsibilityPartInPackingModule:'全部环节' } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r30491 -r30631 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 30491) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 30631) @@ -651,9 +651,17 @@ Ext.getCmp('material').setValue(""); Ext.getCmp('materialAmount').setValue(""); if(materialItemCount > 0){ - for(var i=1;i<=materialItemCount;i++){ - Ext.getCmp('material'+i).setValue(""); - Ext.getCmp('materialAmount'+i).setValue(""); + for(var j=0;j<=tousseItemCount;j++){ + for(var i=1;i<=materialItemCount;i++){ + if(Ext.getCmp('material'+j+'_'+i)){ + Ext.getCmp('material'+j+'_'+i).setValue(""); + } + Ext.getCmp('materialAmount'+i).setValue(""); + } + if(Ext.getCmp('tempBarcode'+j+'_3')){ + Ext.getCmp('tempBarcode'+j+'_3').setValue(""); + Ext.getCmp('tousseDefinitionId'+j).setValue(''); + } } } Ext.getCmp('tousseDefinitionId').setValue(''); @@ -1083,7 +1091,7 @@ amountChild 当前在信息块里面是第几个 isLoad 是否是加载 */ -function addExtractCheckMaterial(isOpenRecord,mateialName,count,basketPosition,orderNumber,isWrapper,isTousseAndMaterial,amount,tosseAndMaterialId,btnShowOrHide,amountChild,isLoad){ +function addExtractCheckMaterial(isOpenRecord,mateialName,count,basketPosition,orderNumber,isWrapper,isTousseAndMaterial,amount,tosseAndMaterialId,btnShowOrHide,amountChild,isLoad,tousseItemCount){ materialItemCount++; var tousseAndMaterial = Ext.getCmp('tosseAndMaterial'); var mCount = 1; @@ -1099,6 +1107,32 @@ var items2 = new Array(); var items3 = new Array(); var items5 = new Array(); + + materialDefinitionAddStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDataIncludeForeignMD.do?selectType=material', + method : 'POST' + }), + reader : new Ext.data.JsonReader({ + totalProperty : 'totalCount', + root : 'data' + }, [ + {name : 'id',mapping : 'id'}, + {name : 'spelling',mapping : 'spelling'}, + {name : 'name',mapping : 'name'}, + {name : 'count',mapping : 'count'} + ]), + listeners : { + beforeload : function(thiz, options){ + if(tousseItemCount == 0){ + thiz.baseParams['tousseDefinitionId'] = Ext.getCmp('tousseDefinitionId').getValue(); + }else if(tousseItemCount !== undefined){ + thiz.baseParams['tousseDefinitionId'] = Ext.getCmp('tousseDefinitionId'+tousseItemCount).getValue(); + } + } + } + }); + items = { layout : 'form', id : 'materialC'+materialItemCount, @@ -1107,8 +1141,8 @@ height:setH, items : [{ xtype : 'combo', - id : 'material'+materialItemCount, - name : 'material'+materialItemCount, + id : 'material'+tousseItemCount+'_'+materialItemCount, + name : 'material'+tousseItemCount+'_'+materialItemCount, fieldLabel : '抽检器械', queryParam : 'spell', minChars : 0, @@ -1149,7 +1183,7 @@ if(isTousseAndMaterial){ isTousseAndMaterialVal = true; } - addExtractCheckMaterial("","",1,"","",true,isTousseAndMaterialVal,amountClick,"","",rememberChildCurNum2,""); + addExtractCheckMaterial("","",1,"","",true,isTousseAndMaterialVal,amountClick,"","",rememberChildCurNum2,"",tousseItemCount); widthSet = false; } }] @@ -1368,7 +1402,7 @@ } if(isOpenRecord == true && mateialName != null && mateialName != ''){ //打开记录，不允许修改 - Ext.getCmp('material'+materialItemCount).disable(); + Ext.getCmp('material'+tousseItemCount+'_'+materialItemCount).disable(); Ext.getCmp('materialAmount'+materialItemCount).disable(); Ext.getCmp('basketBarcode'+materialItemCount).disable(); Ext.getCmp('position'+materialItemCount).disable(); @@ -2004,7 +2038,7 @@ widthSetTousse = false; widthSet = false; addBtn = true; - addExtractCheckMaterial("","",1,"","",true,isTousseAndMaterialVal,rememberNum2,"",addBtn,"",""); + addExtractCheckMaterial("","",1,"","",true,isTousseAndMaterialVal,rememberNum2,"",addBtn,"","",tousseItemCount); widthSetTousse = false; } @@ -2062,8 +2096,34 @@ triggerAction : 'all', hideTrigger : true, typeAhead : false, - anchor : '95%' - }] + anchor : '95%', + listeners : { + select : function(combo, record,index) { + combo.setValue(record.data.name); + var z = combo.id.split('_')[0].replace('tempBarcode',''); + Ext.getCmp('tousseDefinitionId'+z).setValue(record.data.id); + }, + blur : function(field){ + var index = field.id.split('_')[0].replace('tempBarcode',''); + if(!Ext.getCmp('tempBarcode'+index+'_3').getRawValue()){ + Ext.getCmp('tousseDefinitionId'+index).setValue(''); + } + //重新加载包内的材料 + if(materialItemCount > 0){ + for(var i=1;i<=materialItemCount;i++){ + if(Ext.getCmp('material'+index+'_'+i)){ + Ext.getCmp('material'+index+'_'+i).store.reload(); + } + } + } + } + } + },{ + xtype:'hidden', + fieldLabel : '器械包ID', + id:'tousseDefinitionId'+tousseItemCount, + name:'tousseDefinitionId'+tousseItemCount + },] }; var items5 = new Array(); items5 = { @@ -3093,6 +3153,7 @@ //tousseBagsList.tousseBarcode = tousseBarcode;已经被清空了 }else if(wrapper[j].items.items[0].fieldLabel == "器械包名称"){ tousseBagsList.tousseName = tousseBarcode; + tousseBagsList.tousseDefinitionId = wrapper[j].items.items[1].el.dom.value; }else if(wrapper[j].items.items[0].fieldLabel == "器械包数量"){ tousseBagsList.tousseAmount = tousseBarcode; } @@ -3323,19 +3384,19 @@ var tousseName = Ext.getCmp('tousseName').getRawValue(); var barcode = Ext.getCmp('barcode').getValue(); var tousseInstanceId = Ext.getCmp('tousseInstanceId').getValue(); + var tousseDefinitionId = Ext.getCmp('tousseDefinitionId').getValue(); var amount = Ext.getCmp('tousseAmount').getValue(); var isRecycle = Ext.getCmp('isRecycle').getValue(); var isRepacking = Ext.getCmp('isRepacking').getValue(); - //if(tousseName != null && tousseName != ""){ - firstTousseBagsList.tousseBarcode = barcode; - firstTousseBagsList.tousseName = tousseName; - firstTousseBagsList.tousseAmount = amount; - firstTousseBagsList.tousseInstanceId = tousseInstanceId; - firstTousseBagsList.tousseRecycle = isRecycle; - firstTousseBagsList.tousseRePacking = isRepacking; - firstTousseBagsList.order = ""; - //} + firstTousseBagsList.tousseBarcode = barcode; + firstTousseBagsList.tousseName = tousseName; + firstTousseBagsList.tousseAmount = amount; + firstTousseBagsList.tousseInstanceId = tousseInstanceId; + firstTousseBagsList.tousseDefinitionId = tousseDefinitionId; + firstTousseBagsList.tousseRecycle = isRecycle; + firstTousseBagsList.tousseRePacking = isRepacking; + firstTousseBagsList.order = ""; } @@ -3868,21 +3929,7 @@ } } }); - materialDefinitionAddStore = new Ext.data.Store({ - proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDataIncludeForeignMD.do?selectType=material', - method : 'POST' - }), - reader : new Ext.data.JsonReader({ - totalProperty : 'totalCount', - root : 'data' - }, [ - {name : 'id',mapping : 'id'}, - {name : 'spelling',mapping : 'spelling'}, - {name : 'name',mapping : 'name'}, - {name : 'count',mapping : 'count'} - ]) - }); + tousseDefinitionStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do?type='+encodeURI('器械包和外来器械包'), @@ -4787,7 +4834,7 @@ var scope = Ext.getCmp("scope").getValue(); if(Ext.getCmp("scope").getValue() == "材料和器械包"){//如果监测范围是材料和包的话 //widthSet = true; - addExtractCheckMaterial("","",1,"","","",true,"","",true,"",""); + addExtractCheckMaterial("","",1,"","","",true,"","",true,"","",tousseItemCount); //widthSet = false; } @@ -4827,6 +4874,13 @@ } //重新加载包内的材料 materialDefinitionStore.reload(); + if(materialItemCount > 0){ + for(var i=1;i<=materialItemCount;i++){ + if(Ext.getCmp('material0'+'_'+i)){ + Ext.getCmp('material0'+'_'+i).store.reload(); + } + } + } } } }] @@ -4895,7 +4949,7 @@ firstChildNum = 001;//这里是自己写死的，因为这个本身是第一个 } - addExtractCheckMaterial("","",1,"","","","","","","",firstChildNum,""); + addExtractCheckMaterial("","",1,"","","","","","","",firstChildNum,"",0); widthSet = false; } }] Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r30610 -r30631 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30610) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30631) @@ -41,6 +41,12 @@ reviewViewText = "审核"; } +//SZSDSRMYY-54 +var responsibilityPart = '清洗消毒' +if(sstsConfig.defaultResponsibilityPartInPackingModule){ + responsibilityPart = sstsConfig.defaultResponsibilityPartInPackingModule; +} + var packingPageAutoSetSterilizationProgramAfterSelectTousse = true; var allowForeignToussePartiallyPacking = false; var taskGroupObj = null; @@ -2493,12 +2499,12 @@ } }); if(washRecordIds.length > 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); + addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems); showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！'); }else if(washRecordIds.length == 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); + addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems); }else { - addQualityMonitoringByResponPart("清洗消毒",'',tousseItems); + addQualityMonitoringByResponPart(responsibilityPart,'',tousseItems); } } }], @@ -2634,12 +2640,12 @@ } }); if(washRecordIds.length > 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); + addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems); showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！'); }else if(washRecordIds.length == 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0],tousseItems); + addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0],tousseItems); }else { - addQualityMonitoringByResponPart("清洗消毒",'',tousseItems); + addQualityMonitoringByResponPart(responsibilityPart,'',tousseItems); } } }/* ,"-",{ @@ -4244,12 +4250,12 @@ if(btn == 'no'){ var washRecordIds = getWashRecordIds(); if(washRecordIds.length > 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0]); showResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！'); }else if(washRecordIds.length == 1){ - addQualityMonitoringByResponPart("清洗消毒",washRecordIds[0]); + addQualityMonitoringByResponPart(responsibilityPart,washRecordIds[0]); }else { - addQualityMonitoringByResponPart("清洗消毒"); + addQualityMonitoringByResponPart(responsibilityPart); } } }