Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js =================================================================== diff -u -r41116 -r41411 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 41116) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 41411) @@ -23,7 +23,7 @@ //清洗篮筐 var basketTreePanelHeight = 380; //待清洗篮筐 -var pendingWashAndDisinfectWidth = 400; +var pendingWashAndDisinfectWidth = 380; var pendingWashAndDisinfectHeight = 575; var oldRinserName = ''; var oldDisinfectProgram = ''; @@ -891,7 +891,31 @@ text: '' }) }); - + + var tbar = []; + tbar.push('->',{ + iconCls: 'btn_ext_add_tousse', + text: '一键载入', + handler: function (_this) { + if (sstsConfig.hasOwnProperty('wrRecordScanPosition') && sstsConfig.wrRecordScanPosition) { + if ((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition) { + var position = top.Ext.getCmp('position').getValue(); + if (position == null || position == '') { + showResult("请先扫描位置"); + return; + } + } + } + var rootNode = top.Ext.getCmp('pendingWashAndDisinfectWin').getRootNode(); + rootNode.eachChild(function (childNode) { + if(childNode.attributes){ + var objBarcode = childNode.attributes.objBarcode; + var IDcardBarcode = childNode.attributes.IDcardBarcode || ''; + addPendingWashAndDisinfectBasketToRecord(objBarcode, IDcardBarcode) + } + }); + } + }); /** * 待清洗物品列表 */ @@ -950,6 +974,7 @@ dataIndex: 'recyclingTime', hidden: mergeSameDefinitionItemInClassifyBasket }], + tbar: tbar, loader: new top.Ext.tree.TreeLoader({ url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getPendingWashAndDisinfectTousseAndBasket.do?', uiProviders: {