Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28491 -r28503 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28491) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28503) @@ -188,7 +188,6 @@ tousseArray.push(newTousse); } } - console.log(tousseArray) } var ab; @@ -1092,7 +1091,6 @@ * @param basketItem */ function addBasketItemElement(basketItem){ - console.log(basketItem) var ci_id = basketItem.ci_id; var type = basketItem.type; var orgUnitName = basketItem.orgUnitName; @@ -3904,7 +3902,6 @@ var jsonStr = getJsonParams(confirmation,isConfirm); if(jsonStr == '') {return;} var jSONe = JSON.parse(jsonStr); - //console.log(jSONe);return alertDiv("保存中,请稍候......", true); if(IntheBoxState == true){ jSONe.tally = true; Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js =================================================================== diff -u -r28486 -r28503 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 28486) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 28503) @@ -299,11 +299,24 @@ //获取拆分的包的数据 function getSplitForeignTousse(){ var packages = []; - for ( var i = 0; i < childPackageStore.getCount(); i++) { + var nameIncludeSplitTotalAmountForSplitForeignTousse = getBoolValueFromJs("sstsConfig.nameIncludeSplitTotalAmountForSplitForeignTousse",false); + var splitForeignTousseNameStyle = getIntValueFromJs("sstsConfig.splitForeignTousseNameStyle",0); + var count = childPackageStore.getCount(); + + for ( var i = 0; i < count; i++) { var record = childPackageStore.getAt(i); - + var tousseName = record.get('tousseName'); + if(nameIncludeSplitTotalAmountForSplitForeignTousse){ + tousseName += "(" + (i + 1) + "/" + count + ")"; + }else{ + if(splitForeignTousseNameStyle == 1){ + tousseName += "(" + count + "-" + (i + 1) + ")"; + }else{ + tousseName += "(部分" + (i + 1) + ")"; + } + } var tousse = {}; - tousse.tousseName = record.get('tousseName'); + tousse.tousseName = tousseName; tousse.materialNames = record.get('materialNames'); tousse.materialsJsonArray = record.get('materialsJsonArray'); tousse.bigPackage = record.get('bigPackage'); @@ -575,7 +588,7 @@ var sterileDate = new Date(); //灭菌日期默认为当天 var myMask = new top.Ext.LoadMask(top.Ext.getBody(), {msg:"正在装配..."}); - myMask.show(); + myMask.show(); var params = { applicationId:applicationId, @@ -590,7 +603,6 @@ sterilizer: sterilizer, frequency: frequency } - PackingTableManager.interfereSplitForeignTousse(JSON.stringify(params),function(rs){ myMask.hide(); if (rs != null){