Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r36466 -r36727 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 36466) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 36727) @@ -509,7 +509,7 @@ showResult("请选择器械包！" , null , sstsConfig.messagePauseTimeOnReviewPage); return false; } - + var waitingBox = Ext.Msg.wait("正在处理,请稍候..."); var basketName = Ext.getCmp("basketName").getValue(); //如果篮筐名称与条码都不为空时才进行判断 if(basketName && Ext.getCmp('basketBarcodes').getValue() != null){ @@ -522,6 +522,7 @@ var currentSterilingMode = selectedRecords[0].data["sterilingMode"]; //showResult("【"+ selectedRecords[0].data["tousseDefinition.name"] +"】"+ (currentSterilingMode ? ("属于【"+ currentSterilingMode +"】物品") : "") +"与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致，不能入框审核"); noticeDiffSterilingMessage(top.Ext , getDiffSterilingModeMessage(selectedRecords[0].data["tousseDefinition.name"] , currentSterilingMode, sterilingModeFromLeftReviewGrid , "审核") , afterNoticeMessageBoxClosed); + waitingBox.hide(); return false; } if(selectedRecords.length > 1){ @@ -531,6 +532,7 @@ //showResult("【"+ selectedRecords[i].data["tousseDefinition.name"] +"】"+ (currentSterilingMode ? ("属于【"+ currentSterilingMode +"】物品") : "") +"与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致，不能入框审核"); noticeDiffSterilingMessage(top.Ext , getDiffSterilingModeMessage(selectedRecords[0].data["tousseDefinition.name"] , currentSterilingMode, sterilingModeFromLeftReviewGrid , "审核") , afterNoticeMessageBoxClosed); Ext.getCmp('barcodes').focus(false, 100); + waitingBox.hide(); return false; } } @@ -560,6 +562,7 @@ } if(records.length == 0){ showResult("所选的器械包的灭菌程序与"+reviewViewText+"确认列表的器械包灭菌程序不一致！" , null , sstsConfig.messagePauseTimeOnReviewPage); + waitingBox.hide(); return false; } } @@ -574,6 +577,7 @@ //需要验证(所选器械包的灭菌程序等)的包实例记录 var needValidateRecords = []; + var sterilingTypeMap = {}; //验证右边grid选中的项是否是 相同的灭菌方式 for ( var i = 0;i添加" , null , sstsConfig.messagePauseTimeOnReviewPage); + } + sterilingTypeCanAddToReview = false; + } + //导入材料清单需要用到tousseDefinitionId，tousseDefinitionName + if(records[i].data['tousseDefinition.name'] && records[i].data['tousseDefinition.id']){ + records[i].data.tousseDefinitionId = records[i].data['tousseDefinition.id']; + records[i].data.tousseDefinitionName = records[i].data['tousseDefinition.name'] + } + }); + DWREngine.setAsync(true); + }else { + var jsonResult = sterilingTypeMap[sType]; if(!jsonResult.success){ if(jsonResult.message){ showResult(jsonResult.message , null , sstsConfig.messagePauseTimeOnReviewPage); @@ -603,8 +626,7 @@ records[i].data.tousseDefinitionId = records[i].data['tousseDefinition.id']; records[i].data.tousseDefinitionName = records[i].data['tousseDefinition.name'] } - }); - DWREngine.setAsync(true); + } } if(sterilingTypeCanAddToReview == false){ delete records[i]; @@ -630,6 +652,7 @@ } if(rightGridVaildPass == false){ addTousse(needValidateRecords); + waitingBox.hide(); return; }else{ var store = Ext.getCmp('forReviewGrid').getStore(); @@ -653,6 +676,7 @@ validateSterilizer(needValidateRecords); } } + waitingBox.hide(); Ext.getCmp('barcodes').focus(); } @@ -1008,12 +1032,16 @@ return; } } - var tousseIds = ""; + var tousseIds = ''; var store = forReviewGrid.getStore(); var count = store.getCount(); for (var i = 0; i < count; i++) { var record = store.getAt(i); - tousseIds += ";"+record.data.id; + if(tousseIds == ''){ + tousseIds = record.data.id; + }else { + tousseIds += ';'+record.data.id; + } } if(tousseIds == ''){ Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r36648 -r36727 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36648) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36727) @@ -341,9 +341,11 @@ count = 0 } if (pNode.childNodes && pNode.childNodes.length > 0) { - Ext4.each(pNode.childNodes, function (lastNode) { - lastNode.set('checked', checked) - }); + setTimeout(function() { + Ext4.each(pNode.childNodes, function (lastNode) { + lastNode.set('checked', checked) + }); + }, 1000); } }); if (count <= 1) { @@ -367,11 +369,13 @@ if (rootNode != null) { Ext4.each(rootNode.childNodes, function (pNode) { pNode.set('checked', checked); - if (pNode.childNodes && pNode.childNodes.length > 0) { - Ext4.each(pNode.childNodes, function (lastNode) { - lastNode.set('checked', checked); - }); - } + setTimeout(function() { + if (pNode.childNodes && pNode.childNodes.length > 0) { + Ext4.each(pNode.childNodes, function (lastNode) { + lastNode.set('checked', checked); + }); + } + }, 1000); }); } Ext4.getCmp('waitPackingTreeGrid').getView().refresh(); @@ -4269,7 +4273,7 @@ } function showPackingTousseBtnClick_mask() { - packingTousseBtnClick_mask = new Ext4.LoadMask({ msg: "正在装配，请稍候...", target: Ext4.getCmp('packingViewTab0') }); + packingTousseBtnClick_mask = new Ext4.LoadMask({ msg: "正在处理，请稍候...", target: Ext4.getCmp('packingViewTab0') }); packingTousseBtnClick_mask.show(); } function hidePackingTousseBtnClick_mask() { @@ -6503,46 +6507,6 @@ setGridColumnsWidth(root, waitPackingTreeGrid, 'waitPackingTreeGrid'); } }, - render: function () { - //滚动加载数据 - // $('#waitPackingTreeGrid-body .x4-tree-view').on('scroll', function (e) { - // if ((e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight)) { - // if (pageNow < waitPackingPageNumber) { - // waitPackColumnTreeGrid.getEl().mask("数据加载中..."); - // setTimeout(function () { - // pageNow++; - // Ext4.Ajax.request({ - // url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskJson.do', - // params: { - // taskGroup: taskGroup, - // sort: '[{ "property": "leaf", "direction": "ASC" }]', - // node: 'data', - // pageIndex: pageNow, - // pageSize: waitPackingPageSize - // }, - // success: function (response, options) { - // var result = Ext4.JSON.decode(response.responseText); - // var rootNode = waitPackingTaskStore.getRootNode(); - // if (result.length > 0) { - // for (var i = 0; i < result.length; i++) { - // var parentNode = addTaskNode(result[i]); - // if (result[i].children.length > 0) { - // for (var j = 0; j < result[i].children.length; j++) { - // var childNode = addTaskNode(result[i].children[j]); - // parentNode.appendChild(childNode); - // } - // } - // rootNode.appendChild(parentNode); - // } - // } - // waitPackColumnTreeGrid.getEl().unmask(); - // } - // }); - // }, 200); - // } - // } - // }) - }, checkchange: function (node, checked, eOpts) { if (!node.get('leaf')) { Ext4.each(node.childNodes, function (pNode) {