Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r22133 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 22133) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 22403) @@ -59,20 +59,20 @@ hideMessageBox(true); var retObj = JSON.parse(response.responseText); if(isUndefinedOrNullOrEmpty(retObj.msg)){ - showResult("废弃成功!"); + showResult("废弃成功!" , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ - showResult(retObj.msg); + showResult(retObj.msg , null , sstsConfig.messagePauseTimeOnPackingPage); } reloadTousseInstances(); }, failure : function(response, options) { hideMessageBox(true); - showResult("废弃失败!"); + showResult("废弃失败!" , null , sstsConfig.messagePauseTimeOnPackingPage); reloadTousseInstances(); } }); }else{ - showResult("必须填写废弃原因!"); + showResult("必须填写废弃原因!" , null , sstsConfig.messagePauseTimeOnPackingPage); } } function reloadTousseInstances(){ @@ -311,7 +311,7 @@ handler : function() { var records = rePrintGrid.getSelectionModel().getSelections(); if (records.length == 0) { - showResult("请选择要修改的器械包!"); + showResult("请选择要修改的器械包!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var tousseInstanceIDs = ''; @@ -333,7 +333,7 @@ handler : function() { var records = rePrintGrid.getSelectionModel().getSelections(); if (records.length == 0) { - showResult("请选择要重新打印的器械包!"); + showResult("请选择要重新打印的器械包!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var printFullName = true; @@ -545,7 +545,7 @@ handler : function() { var records = rePrintGrid.getSelectionModel().getSelections(); if (records.length == 0) { - showResult("请选择要废弃的器械包!"); + showResult("请选择要废弃的器械包!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } top.Ext.MessageBox.confirm("请确认",'确定要废弃选中的器械包吗!', @@ -572,7 +572,7 @@ handler : function() { var records = rePrintGrid.getSelectionModel().getSelections(); if (records.length == 0) { - showResult("请选择要加急的器械包!"); + showResult("请选择要加急的器械包!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } top.Ext.MessageBox.confirm("请确认",'确定要加急选中的器械包吗!', @@ -592,10 +592,10 @@ }, success : function(response, options) { var result = JSON.parse(response.responseText); - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); }, failure : function(response, options) { - showResult("保存出错,请联系管理员!"); + showResult("保存出错,请联系管理员!" , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -633,7 +633,7 @@ if(rowNum!=-1){ rePrintGrid.getView().getRow(rowNum).style.backgroundColor='#91a8c7'; } else { - showResult('找不到此条形码数据!'); + showResult('找不到此条形码数据!' , null , sstsConfig.messagePauseTimeOnPackingPage); } top.Ext.getCmp('barcode').setValue(''); } @@ -722,7 +722,7 @@ UserTableManager.getUserByBarcode(peopleOfBarcode,function(user){ if(user != null && user != ""){ if(user == 'notSameDepart'){ - showResult("配包者必须与当前登录用户的科室相同!"); + showResult("配包者必须与当前登录用户的科室相同!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } if(jobType=='jobType_pack') { @@ -731,7 +731,7 @@ top.Ext.getCmp('reviewer').setValue(user); } }else{ - showResult('找不到该条码所对应的人员信息'); + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnPackingPage); if(jobType=='jobType_pack') { top.Ext.getCmp('operator2').setValue(); } else if(jobType=='jobType_review') { Index: ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js =================================================================== diff -u -r18491 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js (.../recyclingDamageRecordForm.js) (revision 18491) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js (.../recyclingDamageRecordForm.js) (revision 22403) @@ -5,7 +5,7 @@ if (rows) { for ( var i = 0; i < rows.length; i++) { if(rows[i].get('additionalAmount')){ - showResult('不能删除已补充数量的器材报损记录!'); + showResult('不能删除已补充数量的器材报损记录!' , null , sstsConfig.messagePauseTimeOnPackingPage); return; } recyclingDamageItemStore.remove(rows[i]); @@ -45,23 +45,23 @@ var tempCount = top.Ext.getCmp('tempCount').getValue(); if(!tempMaterial) { - showResult("请输入材料名称!"); + showResult("请输入材料名称!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } if(tempCount<1){ - showResult("输入数量不能小于0!"); + showResult("输入数量不能小于0!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } if(!tempCount) { - showResult("请输入数量!"); + showResult("请输入数量!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } //检查记录是否已存在 if(isExist(tempTousseName, tempMaterial)){ - showResult('报损器材列表中已经包含该记录,不能重复添加!'); + showResult('报损器材列表中已经包含该记录,不能重复添加!' , null , sstsConfig.messagePauseTimeOnPackingPage); return; } @@ -91,7 +91,7 @@ } } if(!hasFind){ - showResult('输入的器械包当前还没被回收!'); + showResult('输入的器械包当前还没被回收!' , null , sstsConfig.messagePauseTimeOnPackingPage); return; } } @@ -112,7 +112,7 @@ damagedAmount += tempDamagedAmount; } if(!hasFind && tempDamagedAmount == -1){ - showResult('输入的材料当前还没被回收!'); + showResult('输入的材料当前还没被回收!' , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ addItemToGrid(tempTousseName, tempMaterial, damagedAmount, tempCount,materialDefintionId, true); } @@ -158,7 +158,7 @@ function addItemToGrid(tempTousseName, tempMaterial, damagedAmount, tempCount,materialDefinitionId, valid){ if(valid && tempCount > damagedAmount){ - showResult('当前输入的材料的最大可报损数量为'+damagedAmount+'!'); + showResult('当前输入的材料的最大可报损数量为'+damagedAmount+'!' , null , sstsConfig.messagePauseTimeOnPackingPage); return; } top.Ext.getCmp('recyclingDamageItemGrid').getStore().add( @@ -595,14 +595,14 @@ }, afteredit : function(e) { if(e.value<1){ - showResult("输入数量不能小于1!"); + showResult("输入数量不能小于1!" , null , sstsConfig.messagePauseTimeOnPackingPage); e.record.set('amount',tempAmount); return; } //输入的数量不能小于已补充的数量 if(e.record.get('additionalAmount') && e.value < e.record.get('additionalAmount')){ - showResult("输入数量不能小于已补充的数量!"); + showResult("输入数量不能小于已补充的数量!" , null , sstsConfig.messagePauseTimeOnPackingPage); e.record.set('amount',tempAmount); return; } @@ -677,19 +677,19 @@ // } if(tempDamagedAmount <= 0){ - showResult('该材料没有可报损的数量!'); + showResult('该材料没有可报损的数量!' , null , sstsConfig.messagePauseTimeOnPackingPage); return; } if(e.record.data['id'] != 0){ var difAmount = e.record.data['amount'] - e.record.data['oldAmount']; if(difAmount > 0 && difAmount > tempDamagedAmount){ - showResult('该材料的最大可报损数量为'+tempDamagedAmount+'!'); + showResult('该材料的最大可报损数量为'+tempDamagedAmount+'!' , null , sstsConfig.messagePauseTimeOnPackingPage); e.record.set('amount',tempAmount); return; } }else if(e.record.data['amount'] > tempDamagedAmount){ - showResult('该材料的最大可报损数量为'+tempDamagedAmount+'!'); + showResult('该材料的最大可报损数量为'+tempDamagedAmount+'!' , null , sstsConfig.messagePauseTimeOnPackingPage); e.record.set('amount',tempAmount); return; } @@ -787,19 +787,19 @@ function submitFormFunction(param){ var form = top.Ext.getCmp('recyclingDamageRecordForm'); if(top.Ext.getCmp('damageOfPeople').getValue().length<1){ - showResult('报损人信息不能为空'); + showResult('报损人信息不能为空' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(!form.getForm().isValid()){ - showResult('请正确填写表单各值'); + showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var recyclingDamageItemStore = top.Ext.getCmp('recyclingDamageItemGrid').getStore(); if(recyclingDamageItemStore.getCount()<1){ - showResult('报损器材信息列表不能为空'); + showResult('报损器材信息列表不能为空' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(param){ @@ -811,7 +811,7 @@ //验证材料是否够减 var materialName = eachMaterialAndCallback(recyclingDamageItemStore, validateReduce, true); if(materialName){ - showResult(materialName+'的报损数量不能大于回收数量'); + showResult(materialName+'的报损数量不能大于回收数量' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } //删减材料(报损) @@ -846,14 +846,14 @@ params : {params : JSON.stringify(params)}, success : function(form, action) { if(action.result.success){ - showResult("保存成功!"); + showResult("保存成功!" , null , sstsConfig.messagePauseTimeOnPackingPage); top.Ext.getCmp('recyclingDamageRecordWin').close(); }else{ - showResult(action.result.message); + showResult(action.result.message , null , sstsConfig.messagePauseTimeOnPackingPage); } }, failure : function(form, action) { - showResult(action.result.message); + showResult(action.result.message , null , sstsConfig.messagePauseTimeOnPackingPage); } }); return true; Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r22162 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 22162) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 22403) @@ -128,11 +128,11 @@ function callModifyFunction(){ var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { - showResult("请选择发货计划单!"); + showResult("请选择发货计划单!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } if (records.length > 1) { - showResult("一次只能修改一个发货计划单!"); + showResult("一次只能修改一个发货计划单!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } var departCode = records[0].data['departCode']; @@ -163,11 +163,11 @@ } function openInvoicePlanByBarcode(barcode){ if(isUndefinedOrNullOrEmpty(barcode)){ - showResult("请扫描科室条码或申请单条码"); + showResult("请扫描科室条码或申请单条码" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return; } if(invoicePlanOpening){ - showResult("申请单正在打开,请勿扫描太快!"); + showResult("申请单正在打开,请勿扫描太快!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return; } invoicePlanOpening = true; @@ -185,16 +185,16 @@ if(result.success){ openMode = INVOICE_FORM_OPEN_MODE_SCANBARCODE; addAndEditInvoicePlan(result.data.departCode,result.data.depart,result.data.invoicePlanId); - showResult(result.data.depart + "的发货单"); + showResult(result.data.depart + "的发货单" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); }else{ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } } }, failure : function(form, action) { invoicePlanOpening = false; if(action.result && action.result.message){ - showResult(action.result.message); + showResult(action.result.message , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } } }); Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js =================================================================== diff -u -r20029 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 20029) +++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 22403) @@ -81,7 +81,7 @@ var errorAmount = record.data["errorAmount"]; var damageAmount = record.data["damageAmount"]; if(errorAmount > 0 || damageAmount > 0){ - showResult(tousseName + "丢失器械" + errorAmount + "件,报损器械" + damageAmount + "件,请补充后再装配!"); + showResult(tousseName + "丢失器械" + errorAmount + "件,报损器械" + damageAmount + "件,请补充后再装配!" , null , sstsConfig.messagePauseTimeOnPackingPage); exist = true; } return exist; @@ -113,7 +113,7 @@ }else{ var records = waitComboTousseGrid.getSelectionModel().getSelection(); if (records.length == 0) { - showResult("请选择!"); + showResult("请选择!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } for(var i = 0 ; i < records.length ; i++){ @@ -124,7 +124,7 @@ var packageType = records[i].data["packageType"]; if(amount > maxAmount){ - showResult("聚合数量不能大于总数量!"); + showResult("聚合数量不能大于总数量!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var isExist = isExistErrorOrDamage(records[i]); @@ -161,7 +161,7 @@ }else{ var records = comboGrid.getSelectionModel().getSelection(); if (records.length == 0) { - showResult("请选择!"); + showResult("请选择!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } for(var i = 0 ; i < records.length ; i++){ @@ -221,7 +221,7 @@ //删除 comboGridStore.removeAll(); }else{ - showResult("请选择聚合的器械包!"); + showResult("请选择聚合的器械包!" , null , sstsConfig.messagePauseTimeOnPackingPage); } } @@ -264,7 +264,7 @@ if(responseText){ var result = Ext.decode(responseText); if(!result.success){ - showResult("输入的条码有误!"); + showResult("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; }else{ nameTextfieldObj.setValue(result.fullName); @@ -276,7 +276,7 @@ }else{ codeTextfieldObj.setValue(""); nameTextfieldObj.setValue(""); - showResult('找不到该条码所对应的人员信息'); + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -406,7 +406,7 @@ },success : function(response, options) { var result = Ext4.decode(response.responseText); if(!result.success){ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var includeTousseJson = result.data; @@ -438,7 +438,7 @@ }, failure : function(response, options) { var result = Ext4.decode(response.responseText); - showResult(result.cause); + showResult(result.cause , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -950,7 +950,7 @@ function onPackingBtnClick(btn){ if (!packingComboToussePanel.form.isValid()) { - showResult('请正确填写表单各值'); + showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnPackingPage); btn.enable(); return false; } @@ -961,15 +961,15 @@ v = comboTousseStore.getCount(); if(v > 0){ - showResult("还有部分器械包未确认!"); + showResult("还有部分器械包未确认!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } top.Ext4.getCmp('taskGroup3').setValue(taskGroup); var reviewer = top.Ext4.getCmp('reviewer3'); if(reviewer.isVisible() && !reviewer.getValue()){ - showResult("请扫描审核人条码!"); + showResult("请扫描审核人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var comboTousseDataStore = top.Ext4.getCmp("comboTousseDataGrid").getStore(); @@ -983,12 +983,12 @@ } } if(isHaveEmptyPackingType){ - showResult("有聚合包未设置包装类型!"); + showResult("有聚合包未设置包装类型!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(!getComboTousseData()){ - showResult("装配物品不能为空!"); + showResult("装配物品不能为空!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } @@ -1040,7 +1040,7 @@ // 审核时打印标签 if (sstsConfig.printLabelWhenReviewing == true){ - showResult("装配完成"); + showResult("装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage); } // 装配时打印标签 else{ @@ -1078,7 +1078,7 @@ } } else{ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); } } }); @@ -1123,11 +1123,11 @@ var tousseName = item.tousseName; var waitItem = waitAmount[id]; if(isUndefinedOrNull(waitItem)){ - showResult(tousseName+' 超过数量!'); + showResult(tousseName+' 超过数量!' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(item.amount > waitItem.amount){ - showResult(tousseName+' 超过数量!'); + showResult(tousseName+' 超过数量!' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } } @@ -1143,11 +1143,11 @@ var tousseName = item.tousseName; var waitComboRecord = ext4_findRecordByNameAndValueFromStore(top.Ext4.getCmp("waitComboTousseGrid").getStore(),'id',id); if(isUndefinedOrNull(waitComboRecord)){ - showResult(tousseName+' 超过数量!'); + showResult(tousseName+' 超过数量!' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(item.amount > waitComboRecord.get('maxAmount')){ - showResult(tousseName+' 超过数量!'); + showResult(tousseName+' 超过数量!' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } } @@ -1185,11 +1185,11 @@ var tousseName = item.tousseName; var waitComboRecord = ext4_findRecordByNameAndValueFromStore(waitComboTousseGridStore,'id',id); if(isUndefinedOrNull(waitComboRecord)){ - showResult(tousseName+' 超过数量!'); + showResult(tousseName+' 超过数量!' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(item.amount > waitComboRecord.get('maxAmount')){ - showResult(tousseName+' 超过数量!'); + showResult(tousseName+' 超过数量!' , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var newAmount = waitComboRecord.get('maxAmount') - item.amount; Index: ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js =================================================================== diff -u -r20777 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js (.../damageMaterialAdditionalForm.js) (revision 20777) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js (.../damageMaterialAdditionalForm.js) (revision 22403) @@ -206,19 +206,19 @@ success : function(response, options) { var result = Ext.decode(response.responseText); if(result.message != ""){ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ top.Ext.getCmp("scanedBarcode").setValue(barcode); top.Ext.getCmp("showBasketName").setText("清洗篮筐名称:"+result.data.containerName); top.Ext.getCmp("inputText").setValue(""); } }, failure : function(response, options) { - showResult("系统加载失败,请稍候再试"); + showResult("系统加载失败,请稍候再试" , null , sstsConfig.messagePauseTimeOnPackingPage); } }); }else{ - showResult('请扫描篮筐条码!'); + showResult('请扫描篮筐条码!' , null , sstsConfig.messagePauseTimeOnPackingPage); } } } @@ -311,7 +311,7 @@ handler : function(){ var length = additionalMaterialStore.getCount(); if(length == 0){ - showResult("没有待补充的器械!"); + showResult("没有待补充的器械!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var materialArray = []; @@ -345,7 +345,7 @@ params : params, success : function(response, options) { var result = Ext.decode(response.responseText); - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); if(result.success){ additionalMaterialCallback(result.success,type,packingTaskId); @@ -358,7 +358,7 @@ }, failure : function(response, options) { var result = Ext.decode(response.responseText); - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js =================================================================== diff -u -r22203 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 22203) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 22403) @@ -222,12 +222,12 @@ }]); function doSaveAction(){ if (!form.getForm().isValid()) { - showResult('请正确填写表单各值'); + showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } //验证发货物品表格 if(!sendOutGoodsStore || sendOutGoodsStore.getCount() == 0){ - showResult('发货物品不能为空!'); + showResult('发货物品不能为空!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } /*var b = validTousseGridData(); @@ -245,17 +245,17 @@ waitTitle : '提交表单', success : function(form, action) { // 一定要事务提交成功才返回发货计划列表界面 - showResult(action.result.message); + showResult(action.result.message , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); if(action.result.success){ auxiliaryInvoiceFormWindow.close(); grid.getStore().reload(); } }, failure : function(form, action) { if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.message)){ - showResult(action.result.message); + showResult(action.result.message , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); }else{ - showResult("发货超时,请稍后查看发货单以确定发货是否成功,避免重复发货!"); + showResult("发货超时,请稍后查看发货单以确定发货是否成功,避免重复发货!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); auxiliaryInvoiceFormWindow.close(); grid.getStore().reload(); } @@ -395,7 +395,7 @@ top.Ext.getCmp('sender').setValue(resultArray[1]); Ext.state.Manager.getProvider().set('cookieSender',resultArray[1]); }else{ - showResult(resultArray[1]); + showResult(resultArray[1] , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('sender').setValue(""); } } @@ -443,7 +443,7 @@ if(!isUndefinedOrNullOrEmpty(responseText)){ var result = top.Ext.decode(responseText); if(!result.success){ - result.isNotSameOrgUnit?showResult("不允许登记非本科室人员,请扫描本科室人员条码"):showResult("输入的条码有误!"); + result.isNotSameOrgUnit?showResult("不允许登记非本科室人员,请扫描本科室人员条码" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage):showResult("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return; } Ext.state.Manager.getProvider().set('cookiePersonInCharge',result.fullName); @@ -452,7 +452,7 @@ top.Ext.getCmp('personInChargeCode').setValue(result.name); top.Ext.getCmp('scanText').focus(); }else{ - showResult('找不到该条码所对应的人员信息'); + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } }); } @@ -817,7 +817,7 @@ // 生物监测 if (sstsConfig.biologicalMonitoringEnable) { //发货时对含植入物的器械包,进行是否紧急发货以及生物监测情况的提示 if (goods.biologicalMonitoringFail) { //生物监测不合格 - alert('[' + goods.name + ']生物监测结果为不合格,不能发货'); + showResult('[' + goods.name + ']生物监测结果为不合格,不能发货' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); continue; } @@ -841,7 +841,7 @@ rows[i].set('added',true); } if(goods.needRoutineMonitoringWarming == true){ - showResult("该物品灭菌炉没有进行监测,请登记!"); + showResult("该物品灭菌炉没有进行监测,请登记!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } addTousses.push(goods); } @@ -885,13 +885,13 @@ var tousse = r.data; var goods = getSendOutGoodsByBarcode(tousse.barcode); if(goods != null){ - showResult('条形码:'+tousse.barcode+' 已经存在!'); + showResult('条形码:'+tousse.barcode+' 已经存在!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } if(tousse.notSendAmount > 0){ var addCount = getAddedCountByTousseDefinitionId(tousse.tousseDefinitionId); if(addCount >= tousse.notSendAmount){ - showResult(tousse.showTousseName + '已满足发货计划!'); + showResult(tousse.showTousseName + '已满足发货计划!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } } Index: ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js =================================================================== diff -u -r22235 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js (.../config.js) (revision 22235) +++ ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js (.../config.js) (revision 22403) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 禁用标识牌功能 disableIdCard : false, // 审核器械包必须入篮筐(一级供应室) @@ -112,6 +112,14 @@ auxiliaryInvoiceTousseTypes: '敷料包,普通器械包,外来器械包,外部代理灭菌包', //是否允许回收数量减小的部分超过待装配数量。如果允许,那装配任务就被删除 allowDecreaseRecyclingAmountGreatUnPackingAmount:true, + //装配页面消息提示筐的默认停留时间(单位:秒) + messagePauseTimeOnPackingPage:1, + //审核页面消息提示筐的默认停留时间(单位:秒) + messagePauseTimeOnReviewPage:1, //灭菌页面消息提示筐的默认停留时间(单位:秒) - messagePauseTimeOnSterilizationRecordPage:1 + messagePauseTimeOnSterilizationRecordPage:1, + //发货计划页面消息提示筐的默认停留时间(单位:秒) + messagePauseTimeOnInvoiceplanPage:1, + //是否启用新的年度消毒供应中心工作量统计报表 + enableNewYearWorkloadReport : true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js =================================================================== diff -u -r13979 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js (.../tousseMaintainForm.js) (revision 13979) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js (.../tousseMaintainForm.js) (revision 22403) @@ -53,15 +53,15 @@ loadMaintainMsgByIdcardID(barcode); } else{ - showResult('找不到该条码所对应的信息!'); + showResult('找不到该条码所对应的信息!' , null , sstsConfig.messagePauseTimeOnPackingPage); } }else{ - showResult('找不到该条码所对应的信息!'); + showResult('找不到该条码所对应的信息!' , null , sstsConfig.messagePauseTimeOnPackingPage); } top.Ext.getCmp('inputText').setValue(''); }); }else{ - showResult('请扫描条码!'); + showResult('请扫描条码!' , null , sstsConfig.messagePauseTimeOnPackingPage); } } } @@ -246,7 +246,7 @@ waitTitle : '提交表单', success : function(form, action) { tousseMaintainWin.close(); - showResult('保存成功'); + showResult('保存成功' , null , sstsConfig.messagePauseTimeOnPackingPage); if("undefined" != typeof(grid)){ grid.dwrReload(); } @@ -257,7 +257,7 @@ } }); }else{ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); top.Ext.getCmp('saveBtn').enable(); } }, @@ -271,7 +271,7 @@ function save() { this.disable(); if (!formObj.form.isValid()) { - showResult("请正确填写表单各值"); + showResult("请正确填写表单各值" , null , sstsConfig.messagePauseTimeOnPackingPage); this.enable(); return false; } @@ -288,18 +288,18 @@ var setComBoVal = ''; var cleanMinutes = 0; if(isUndefinedOrNullOrEmpty(barcode)){ - showResult('条码不能为空!'); + showResult('条码不能为空!' , null , sstsConfig.messagePauseTimeOnPackingPage); } UserTableManager.getUserByBarcode(barcode,function(responseText){ if(!isUndefinedOrNullOrEmpty(responseText)){ var result = top.Ext.decode(responseText); if(!result.success){ - showResult("输入的条码有误!"); + showResult("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } top.Ext.getCmp('maintainUser').setValue(result.fullName); }else{ - showResult('找不到该条码所对应的人员信息'); + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -310,26 +310,26 @@ var setComBoVal = ''; var cleanMinutes = 0; if(barcode == undefined || barcode == ''){ - showResult('条码不能为空!'); + showResult('条码不能为空!' , null , sstsConfig.messagePauseTimeOnPackingPage); } var optType = top.Ext.getCmp('optType').getValue(); if(optType == '到期添加') { - showResult("到期添加不能扫描标识牌!"); + showResult("到期添加不能扫描标识牌!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } TousseMaintainTableManager.getMaintainMsgByIdcardID(barcode,function(responseText){ if(!isUndefinedOrNullOrEmpty(responseText)){ var result = top.Ext.decode(responseText); if(!result.success){ - showResult("输入的条码有误!"); + showResult("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } top.Ext.getCmp('tousseName').setValue(result.tousseName); top.Ext.getCmp('beenUseCount').setValue(result.useAmount); top.Ext.getCmp('idCardInstanceIDBarcode').setValue(result.idCardBarcode); }else{ - showResult('找不到该条码所对应的信息'); + showResult('找不到该条码所对应的信息' , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r22080 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 22080) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 22403) @@ -308,14 +308,14 @@ var record = recyclingapplicationStore.getAt(i); var count =record.get('count'); if(/[^0-9]/g.test(count)){ - showResult('['+getTtsNameByAppRecord(record)+'] 申请数量必须是数字,保存失败!'); + showResult('['+getTtsNameByAppRecord(record)+'] 申请数量必须是数字,保存失败!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('sendOutGoodsDetail').getView().getRow(i).style.backgroundColor = '#FFB5B5'; b = false; break; } var errorAmount = record.get('errorAmount'); if(parseInt(errorAmount) < 0){ - showResult('['+getTtsNameByAppRecord(record)+'] 误差数量不能小于0,保存失败!'); + showResult('['+getTtsNameByAppRecord(record)+'] 误差数量不能小于0,保存失败!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); b = false; break; } @@ -324,7 +324,7 @@ var record = sendOutGoodsStore.getAt(i); var count =record.get('count'); if(/[^0-9]/g.test(count)){ - showResult('['+getTtsNameByAppRecord(record)+'] 申请数量必须是数字,保存失败!'); + showResult('['+getTtsNameByAppRecord(record)+'] 申请数量必须是数字,保存失败!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('sendOutGoods').getView().getRow(i).style.backgroundColor = '#FFB5B5'; b = false; break; @@ -359,12 +359,12 @@ if(count != tempAmount){//实际数量要与发货数量相同 b = false; top.Ext.getCmp('sendOutGoodsDetail').getView().getRow(i).style.backgroundColor = '#FFB5B5'; - showResult(record.get('showTousseName')+" 发货数量与实发数量不同!"); + showResult(record.get('showTousseName')+" 发货数量与实发数量不同!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } if(Number(count) > Number(applicationAmount)){//发货数量不能大于待发货数量 b = false; top.Ext.getCmp('sendOutGoodsDetail').getView().getRow(i).style.backgroundColor = '#FFB5B5'; - showResult(record.get('name')+" 发货数量不能大于" + applicationAmount); + showResult(record.get('name')+" 发货数量不能大于" + applicationAmount , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } } return b; @@ -473,7 +473,7 @@ if(goods.diposable == '是'){ if(storageAmount < notSendAmount){// 库存小于待发货数量 var msg = getTtsNameByGoods(goods) + goods.barcode + ',该批次只满足部分发货!' - showResult(msg); + showResult(msg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } } } @@ -632,7 +632,7 @@ } var sourceWarehouseId = top.Ext.getCmp("sourceWarehouseId").getValue(); if(isUndefinedOrNullOrEmpty(sourceWarehouseId)){ - showResult('请先选择仓库!'); + showResult('请先选择仓库!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } if(singleMode){// 判断是否已经扫描过该条码 @@ -645,15 +645,15 @@ if(goods.tousseType == '器械包'){// 目前只处理普通器械包的误差,以及删除 var appGoods = getApplicationGoodsByName(goods.name); if(appGoods.errorAmount >= 0){// 误差数量大于等于0时,能正常发货,此时重复扫描,按以前的逻辑处理,提示条码已存在 - showResult('条形码:'+barcode+' 已经存在!'); + showResult('条形码:'+barcode+' 已经存在!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; }else{// 误差数量小于0时,说明扫描数量已经大于申请数量,此时重复扫描某个包,需要删除该包。 // 删除该器械包 removeSendOutTousseByBarcode(goods.barcode); return false; } }else{ - showResult('条形码:'+barcode+' 已经存在!'); + showResult('条形码:'+barcode+' 已经存在!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } } @@ -690,7 +690,7 @@ //待发数量是否大于篮筐内该物品的数量 var sendAmount = Number(count) - Number(tempAmount);// 待发数量 if(sendAmount < Number(totalAmount)){ - showResult(name1+'超过待发数量!'); + showResult(name1+'超过待发数量!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return true; } } @@ -706,7 +706,7 @@ // 如果未找到,继续找下一个 if (record == undefined){ var msg = '['+tousseName+']不在发货计划中!'; - showResult(msg); + showResult(msg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } } @@ -716,7 +716,7 @@ function processComboTousse(data,speakBasket){ var tousseInstancesBelongToThisComboTousse = data.tousseInstancesBelongToThisComboTousse; if(isUndefinedOrNull(tousseInstancesBelongToThisComboTousse)){ - showResult("数据错误,聚合包包含的实例为空!"); + showResult("数据错误,聚合包包含的实例为空!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return ; } // 聚合包是否都在发货计划内 @@ -735,7 +735,7 @@ var sendAmount1 = record.data['tempAmount']; if(!isUndefinedOrNullOrEmpty(goods.showResult)){ - showResult(goods.showResult); + showResult(goods.showResult , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } var existingGoods = getSendOutGoodsByBarcode(goods.barcode); if(existingGoods){ @@ -788,21 +788,21 @@ var result = Ext.decode(response.responseText); // 首先处理错误信息 if(!isUndefinedOrNullOrEmpty(result.errMsg)){ - showResult(result.errMsg); + showResult(result.errMsg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('scanText').setValue(""); top.Ext.getCmp('scanTextEnd').setValue(""); top.Ext.getCmp('scanText').focus(); return; } if(result.data.length == 0){ - showResult("找不到该条码对应的信息。"); + showResult("找不到该条码对应的信息。" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('scanText').setValue(""); top.Ext.getCmp('scanTextEnd').setValue(""); top.Ext.getCmp('scanText').focus(); return; } if(result.isNeedRoutineMonitoringWarning != undefined && result.isNeedRoutineMonitoringWarning == true){ - showResult("该物品灭菌炉没有进行监测,请登记!"); + showResult("该物品灭菌炉没有进行监测,请登记!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } // 验证灭菌筐内的物品是否符合发货条件,扫描的器械包数量是否大于申请数量 var tousseNameToAmountMap = getTousseNameToAmountMap(result); @@ -828,7 +828,7 @@ } for( var name in exceedAmountNames ){ if(exceedAmountNames.hasOwnProperty(name)){ - showResult(name + ",篮筐内数量大于申请数量,请逐个扫描!"); + showResult(name + ",篮筐内数量大于申请数量,请逐个扫描!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } } @@ -863,13 +863,13 @@ if(!isUndefinedOrNullOrEmpty(goods.tousseType)){ msg = '['+goods.tousseType+']'+'['+getTtsNameByGoods(goods)+']不在发货计划中!'; } - showResult(msg); + showResult(msg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); continue; } // 唯一条码消毒物品的校验 if(goods.tousseType == '消毒物品' && !goods.tousseFixedBarcode){ if(!validateDisinfection(record,goods)){ - showResult(getTtsNameByGoods(goods)+'的材料与申请单中的材料不一致'); + showResult(getTtsNameByGoods(goods)+'的材料与申请单中的材料不一致' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); continue; } } @@ -895,7 +895,7 @@ } } if(!inPlan){ - showResult('请扫描发货计划申请单对应的器械包条码!'); + showResult('请扫描发货计划申请单对应的器械包条码!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); continue; } } @@ -904,15 +904,15 @@ var sendAmount1 = record.data['tempAmount']; //验证发货数量是否大于申请数量 if(sendAmount1 == appAmount1 && (!sstsConfig.invoicePlanExtractedForm_allowNegativeErrorAmount || goods.tousseType != '器械包')){ - showResult(getTtsNameByGoods(goods)+',已满足发货计划!'); + showResult(getTtsNameByGoods(goods)+',已满足发货计划!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); continue; } var validatePass = goods.validatePass;// 没见其他地方有这个属性,暂时保留? if(!validatePass){ continue; } if(!isUndefinedOrNullOrEmpty(goods.showResult)){ - showResult(goods.showResult); + showResult(goods.showResult , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } var goodsName = goods.name; // 验证是否为申请的物品 @@ -927,7 +927,7 @@ if (sstsConfig.biologicalMonitoringEnable && biologicalMonitoringWarning) { //发货时对含植入物的器械包,进行是否紧急发货以及生物监测情况的提示 if (goods.biologicalMonitoringFail) { //生物监测不合格 - alert('[' + goods.name + ']生物监测结果为不合格,不能发货'); + showResult('[' + goods.name + ']生物监测结果为不合格,不能发货' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); continue; } @@ -964,7 +964,7 @@ }, failure : function(response, options) { top.Ext.getCmp("sendOutGoods").getEl().unmask(); - showResult('获取条码信息失败'); + showResult('获取条码信息失败' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('scanText').setValue(""); top.Ext.getCmp('scanTextEnd').setValue(""); top.Ext.getCmp('scanText').focus(); @@ -1011,7 +1011,7 @@ if(diposable != '是'){ msg = '待发物品['+name+']为器械包,请扫描器械包条码!'; } - showResult(msg); + showResult(msg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return null; } @@ -1304,8 +1304,18 @@ recyclingapplicationStore.baseParams['applyDate'] = selectedApplyDate; recyclingapplicationStore.baseParams['tousseType'] = encodeURI(selectedTousseType); recyclingapplicationStore.baseParams['disposableGoodsType'] = encodeURI(selectedDisposableGoodsType); + + if(top.Ext.getCmp("sendOutGoodsDetail")){ + top.Ext.getCmp("sendOutGoodsDetail").getEl().mask("加载中,请稍候..."); + } }); + recyclingapplicationStore.on("load", function(thiz, options) { + if(top.Ext.getCmp("sendOutGoodsDetail")){ + top.Ext.getCmp("sendOutGoodsDetail").getEl().unmask(); + } + }); + recyclingapplicationStore.load(); // sendOutGoodsStore.removeAll(); // sendOutGoodsStore.on("beforeload", function(thiz, options) { @@ -1334,7 +1344,7 @@ {id :'applicationAmount',header : "最大发货数量",dataIndex : 'applicationAmount',hidden : true,width :150} // {id : 'deleteItem',header:'删除',hidden :true,width :40,menuDisabled: true, // renderer: function(v,p,record){ -// var str = ""; +// var str = ""; // return str; // }, // dataIndex:'button' @@ -1371,19 +1381,19 @@ })}, {id : 'deleteItem',header:'删除',width : 25, align:'center', menuDisabled: true, renderer: function(v,p,record){ - var str = ""; + var str = ""; return str; }, dataIndex:'button' }]); function doSaveAction(printInvoiceCallback){ if (!form.getForm().isValid()) { - showResult('请正确填写表单各值'); + showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } //验证发货物品表格 if(!sendOutGoodsStore || sendOutGoodsStore.getCount() == 0){ - showResult('发货物品不能为空!'); + showResult('发货物品不能为空!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return false; } /*var b = validTousseGridData(); @@ -1424,7 +1434,7 @@ timeout: 60, success : function(form, action) { // 一定要事务提交成功才返回发货计划列表界面 - showResult(action.result.message); + showResult(action.result.message , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); if(action.result.success){ if(printInvoiceCallback != null){ printInvoiceCallback(action.result.invoiceIds); @@ -1440,9 +1450,9 @@ }, failure : function(form, action) { if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.message)){ - showResult(action.result.message); + showResult(action.result.message , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); }else{ - showResult("发货超时,请稍后查看发货单以确定发货是否成功,避免重复发货!"); + showResult("发货超时,请稍后查看发货单以确定发货是否成功,避免重复发货!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); closeInvoiceFormWindow(); // 返回退货界面 if(openMode == INVOICE_FORM_OPEN_MODE_CLICKRETURNRECORD){ @@ -1619,7 +1629,7 @@ top.Ext.getCmp('sender').setValue(resultArray[1]); Ext.state.Manager.getProvider().set('cookieSender',resultArray[1]); }else{ - showResult(resultArray[1]); + showResult(resultArray[1] , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('sender').setValue(""); } } @@ -1667,7 +1677,7 @@ if(!isUndefinedOrNullOrEmpty(responseText)){ var result = top.Ext.decode(responseText); if(!result.success){ - result.isNotSameOrgUnit?showResult("不允许登记非本科室人员,请扫描本科室人员条码"):showResult("输入的条码有误!"); + result.isNotSameOrgUnit?showResult("不允许登记非本科室人员,请扫描本科室人员条码" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage):showResult("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); return; } Ext.state.Manager.getProvider().set('cookiePersonInCharge',result.fullName); @@ -1676,7 +1686,7 @@ top.Ext.getCmp('personInChargeCode').setValue(result.name); top.Ext.getCmp('scanText').focus(); }else{ - showResult('找不到该条码所对应的人员信息'); + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } }); } @@ -1846,7 +1856,7 @@ loadGoodsByBarcode(orgUnitCoding); } }else{ - showResult("请扫描输入器械包/篮筐(首)条码!"); + showResult("请扫描输入器械包/篮筐(首)条码!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } } }); @@ -1874,7 +1884,7 @@ loadGoodsByBarcode(orgUnitCoding); } }else{ - showResult("请扫描输入器械包/篮筐(尾)条码!"); + showResult("请扫描输入器械包/篮筐(尾)条码!" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } } }); @@ -1908,10 +1918,10 @@ if(id==0){ var maxAmountCanSend = Math.min(storageInt,waitDeliveryCountInt); if(countInt > storageInt){ - showResult('库存量为:' + storage + ',已超过库存量!'); + showResult('库存量为:' + storage + ',已超过库存量!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } if(countInt > waitDeliveryCountInt){ - showResult('申请数量为:' + waitDeliveryCountInt + ',已超过申请数量!'); + showResult('申请数量为:' + waitDeliveryCountInt + ',已超过申请数量!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); } if(countInt <= maxAmountCanSend){ @@ -1930,7 +1940,7 @@ if(parseInt(count) <= (storageInt + parseInt(tempAmount))){ updateAmount2(name,count); } else { - showResult('库存量为:' + storage + ',已超过库存量!'); + showResult('库存量为:' + storage + ',已超过库存量!' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); grid.record.set('count',tempAmount); } } @@ -2092,6 +2102,9 @@ }); invoiceFormWindow.show(); + if(top.Ext.getCmp("sendOutGoodsDetail")){ + top.Ext.getCmp("sendOutGoodsDetail").getEl().mask("加载中,请稍候..."); + } if(project == 'gdsy'){ if(openMode == INVOICE_FORM_OPEN_MODE_SCANBARCODE){ var sender = top.Ext.getCmp('sender').getValue(); Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r21665 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 21665) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 22403) @@ -91,7 +91,7 @@ params : {basketBarcode : basketBarcode,tousseBarcode : addBarcode,taskGroup : $Id('parm_s_taskGroup').value}, success : function(response, options) { var result = Ext.decode(response.responseText); - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnReviewPage); if(result.success == true){ basketTousseInstanceStore.load(); top.Ext.getCmp('addBarcode').setValue(''); @@ -100,9 +100,9 @@ failure : function(response, options) { var result = Ext.decode(response.responseText); if(result && result.message){ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnReviewPage); }else{ - showResult('连接服务器失败'); + showResult('连接服务器失败' , null , sstsConfig.messagePauseTimeOnReviewPage); } } @@ -128,7 +128,7 @@ params : {basketBarcode : basketBarcode,tousseBarcode : addBarcode,taskGroup : $Id('parm_s_taskGroup').value}, success : function(response, options) { var result = Ext.decode(response.responseText); - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnReviewPage); if(result.success == true){ basketTousseInstanceStore.load(); top.Ext.getCmp('addBarcode').setValue(''); @@ -137,9 +137,9 @@ failure : function(response, options) { var result = Ext.decode(response.responseText); if(result && result.message){ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnReviewPage); }else{ - showResult('连接服务器失败'); + showResult('连接服务器失败' , null , sstsConfig.messagePauseTimeOnReviewPage); } } }); @@ -270,7 +270,7 @@ //右边待审核列表已选择的器械包信息 var selectedRecords = grid.getSelectionModel().getSelections(); if (selectedRecords.length == 0) { - showResult("请选择器械包!"); + showResult("请选择器械包!" , null , sstsConfig.messagePauseTimeOnReviewPage); return false; } @@ -296,7 +296,7 @@ } } if(records.length == 0){ - showResult("所选的器械包的灭菌程序与审核确认列表的器械包灭菌程序不一致!"); + showResult("所选的器械包的灭菌程序与审核确认列表的器械包灭菌程序不一致!" , null , sstsConfig.messagePauseTimeOnReviewPage); return false; } } @@ -322,9 +322,9 @@ SterilisationTableManager.validateSterilingTypeCanAddToReview(sType , function(jsonResult){ if(!jsonResult.success){ if(jsonResult.message){ - showResult(jsonResult.message); + showResult(jsonResult.message , null , sstsConfig.messagePauseTimeOnReviewPage); }else{ - showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加"); + showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage); } sterilingTypeCanAddToReview = false; } @@ -337,7 +337,7 @@ needValidateRecords.push(records[i]); }else{ if(tousseWithNullSterilingTypeCanNotBatchAddReview){ - showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加"); + showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage); delete records[i]; continue; } @@ -629,7 +629,7 @@ for(var i = 0;i < tousseInstanceRecordCount;i++){ var virtualBasketSeqNum = Ext.getCmp('forReviewGrid').getStore().getAt(i).get('virtualBasketSeqNum'); if(!virtualBasketSeqNum || virtualBasketSeqNum == ''){ - showResult('请先扫描灭菌篮筐'); + showResult('请先扫描灭菌篮筐' , null , sstsConfig.messagePauseTimeOnReviewPage); return; } } @@ -639,7 +639,7 @@ //如果配置为要扫描审核人,则判断审核人是否为空 var reviewerCode = Ext.getCmp('reviewerCode').getValue(); if(isUndefinedOrNullOrEmpty(reviewerCode)){ - showResult('请先扫描审核人'); + showResult('请先扫描审核人' , null , sstsConfig.messagePauseTimeOnReviewPage); return; } } @@ -652,7 +652,7 @@ } if(tousseIds == ''){ - MsgTip.msg('提示','待审核器械包列表为空',true,3); + showResult('待审核器械包列表为空' , null , sstsConfig.messagePauseTimeOnReviewPage); }else{ var confirmMessage = ''; // 灭菌开始日期校验,并提示 @@ -700,7 +700,7 @@ } var result = Ext.decode(response.responseText); - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnReviewPage); if (result.success){ // 审核时打印标签 if (sstsConfig.printLabelWhenReviewing == true){ @@ -728,9 +728,9 @@ } var result = Ext.decode(response.responseText); if(result && result.message){ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnReviewPage); }else{ - showResult("连接失败"); + showResult("连接失败" , null , sstsConfig.messagePauseTimeOnReviewPage); } } @@ -813,7 +813,7 @@ } } if(count > 0){ - showResult('有'+count+'个超时未审核的器械包,请及时处理红色标注的器械包'); + showResult('有'+count+'个超时未审核的器械包,请及时处理红色标注的器械包' , null , sstsConfig.messagePauseTimeOnReviewPage); } } } @@ -942,7 +942,7 @@ tooltip:'上一页', handler : function(){ if (page - 1 <= 0) { - showResult('已是第一页'); + showResult('已是第一页' , null , sstsConfig.messagePauseTimeOnReviewPage); return; } page = page - 1; @@ -966,7 +966,7 @@ tooltip:'下一页', handler : function() { if (page + 1 > totalPage) { - showResult('已是最后一页'); + showResult('已是最后一页' , null , sstsConfig.messagePauseTimeOnReviewPage); return; } page = page + 1; @@ -1096,7 +1096,7 @@ handler : function() { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { - showResult("请选择要修改的器械包!"); + showResult("请选择要修改的器械包!" , null , sstsConfig.messagePauseTimeOnReviewPage); return false; } var tousseInstanceIDs = ''; @@ -1345,7 +1345,7 @@ c.getEl().on('keypress',function(e) { if (e.getKey() == 13) {// 输入;号键,grid重新加载 if(Ext.getCmp('barcode').getValue() == ''){ - showResult("请输入或扫描相关信息。"); + showResult("请输入或扫描相关信息。" , null , sstsConfig.messagePauseTimeOnReviewPage); return; } var isExist = Ext.getCmp('forReviewGrid').getStore().find('barcode', Ext.getCmp('barcode').getValue().trim()); @@ -1362,24 +1362,24 @@ Ext.getCmp('reviewerCode').setValue(obj.name); speaker.speak(obj.fullName); }else{ - showResult(obj.message); + showResult(obj.message , null , sstsConfig.messagePauseTimeOnReviewPage); } Ext.getCmp('barcode').setValue(''); }else if(returnType=="basketNotFound"){//条码不存在 - showResult("找不到该包或篮筐或人员信息。") + showResult("找不到该包或篮筐或人员信息。" , null , sstsConfig.messagePauseTimeOnReviewPage) } else if (returnType == "basketUsed") { - showResult("无法录入篮筐,篮筐正处于[" + obj.status + "]状态"); + showResult("无法录入篮筐,篮筐正处于[" + obj.status + "]状态" , null , sstsConfig.messagePauseTimeOnReviewPage); clearBarcodeAndBasketName(); } else if (returnType == "erroeStatus"){ - showResult("器械包状态异常,请录入待审核的器械包"); + showResult("器械包状态异常,请录入待审核的器械包" , null , sstsConfig.messagePauseTimeOnReviewPage); Ext.getCmp('barcode').setValue(''); // clearBarcodeAndBasketName(); } else if(returnType == "tousseInstanceSuccess"){//扫描的是包(返回结果为单个器械包,暂保留) // showResult("只能扫描灭菌篮框和审核人条码。"); // clearBarcodeAndBasketName(); // return false; if(taskGroup != obj.taskGroup){ - showResult("该条码所对应的器械包不属于当前任务组。"); + showResult("该条码所对应的器械包不属于当前任务组。" , null , sstsConfig.messagePauseTimeOnReviewPage); Ext.getCmp('barcode').setValue(''); return; } @@ -1400,7 +1400,7 @@ var tousseInstanceArray = obj.tousseInstances; if(tousseInstanceArray && tousseInstanceArray.length > 0){ if(taskGroup != tousseInstanceArray[0].taskGroup){ - showResult("该条码所对应的器械包不属于当前任务组。"); + showResult("该条码所对应的器械包不属于当前任务组。" , null , sstsConfig.messagePauseTimeOnReviewPage); Ext.getCmp('barcode').setValue(''); return; } @@ -1432,12 +1432,12 @@ } speakBasket.speakContent(); }else{ - showResult("未找到相应的器械包或器械包已扫描"); + showResult("未找到相应的器械包或器械包已扫描" , null , sstsConfig.messagePauseTimeOnReviewPage); } onScannedTousseAmountChanged();// 待审核包数量数量变化处理 } }else if(returnType == "noResult"){//无结果输出 - showResult("无符合条件的器械包。"); + showResult("无符合条件的器械包。" , null , sstsConfig.messagePauseTimeOnReviewPage); } else if(returnType=="containerSuccess"){//扫描的是篮筐 if(containerType == '灭菌筐'){ var basketName = Ext.getCmp("basketName").getValue(); @@ -1459,16 +1459,16 @@ Ext.getCmp('barcode').setValue(''); speaker.speak(obj.containerName); }else{ - showResult("审核入筐只能使用灭菌筐。"); + showResult("审核入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage); clearBarcodeAndBasketName(); } }else{ - showResult(obj.message); + showResult(obj.message , null , sstsConfig.messagePauseTimeOnReviewPage); } }); } else { - MsgTip.msg('提示', '已存在相同条形码的器械包',true,3); + showResult('已存在相同条形码的器械包' , null , sstsConfig.messagePauseTimeOnReviewPage); Ext.getCmp('barcode').setValue(''); } } @@ -1493,7 +1493,7 @@ c.getEl().on('keypress',function(e) { if (e.getKey() == 13) {// 输入;号键,grid重新加载 if(Ext.getCmp('barcode').getValue() == '' || Ext.getCmp('barcodeEnd').getValue() == ''){ - showResult("请输入或扫描相关信息。"); + showResult("请输入或扫描相关信息。" , null , sstsConfig.messagePauseTimeOnReviewPage); return; } var barcode = Ext.getCmp('barcode').getValue(); @@ -1503,12 +1503,12 @@ var returnType = obj.returnType; var containerType = obj.containerType; if (returnType == "erroeStatus"){ - showResult("器械包状态异常,请录入待审核的器械包"); + showResult("器械包状态异常,请录入待审核的器械包" , null , sstsConfig.messagePauseTimeOnReviewPage); }else if(returnType == "multiTousseInstancesSuccess"){//扫描的是虚拟篮框(单个或首尾)或首尾器械包(返回结果为单个器械包,暂保留) var tousseInstanceArray = obj.tousseInstances; if(tousseInstanceArray && tousseInstanceArray.length > 0){ if(taskGroup != tousseInstanceArray[0].taskGroup){ - showResult("该条码所对应的器械包不属于当前任务组。"); + showResult("该条码所对应的器械包不属于当前任务组。" , null , sstsConfig.messagePauseTimeOnReviewPage); Ext.getCmp('barcodeEnd').setValue(''); return; } @@ -1536,14 +1536,14 @@ alreadyAdd++; } if(alreadyAdd == 0){ - showResult("未找到相应的器械包或器械包已扫描"); + showResult("未找到相应的器械包或器械包已扫描" , null , sstsConfig.messagePauseTimeOnReviewPage); } speakBasket.speakContent(); //Ext.getCmp('barcode').setValue(""); onScannedTousseAmountChanged();// 待审核包数量数量变化处理 } }else if(returnType == "noResult"){//无结果输出 - showResult("无符合条件的器械包。"); + showResult("无符合条件的器械包。" , null , sstsConfig.messagePauseTimeOnReviewPage); } else if(returnType=="containerSuccess"){//扫描的是篮筐 if(containerType == '灭菌筐'){ var basketName = Ext.getCmp("basketName").getValue(); @@ -1565,7 +1565,7 @@ Ext.getCmp('barcode').setValue(''); speaker.speak(obj.containerName); }else{ - showResult("审核入筐只能使用灭菌筐。"); + showResult("审核入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage); clearBarcodeAndBasketName(); } Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r22242 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 22242) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 22403) @@ -101,7 +101,7 @@ }, failure : function(response, options) { var result = Ext4.decode(response.responseText); - showResult(result.cause); + showResult(result.cause , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -309,15 +309,15 @@ // waitPackingTaskStore.load(lastParams); return; } - showResult('不存在该标识牌对应的装配任务!'); + showResult('不存在该标识牌对应的装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage); return; }else{ loadIdCardByBarcode_bottomHalf(barcode,result,existTask,manualScan); } } else { - showResult(result.errorMsg); + showResult(result.errorMsg , null , sstsConfig.messagePauseTimeOnPackingPage); Ext4.getCmp('idCardName').setValue(); Ext4.getCmp('idCardUseAmount').setValue(); } @@ -338,7 +338,7 @@ } if(!existTask){ - showResult('不存在该标识牌对应的装配任务!'); + showResult('不存在该标识牌对应的装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage); return; } // 加载器械包信息 @@ -406,10 +406,10 @@ var result = Ext4.decode(response.responseText); var success = result.success; if (true != success) { - showResult(result.cause); + showResult(result.cause , null , sstsConfig.messagePauseTimeOnPackingPage); return; } else { - showResult('删除成功!'); + showResult('删除成功!' , null , sstsConfig.messagePauseTimeOnPackingPage); //删除扫描篮筐后出现的装配任务 var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode(); @@ -439,7 +439,7 @@ }, failure : function(response, options) { var result = Ext4.decode(response.responseText); - showResult(result.cause); + showResult(result.cause , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -691,7 +691,7 @@ var record = context.record; var unPackingAmount = record.get('unPackingAmount'); if(unPackingAmount < context.value){ - showResult(record.get('tousseName') + ",装配数量不能大于"+unPackingAmount); + showResult(record.get('tousseName') + ",装配数量不能大于"+unPackingAmount , null , sstsConfig.messagePauseTimeOnPackingPage); record.set('amount',unPackingAmount); } } @@ -707,7 +707,7 @@ function loadUserByBarcode(barcodeField,userNameField,userCodeField,focusField){ if(userNameField == null || userCodeField == null || barcodeField == null){ - showResult("参数错误,请联系管理员!"); + showResult("参数错误,请联系管理员!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } var peopleOfBarcode = barcodeField.getValue(); @@ -717,7 +717,7 @@ if(responseText != null && responseText != ""){ var result = Ext4.decode(responseText); if(!result.success){ - result.isNotSameOrgUnit?showResult("不允许登记非本科室人员,请扫描本科室人员条码"):showResult("输入的条码有误!"); //(cjr) + result.isNotSameOrgUnit?showResult("不允许登记非本科室人员,请扫描本科室人员条码"):showResult("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnPackingPage); //(cjr) return; } userNameField.setValue(result.fullName); @@ -726,7 +726,7 @@ focusExtJSField(focusField); } }else{ - showResult('找不到该条码所对应的人员信息'); + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnPackingPage); userNameField.setValue(); } }); @@ -770,7 +770,7 @@ handler : function(){ var td_id = Ext4.getCmp('td_id').getValue(); if(isUndefinedOrNullOrEmpty(td_id)){ - showResult("请选择装配任务"); + showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ showToussePackingNote(td_id); } @@ -823,7 +823,7 @@ var td_id = Ext4.getCmp('td_id').getValue(); if(currentPage <= 1){ Ext4.getCmp('currentPage').setValue(1); - showResult("已是第一页!"); + showResult("已是第一页!" , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ loadGoodsImage(imageName,imageType,materialId,parseInt(currentPage)-1,vedioName,td_id); } @@ -848,7 +848,7 @@ var totalPage = parseInt(pageCount.count); if(currentPage >= totalPage){ Ext4.getCmp('currentPage').setValue(totalPage); - showResult("已是最后一页!"); + showResult("已是最后一页!" , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ loadGoodsImage(imageName,imageType,materialId,parseInt(currentPage)+1,vedioName,td_id); } @@ -968,7 +968,7 @@ var errors = cNode.get("errors"); if(status == '待确认'){ - showResult(tousseName+",有器械丢失,请确认!"); + showResult(tousseName+",有器械丢失,请确认!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(!allowPackingWhenUnSupplementMaterial){ @@ -979,11 +979,11 @@ } } if(lost){ - showResult("材料缺失,不够组成器械包,请补充缺失器械!"); + showResult("材料缺失,不够组成器械包,请补充缺失器械!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(damages != null && damages.length > 0){ - showResult("材料已报损,不够组成器械包,请补充报损器械!"); + showResult("材料已报损,不够组成器械包,请补充报损器械!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } } @@ -1869,7 +1869,7 @@ } } if(timeoutCount > 0){ - showResult('有'+timeoutCount+'个超时未装配的装配任务,请及时处理红色标注的装配任务'); + showResult('有'+timeoutCount+'个超时未装配的装配任务,请及时处理红色标注的装配任务' , null , sstsConfig.messagePauseTimeOnPackingPage); } } } @@ -2292,7 +2292,7 @@ // 打印标识牌的包 function printIDCardTousse(){ if(idCardInstanceID == ''){ - showResult('请扫描标识牌条码!'); + showResult('请扫描标识牌条码!' , null , sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return; } @@ -2480,30 +2480,30 @@ // 验证参数 function validateFormParamsForPack(){ if(!Ext4.getCmp('operator').getValue()){ - showResult("请扫描装配人条码!"); + showResult("请扫描装配人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } - var reviewer = Ext4.getCmp('reviewer'); + var reviewer = Ext4.getCmp('reviewer' , null , sstsConfig.messagePauseTimeOnPackingPage); if(reviewer.isVisible(true) && !reviewer.getValue()){ - showResult("请扫描审核人条码!"); + showResult("请扫描审核人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(!Ext4.getCmp('sterilingType').getValue() && !Ext4.getCmp('sterilingType').isHidden()){ - showResult("请选择灭菌程序!"); + showResult("请选择灭菌程序!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(!Ext4.getCmp('packageType').getValue()){ - showResult("请选择包装类型!"); + showResult("请选择包装类型!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('sterilizer').getValue()){ - showResult("请选择灭菌炉!"); + showResult("请选择灭菌炉!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('frequency').getValue()){ - showResult("请输入炉次号!"); + showResult("请输入炉次号!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } @@ -2535,7 +2535,7 @@ sterilingType = cNode.get("sterilingMethod"); if(isUndefinedOrNullOrEmpty(packageType)){ bRet = true; - showResult("【"+tousseName+"】未定义包装类型,请定义包装类型后装配!"); + showResult("【"+tousseName+"】未定义包装类型,请定义包装类型后装配!" , null , sstsConfig.messagePauseTimeOnPackingPage); } // if(isUndefinedOrNullOrEmpty(sterilingType)){ // bRet = true; @@ -2570,7 +2570,7 @@ sterilingType = cNode.get("sterilingMethod"); if(isUndefinedOrNullOrEmpty(packageType)){ bRet = true; - showResult("【"+tousseName+"】未定义包装类型,请定义包装类型后装配!"); + showResult("【"+tousseName+"】未定义包装类型,请定义包装类型后装配!" , null , sstsConfig.messagePauseTimeOnPackingPage); } // if(isUndefinedOrNullOrEmpty(sterilingType)){ // bRet = true; @@ -2614,7 +2614,7 @@ }); } if(totalPackingAmount > 1){ - showResult("备注不为空时,只能装配一个包!"); + showResult("备注不为空时,只能装配一个包!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } return true; @@ -2757,17 +2757,17 @@ departmentArray.push(department); if(status == '待确认'){ - showResult(tousseName+",有器械丢失,请确认!"); + showResult(tousseName+",有器械丢失,请确认!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } if(!allowPackingWhenUnSupplementMaterial){ if(errors != null && errors.length > 0){ - showResult("材料缺失,不够组成器械包,请补充缺失器械!"); + showResult("材料缺失,不够组成器械包,请补充缺失器械!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } if(damages != null && damages.length > 0){ - showResult("材料已报损,不够组成器械包,请补充报损器械!"); + showResult("材料已报损,不够组成器械包,请补充报损器械!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } } @@ -2785,7 +2785,7 @@ } }); if(packingAmount > 0){ - showResult(tousseName + "需装配数量已超过该器械包所有装配任务数量之和."); + showResult(tousseName + "需装配数量已超过该器械包所有装配任务数量之和." , null , sstsConfig.messagePauseTimeOnPackingPage); delBasketItems.splice(dl,1);//删除 return; } @@ -2837,12 +2837,12 @@ var haveIDCard = pNode.get('haveIDCard'); // 跳过有标识牌的器械包 if(haveIDCard){ - showResult("【"+tousseName+"】启用了标识牌,需扫描标识牌装配。或者禁用该器械包的标识牌后装配!"); + showResult("【"+tousseName+"】启用了标识牌,需扫描标识牌装配。或者禁用该器械包的标识牌后装配!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; } var status = cNode.get("status"); if(status == '待确认'){ - showResult("【"+tousseName+"】有器械丢失,请先确认!"); + showResult("【"+tousseName+"】有器械丢失,请先确认!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var taskId = cNode.get("taskId"); @@ -2878,7 +2878,7 @@ waitPackingTreeGrid.getStore().reload(); showScanIDCardBarcode(); }else{ - showResult('请选择要打印的行!'); + showResult('请选择要打印的行!' , null , sstsConfig.messagePauseTimeOnPackingPage); } } Ext4.getCmp('remark').setValue(); @@ -2996,7 +2996,7 @@ else{ //如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示) if(result.type && (result.type == 'stockNotEnough' || result.type == 'packingFailure')){ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); }else{ // TODO: 需确认是否要判断物品是否为器械包 Ext4.MessageBox.confirm("请确认", result.message, @@ -3053,7 +3053,7 @@ // } // 现在不打印标签 if (isPrintLabelNow == false || !packing){ - showResult(packAmount + "个" + showName + "装配完成"); + showResult(packAmount + "个" + showName + "装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage); } // 现在打印标签 else{ @@ -3065,7 +3065,7 @@ tousseesToPrint = tousseesToPrint.concat(tousses); } else{ - showResult(packAmount + "个" + showName + "装配完成,该物品设置为不打印条码标签!"); + showResult(packAmount + "个" + showName + "装配完成,该物品设置为不打印条码标签!" , null , sstsConfig.messagePauseTimeOnPackingPage); } } @@ -3261,7 +3261,7 @@ if (e.getKey() == 13) { var basketBarcode = Ext4.getCmp('basketBarcodeInput').getValue(); if(basketBarcode == '') { - showResult('篮筐条码为空'); + showResult('篮筐条码为空' , null , sstsConfig.messagePauseTimeOnPackingPage); return; } var myMask = new Ext4.LoadMask({msg:"正在加载,请稍候...",target:Ext4.getCmp('basketTreeGrid')}); @@ -3277,13 +3277,13 @@ Ext4.getCmp('basketBarcodeInput').setValue(''); var jsonObj = Ext4.JSON.decode(result.responseText); if(!jsonObj.success){ - showResult(jsonObj.errorMessage); + showResult(jsonObj.errorMessage , null , sstsConfig.messagePauseTimeOnPackingPage); return; } var taskList = jsonObj.data; var nLength = taskList?taskList.length:0; if(nLength == 0){ - showResult('该篮筐在'+taskGroup+'内无装配任务!'); + showResult('该篮筐在'+taskGroup+'内无装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage); } var speakBasket = new SpeakBasket(); for(var n = 0;n < nLength; n++){ Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r20502 -r22403 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 20502) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 22403) @@ -68,7 +68,7 @@ }else{ var records = waitSplitMaterialGrid.getSelectionModel().getSelection(); if (records.length == 0) { - showResult("请选择!"); + showResult("请选择!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } for(var i = 0 ; i < records.length ; i++){ @@ -78,7 +78,7 @@ var includeImplant = records[i].data["includeImplant"]; if(splitAmount > materialAmount){ - showResult("拆分数量不能大于剩余数量!"); + showResult("拆分数量不能大于剩余数量!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } addMaterialToSplitGrid(splitedMaterialStore,materialName,splitAmount,includeImplant); @@ -110,7 +110,7 @@ }else{ var records = splitedMaterialGrid.getSelectionModel().getSelection(); if (records.length == 0) { - showResult("请选择!"); + showResult("请选择!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } for(var i = 0 ; i < records.length ; i++){ @@ -177,7 +177,7 @@ splitedMaterialStore.removeAll(); success = true; }else{ - showResult("请选择拆分的材料!"); + showResult("请选择拆分的材料!" , null , sstsConfig.messagePauseTimeOnPackingPage); } return success; @@ -234,7 +234,7 @@ if(responseText){ var result = Ext.decode(responseText); if(!result.success){ - showResult("输入的条码有误!"); + showResult("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnPackingPage); return; }else{ nameTextfieldObj.setValue(result.fullName); @@ -251,7 +251,7 @@ }else{ codeTextfieldObj.setValue(""); nameTextfieldObj.setValue(""); - showResult('找不到该条码所对应的人员信息'); + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -781,7 +781,7 @@ text : packingBtnText, handler : function() { if (!foreignToussePanel.form.isValid()) { - showResult('请正确填写表单各值'); + showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnPackingPage); this.enable(); return false; } @@ -793,24 +793,24 @@ var v = waitSplitMaterialStore.getCount(); if(v > 0){ - showResult("待拆分的材料部分未拆分!"); + showResult("待拆分的材料部分未拆分!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } v = splitedMaterialStore.getCount(); if(v > 0){ - showResult("已拆分的材料部分未拆分!"); + showResult("已拆分的材料部分未拆分!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } top.Ext4.getCmp('taskGroup2').setValue(taskGroup); var ids = packTaskId; if(ids == ""){ - showResult("请选择要装配的器械包!"); + showResult("请选择要装配的器械包!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var reviewer = top.Ext4.getCmp('reviewer2'); if(reviewer.isVisible() && !reviewer.getValue()){ - showResult("请扫描审核人条码!"); + showResult("请扫描审核人条码!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } var splitedTousseStore = top.Ext4.getCmp("splitedTousseGrid").getStore(); @@ -824,17 +824,17 @@ } } if(isHaveEmptyPackingType){ - showResult("有已拆分的器械包未设置包装类型!"); + showResult("有已拆分的器械包未设置包装类型!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } //验证失效期 var result = validateValidUntil(foreignTousseName,supplierName); if(result != ""){ - showResult(result + "此包装类型没有相应的失效日期!请设置此包装类型的失效日期!"); + showResult(result + "此包装类型没有相应的失效日期!请设置此包装类型的失效日期!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } if(!getSplitForeignTousse()){ - showResult("已拆分的器械包不能为空!"); + showResult("已拆分的器械包不能为空!" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } @@ -900,7 +900,7 @@ // 审核时打印标签 if (sstsConfig.printLabelWhenReviewing == true){ - showResult("装配完成"); + showResult("装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage); } // 装配时打印标签 else{ @@ -927,7 +927,7 @@ Ext4.getCmp('basketBarcodeInput').focus('', 10); } else{ - showResult(result.message); + showResult(result.message , null , sstsConfig.messagePauseTimeOnPackingPage); } } });