Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r35493 -r35612 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35493) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35612) @@ -182,7 +182,7 @@ }, failure: function (response, options) { var result = Ext4.decode(response.responseText); - showResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -360,7 +360,7 @@ } openModalWindowForExt(WWWROOT + "/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp", params, "配包教学视频", "800", "390"); } else { - showResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage); } } @@ -666,16 +666,16 @@ var startTimeSearch = Ext4.getCmp('startTimeSearch').getValue(); var endTimeSearch = Ext4.getCmp('endTimeSearch').getValue(); if (!startTimeSearchCmp.isValid()) { - showResult('开始时间格式不对!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('开始时间格式不对!', null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (!endTimeSearchCmp.isValid()) { - showResult('结束时间格式不对!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('结束时间格式不对!', null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (!isUndefinedOrNullOrEmpty(startTimeSearch) && !isUndefinedOrNullOrEmpty(endTimeSearch)) { if (startTimeSearch > endTimeSearch) { - showResult('开始时间不能大于结束时间!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('开始时间不能大于结束时间!', null, sstsConfig.messagePauseTimeOnPackingPage); return false; } } @@ -771,14 +771,14 @@ existTask = taskList[0]; } if (!existTask) { - showResult('不存在该标识牌对应的装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('不存在该标识牌对应的装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage); return; } else { loadIdCardByBarcode_bottomHalf(barcode, result, existTask, manualScan, autoSetIDCardBarcodeForPacking); } } else { - showResult(result.errorMsg, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(result.errorMsg, null, sstsConfig.messagePauseTimeOnPackingPage); Ext4.getCmp('idCardName').setValue(); Ext4.getCmp('idCardUseAmount').setValue(); } @@ -807,7 +807,7 @@ var taskType = idCardTaskNode.data.taskType; // 是否已清洗 if ((taskType != taskType_returnGoods) && !idCardTaskNode.data.cleaned) { - showResult('装配任务未清洗完成或清洗完成时间未到!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('装配任务未清洗完成或清洗完成时间未到!', null, sstsConfig.messagePauseTimeOnPackingPage); return; } // 加载器械包信息 @@ -938,10 +938,10 @@ var result = Ext4.decode(response.responseText); var success = result.success; if (true != success) { - showResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage); return; } else { - showResult('删除成功!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('删除成功!', null, sstsConfig.messagePauseTimeOnPackingPage); //删除扫描篮筐后出现的装配任务 var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode(); @@ -974,7 +974,7 @@ }, failure: function (response, options) { var result = Ext4.decode(response.responseText); - showResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(result.cause, null, sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -1443,7 +1443,7 @@ afteredit: function (editor, context, eOpts) { var record = context.record; if (context.value == 0) { - showResult(record.get('tousseName') + "的数量不能为0", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(record.get('tousseName') + "的数量不能为0", null, sstsConfig.messagePauseTimeOnPackingPage); record.set('amount', context.originalValue); return; } @@ -1465,18 +1465,18 @@ sum += parseInt(pNode.get('amount')); }); if (context.value > maxAmount) { - showResult(record.get('tousseName') + "的数量不能大于最大装配数量" + maxAmount, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(record.get('tousseName') + "的数量不能大于最大装配数量" + maxAmount, null, sstsConfig.messagePauseTimeOnPackingPage); record.set('amount', context.originalValue); return; } if (sum > parentUnPackingAmount) { - showResult(record.get('tousseName') + ",装配数量不能大于" + parentUnPackingAmount, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(record.get('tousseName') + ",装配数量不能大于" + parentUnPackingAmount, null, sstsConfig.messagePauseTimeOnPackingPage); record.set('amount', context.originalValue); return; } } else { if (unPackingAmount !== '' && unPackingAmount < context.value) { - showResult(record.get('tousseName') + ",装配数量不能大于" + unPackingAmount, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(record.get('tousseName') + ",装配数量不能大于" + unPackingAmount, null, sstsConfig.messagePauseTimeOnPackingPage); record.set('amount', unPackingAmount); } } @@ -1493,7 +1493,7 @@ function loadUserByBarcode(barcodeField, userNameField, userCodeField, focusField) { if (userNameField == null || userCodeField == null || barcodeField == null) { - showResult("参数错误,请联系管理员!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("参数错误,请联系管理员!", null, sstsConfig.messagePauseTimeOnPackingPage); return; } var peopleOfBarcode = barcodeField.getValue(); @@ -1503,7 +1503,7 @@ if (responseText != null && responseText != "") { var result = Ext4.decode(responseText); if (!result.success) { - result.isNotSameOrgUnit ? showResult(result.message || "不允许登记非本科室人员,请扫描本科室人员条码!") : showResult(result.message || "输入的条码有误!", null, sstsConfig.messagePauseTimeOnPackingPage); //(cjr) + result.isNotSameOrgUnit ? showMultipleResult(result.message || "不允许登记非本科室人员,请扫描本科室人员条码!") : showMultipleResult(result.message || "输入的条码有误!", null, sstsConfig.messagePauseTimeOnPackingPage); //(cjr) return; } userNameField.setValue(result.fullName); @@ -1512,7 +1512,7 @@ focusExtJSField(focusField); } } else { - showResult('找不到该条码所对应的人员信息', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('找不到该条码所对应的人员信息', null, sstsConfig.messagePauseTimeOnPackingPage); userNameField.setValue(); } }); @@ -1564,14 +1564,14 @@ var isTraceable = Ext4.getCmp('isTraceable').getValue(); var hideTousseName = Ext4.getCmp('hideTousseName').getValue(); if (isTraceable == '否') { - showResult('【' + hideTousseName + '】是不追溯的物品,不支持采集图像/视频'); + showMultipleResult('【' + hideTousseName + '】是不追溯的物品,不支持采集图像/视频'); return; } var imageName = Ext4.getCmp('imageName').getText(); var td_id = Ext4.getCmp('td_id').getValue(); var task_id = Ext4.getCmp('task_id').getValue(); if (isUndefinedOrNullOrEmpty(task_id)) { - showResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage); return; } takeImgAndVideo(imageName, td_id, task_id, false, imageTypeCameraPacking, videoTypePacking); @@ -1601,7 +1601,7 @@ handler: function () { var td_id = Ext4.getCmp('td_id').getValue(); if (isUndefinedOrNullOrEmpty(td_id)) { - showResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage); } else { var myMask = new Ext4.LoadMask({ msg: "加载中,请稍候...", target: Ext4.getCmp('packingViewTab0') }); myMask.show(); @@ -1619,7 +1619,7 @@ myMask.hide(); }, 1000); } else { - showResult('【' + ret.packageName + '】配包注意事项为空') + showMultipleResult('【' + ret.packageName + '】配包注意事项为空') myMask.hide(); } } else { @@ -1702,7 +1702,7 @@ text: '清洗质量检查关注点', handler: function () { if (!curSelMaterialId) { - showResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage); return; } loadGoodsImage(curSelMaterialName, IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT, curSelMaterialId, 1, "", ""); @@ -1716,7 +1716,7 @@ text: '清洗质量检查方法', handler: function () { if (!curSelMaterialId) { - showResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage); return; } loadGoodsImage(curSelMaterialName, IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD, curSelMaterialId, 1, "", ""); @@ -1730,7 +1730,7 @@ text: '功能检查', handler: function () { if (!curSelMaterialId) { - showResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择材料", null, sstsConfig.messagePauseTimeOnPackingPage); return; } loadGoodsImage(curSelMaterialName, IMAGE_TYPE_MATERIAL_FUNCTIONCHECK, curSelMaterialId, 1, "", ""); @@ -1767,7 +1767,7 @@ var td_id = Ext4.getCmp('td_id').getValue(); if (currentPage <= 1) { Ext4.getCmp('currentPage').setValue(1); - showResult("已是第一页!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("已是第一页!", null, sstsConfig.messagePauseTimeOnPackingPage); } else { loadGoodsImage(imageName, imageType, materialId, parseInt(currentPage) - 1, vedioName, td_id); } @@ -1800,7 +1800,7 @@ var totalPage = parseInt(pageCount.count); if (currentPage >= totalPage) { Ext4.getCmp('currentPage').setValue(totalPage); - showResult("已是最后一页!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("已是最后一页!", null, sstsConfig.messagePauseTimeOnPackingPage); } else { loadGoodsImage(imageName, imageType, materialId, parseInt(currentPage) + 1, vedioName, td_id); } @@ -1921,7 +1921,7 @@ var errors = cNode.data.errors; if (status == '待确认') { - showResult(tousseName + ",有器械丢失,请确认!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(tousseName + ",有器械丢失,请确认!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (!allowPackingWhenUnSupplementMaterial) { @@ -1932,11 +1932,11 @@ } } if (lost) { - showResult("材料缺失,不够组成器械包,请补充缺失器械!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("材料缺失,不够组成器械包,请补充缺失器械!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (damages != null && damages.length > 0) { - showResult("材料已报损,不够组成器械包,请补充报损器械!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("材料已报损,不够组成器械包,请补充报损器械!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } } @@ -2617,7 +2617,7 @@ }, failure: function (response, options) { var result = Ext.decode(response.responseText); - showResult(result.message); + showMultipleResult(result.message); } }); } @@ -2886,7 +2886,7 @@ }); if (washRecordIds.length > 1) { addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); - showResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); + showMultipleResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); } else if (washRecordIds.length == 1) { addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); } else { @@ -2933,7 +2933,7 @@ if (getPackingMaterialsForCheck.size() == 1) { materialsAddBgColor(tousseDefinitionId, rowIndex, td); } else if (getPackingMaterialsForCheck.size() > 1) { - showResult('一次只能检查一种物品,请勿勾选多种物品!'); + showMultipleResult('一次只能检查一种物品,请勿勾选多种物品!'); return false } } @@ -3017,7 +3017,7 @@ }); if (washRecordIds.length > 1) { addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); - showResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); + showMultipleResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); } else if (washRecordIds.length == 1) { addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems); } else { @@ -3032,7 +3032,7 @@ var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); var selNodes = waitPackingTreeGrid.getView().getChecked(); if (selNodes.length == 0) { - showResult('请先选择需要删除的待装配任务'); + showMultipleResult('请先选择需要删除的待装配任务'); return; } var ids = ""; @@ -3136,7 +3136,7 @@ } } if (timeoutCount > 0) { - showResult('有' + timeoutCount + '个超时未装配的装配任务,请及时处理红色标注的装配任务', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('有' + timeoutCount + '个超时未装配的装配任务,请及时处理红色标注的装配任务', null, sstsConfig.messagePauseTimeOnPackingPage); } } } @@ -3263,7 +3263,7 @@ // alert(basketTreeSelNodes.length + ' '+waitPackingTree.length) // // 包含标识牌,且选中了多个节点,不允许选中 // if(haveEnabledIDCard(basketTreeSelNodes) && basketTreeSelNodes.length>1){ - // showResult('启用了标识牌的包,只能单独选择!'); + // showMultipleResult('启用了标识牌的包,只能单独选择!'); // node.set("checked", false); // return; // } @@ -3558,7 +3558,7 @@ // 打印标识牌的包 function printIDCardTousse() { if (idCardInstanceID == '') { - showResult('请扫描标识牌条码!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('请扫描标识牌条码!', null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return; } @@ -3761,49 +3761,49 @@ if (sstsConfig.showInspectorField) { var inspector = Ext4.getCmp('inspector', null, sstsConfig.messagePauseTimeOnPackingPage); if (inspector.isVisible(true) && !inspector.getValue()) { - showResult("请扫描" + inspectorName + "条码!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请扫描" + inspectorName + "条码!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } } if (!Ext4.getCmp('operator').getValue()) { - showResult("请扫描配包人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请扫描配包人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } var reviewer = Ext4.getCmp('reviewer', null, sstsConfig.messagePauseTimeOnPackingPage); if (reviewer.isVisible(true) && !reviewer.getValue()) { - showResult("请扫描" + reviewViewText + "人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请扫描" + reviewViewText + "人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (sstsConfig.showSterileField) { var sterileUser = Ext4.getCmp('sterileUser', null, sstsConfig.messagePauseTimeOnPackingPage); if (sterileUser.isVisible(true) && !sterileUser.getValue()) { - showResult("请扫描灭菌人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请扫描灭菌人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } } if (sstsConfig.showWrapperField) { var wrapper = Ext4.getCmp('wrapper', null, sstsConfig.messagePauseTimeOnPackingPage); if (wrapper.isVisible(true) && !wrapper.getValue()) { - showResult("请扫描包装人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请扫描包装人条码!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } } if (!Ext4.getCmp('sterilingType').getValue() && !Ext4.getCmp('sterilingType').isHidden()) { - showResult("请选择灭菌程序!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择灭菌程序!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (!Ext4.getCmp('packageType').getValue()) { - showResult("请选择包装类型!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择包装类型!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('sterilizer').getValue()) { - showResult("请选择灭菌炉!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请选择灭菌炉!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } if (sstsConfig.sterilizerNotAllowBlank && !Ext4.getCmp('frequency').getValue()) { - showResult("请输入炉次号!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("请输入炉次号!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } @@ -3860,11 +3860,11 @@ sterilingType = cNode.get("sterilingMethod"); if (isUndefinedOrNullOrEmpty(packageType)) { bRet = true; - showResult("【" + tousseName + "】未定义包装类型,请定义包装类型后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("【" + tousseName + "】未定义包装类型,请定义包装类型后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); } // if(isUndefinedOrNullOrEmpty(sterilingType)){ // bRet = true; - // showResult("【"+tousseName+"】未定义灭菌程序,请定义灭菌程序后装配!"); + // showMultipleResult("【"+tousseName+"】未定义灭菌程序,请定义灭菌程序后装配!"); // } }); }); @@ -3895,11 +3895,11 @@ sterilingType = cNode.get("sterilingMethod"); if (isUndefinedOrNullOrEmpty(packageType)) { bRet = true; - showResult("【" + tousseName + "】未定义包装类型,请定义包装类型后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("【" + tousseName + "】未定义包装类型,请定义包装类型后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); } // if(isUndefinedOrNullOrEmpty(sterilingType)){ // bRet = true; - // showResult("【"+tousseName+"】未定义灭菌程序,请定义灭菌程序后装配!"); + // showMultipleResult("【"+tousseName+"】未定义灭菌程序,请定义灭菌程序后装配!"); // } }); }); @@ -3939,7 +3939,7 @@ }); } if (totalPackingAmount > 1) { - showResult("备注不为空时,只能装配一个包!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("备注不为空时,只能装配一个包!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; } return true; @@ -4020,10 +4020,10 @@ } }) if (names.length > 5) { - showResult('如下材料还未进行检查:' + names.splice(0, 5).join('、') + '....!'); + showMultipleResult('如下材料还未进行检查:' + names.splice(0, 5).join('、') + '....!'); return } else if (names.length <= 5 && names.length > 0) { - showResult('如下材料还未进行检查:' + names.join('、') + '!'); + showMultipleResult('如下材料还未进行检查:' + names.join('、') + '!'); return } else { packing = isPacking; @@ -4143,7 +4143,7 @@ //跳过有标识牌的器械包 if (!(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking)) { if (haveIDCard) { - showResult("【" + pTousseName + "】启用了标识牌,需扫描标识牌装配。或者禁用该器械包的标识牌后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("【" + pTousseName + "】启用了标识牌,需扫描标识牌装配。或者禁用该器械包的标识牌后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return; } @@ -4242,20 +4242,20 @@ } } if (status == '待确认') { - showResult(tousseName + ",有器械丢失,请确认!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(tousseName + ",有器械丢失,请确认!", null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return; } var errorDamageAmount = 0; var errorOrDamageAmount = 0; if (!allowPackingWhenUnSupplementMaterial) { if (errors != null && errors.length > 0) { - showResult("材料缺失,不够组成器械包,请补充缺失器械!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("材料缺失,不够组成器械包,请补充缺失器械!", null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return; } if (damages != null && damages.length > 0) { - showResult("材料已报损,不够组成器械包,请补充报损器械!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("材料已报损,不够组成器械包,请补充报损器械!", null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return; } @@ -4336,12 +4336,12 @@ } if (!packedPhotographed1) { onPackingTousseBtnClickComplete(); - showResult(msg1Array.join(",") + '已经做了拆包,请点击拆包进入完成操作!'); + showMultipleResult(msg1Array.join(",") + '已经做了拆包,请点击拆包进入完成操作!'); return; } if (!packedPhotographed2) { onPackingTousseBtnClickComplete(); - showResult(msg2Array.join(",") + '还未上传照片,不能装配,请先上传照片!'); + showMultipleResult(msg2Array.join(",") + '还未上传照片,不能装配,请先上传照片!'); return; } if (packageArray.length > 0) { @@ -4435,13 +4435,13 @@ var haveIDCard = pNode.get('haveIDCard'); // 跳过有标识牌的器械包 if (haveIDCard) { - showResult("【" + tousseName + "】启用了标识牌,需扫描标识牌装配。或者禁用该器械包的标识牌后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("【" + tousseName + "】启用了标识牌,需扫描标识牌装配。或者禁用该器械包的标识牌后装配!", null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return; } var status = cNode.get("status"); if (status == '待确认') { - showResult("【" + tousseName + "】有器械丢失,请先确认!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult("【" + tousseName + "】有器械丢失,请先确认!", null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); return false; } @@ -4484,7 +4484,7 @@ } isConfirmRequestPackingTousse(params, 0, false); } else { - showResult('请选择要打印的行!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('请选择要打印的行!', null, sstsConfig.messagePauseTimeOnPackingPage); } } Ext4.getCmp('sterilingType').setValue(null); @@ -4694,7 +4694,7 @@ } }, error: function (req, textStatus) { - showResult('装配失败!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('装配失败!', null, sstsConfig.messagePauseTimeOnPackingPage); uncheck(); return; } @@ -4706,7 +4706,7 @@ if (!message) { message = '装配失败!'; } - showResult(message, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(message, null, sstsConfig.messagePauseTimeOnPackingPage); uncheck(); return; } @@ -4716,7 +4716,7 @@ } }, error: function (req, textStatus) { - showResult('装配失败!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('装配失败!', null, sstsConfig.messagePauseTimeOnPackingPage); } }); } @@ -4808,7 +4808,7 @@ // } // 现在不打印标签 if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true) { - showResult(packAmount + "个" + showName + "装配完成", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(packAmount + "个" + showName + "装配完成", null, sstsConfig.messagePauseTimeOnPackingPage); } // 现在打印标签 else { @@ -4821,7 +4821,7 @@ tousseesToPrint = tousseesToPrint.concat(tousses); } else { - showResult(packAmount + "个" + showName + "装配完成,该物品设置为不打印条码标签!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(packAmount + "个" + showName + "装配完成,该物品设置为不打印条码标签!", null, sstsConfig.messagePauseTimeOnPackingPage); } } @@ -4847,15 +4847,15 @@ // 现在不打印标签 //if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true){ if (isPrintLabelNow == false || !packing || sstsConfig.printLabelWhenSterilizing == true) { - showResult(packAmount + "个" + showName + "装配完成", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(packAmount + "个" + showName + "装配完成", null, sstsConfig.messagePauseTimeOnPackingPage); } // 现在打印标签 else { // 该物品的器械包定义是否需要打印标签 if (isPrint) { } else { - showResult(packAmount + "个" + showName + "装配完成,该物品设置为不打印条码标签!", null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(packAmount + "个" + showName + "装配完成,该物品设置为不打印条码标签!", null, sstsConfig.messagePauseTimeOnPackingPage); } } @@ -4865,7 +4865,7 @@ return; } var packAmount = packedToussesArray.length; - // showResult(packAmount + "个" + showName + "装配完成"); + // showMultipleResult(packAmount + "个" + showName + "装配完成"); var printGroupType = Ext4.getCmp('printGroupType').getValue(); var cfg = createPrintLabelsConfig(printGroupType); if (tousseesToPrint.length > 0) { @@ -4885,7 +4885,7 @@ var washRecordIds = getWashRecordIds(); if (washRecordIds.length > 1) { addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0]); - showResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); + showMultipleResult('所选择的物品关联到了多条清洗记录,清洗信息将自动填写最早的清洗记录!'); } else if (washRecordIds.length == 1) { addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0]); } else { @@ -4919,7 +4919,7 @@ if (curTousseesToPrint.length > 0) { // if(!Ext4.isIE){ - // showResult("目前只支持IE浏览器进行打印!" , null , sstsConfig.messagePauseTimeOnPackingPage); + // showMultipleResult("目前只支持IE浏览器进行打印!" , null , sstsConfig.messagePauseTimeOnPackingPage); // return; // } doPrintLabels(curTousseesToPrint, cfg); @@ -5220,17 +5220,17 @@ Ext4.getCmp('basketBarcodeInput').setValue(''); var jsonObj = Ext4.JSON.decode(result.responseText); if (!jsonObj.success) { - showResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage); return; } var taskList = jsonObj.data; var nLength = taskList ? taskList.length : 0; if (scanType == 1) { if (jsonObj.notWashedInfo !== '') { - showResult(jsonObj.notWashedInfo); + showMultipleResult(jsonObj.notWashedInfo); } else { if (nLength == 0) { - showResult('该篮筐在' + taskGroup + '内无装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('该篮筐在' + taskGroup + '内无装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage); } } } @@ -5698,7 +5698,7 @@ var tousseName = packingMaterialsArray[0]; var amount = packingMaterialsArray[1]; if (amount > 1) { - showResult('一次只能检查一个物品,请先将【' + tousseName + '】的物品数量改成1后再进行检查并装配!') + showMultipleResult('一次只能检查一个物品,请先将【' + tousseName + '】的物品数量改成1后再进行检查并装配!') return false } if (rowIndex == undefined) { @@ -5796,7 +5796,7 @@ } var basketBarcode = Ext4.getCmp('basketBarcodeInput').getValue(); if (basketBarcode == '') { - showResult('篮筐条码为空', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('篮筐条码为空', null, sstsConfig.messagePauseTimeOnPackingPage); return; } scanBasketBarcodes(basketBarcode, 1); @@ -5882,7 +5882,7 @@ var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid'); var selNodes = waitPackingTreeGrid.getView().getChecked(); if (selNodes.length == 0) { - showResult('请选择需要打印的包'); + showMultipleResult('请选择需要打印的包'); return; } var ids = []; @@ -6388,7 +6388,7 @@ // var store = Ext4.getCmp("todayHisPackingRecordPanel").getStore(); // var count = store.getCount(); // if(count == 0){ - // showResult('没有要打印的记录' , null , sstsConfig.messagePauseTimeOnPackingPage); + // showMultipleResult('没有要打印的记录' , null , sstsConfig.messagePauseTimeOnPackingPage); // myMask.destroy(); // return; // } @@ -6414,7 +6414,7 @@ var jsonObj = Ext4.JSON.decode(result.responseText); var rows = jsonObj.rows; if (!jsonObj.rows || jsonObj.rows.length == 0) { - showResult('没有要打印的记录', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('没有要打印的记录', null, sstsConfig.messagePauseTimeOnPackingPage); myMask.destroy(); return; } @@ -6664,7 +6664,7 @@ var tousseDefinitionId = getPackingMaterialsForCheck.element(0).key; materialsAddBgColor(tousseDefinitionId); } else if (getPackingMaterialsForCheck.size() > 1) { - showResult('一次只能检查一种物品,请勿勾选多种物品!'); + showMultipleResult('一次只能检查一种物品,请勿勾选多种物品!'); return false } } @@ -6770,17 +6770,21 @@ } } openPort(params, function (value, isData, errorStatus) { + if(errorStatus == 'msg6' || errorStatus == 'msg7'){ + location.reload(); + return + } if (isData) { if(typeof value == 'string' && value.indexOf('F') > 0){ value = value.split('F')[0]; } loadIdCardByBarcode(value, true, true); } else { - showResult(value); + showMultipleResult(value); } }); } else { - showResult('你的浏览器不支持串口连接!'); + showMultipleResult('你的浏览器不支持串口连接!'); } } @@ -6941,13 +6945,13 @@ Ext4.getCmp('basketBarcodeInput').setValue(''); var jsonObj = Ext4.JSON.decode(result.responseText); if (!jsonObj.success) { - showResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult(jsonObj.message, null, sstsConfig.messagePauseTimeOnPackingPage); return; } var taskList = jsonObj.data; var nLength = taskList ? taskList.length : 0; if (nLength == 0) { - showResult('该篮筐在' + taskGroup + '内无装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage); + showMultipleResult('该篮筐在' + taskGroup + '内无装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage); } var speakBasket = new SpeakBasket();