Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r40302 -r40474 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40302) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40474) @@ -54,13 +54,13 @@ var focusName = ''; var sessionOptionsJson = []; -function clearOptions(){ - if(sessionOptionsJson.length > 0){ - for(var i=0;i 0) { + for (var i = 0; i < sessionOptionsJson.length; i++) { var optionId = sessionOptionsJson[i].id; - if(top.Ext.getCmp('checkboxOptions'+optionId)){ - var id = top.Ext.getCmp('checkboxOptions'+optionId).hiddenId; - var filedIndex = top.Ext.getCmp('checkboxOptions'+optionId).filedIndex; + if (top.Ext.getCmp('checkboxOptions' + optionId)) { + var id = top.Ext.getCmp('checkboxOptions' + optionId).hiddenId; + var filedIndex = top.Ext.getCmp('checkboxOptions' + optionId).filedIndex; top.Ext.getCmp('showRecordMaterialDetails_' + id + '_' + filedIndex).setValue(''); top.Ext.getCmp('hideRecordMaterialDetails_' + id + '_' + filedIndex).setValue(''); var recordMaterialDetails = top.Ext.getCmp('recordMaterialDetails' + id).getValue(); @@ -98,19 +98,19 @@ var itemType = fsItem.getXType(); if (itemType == "panel") { fsItem.items.each(function (item, index, length) { - if(item.items && item.items.items[0] && item.items.items[0].setValue){ + if (item.items && item.items.items[0] && item.items.items[0].setValue) { item.items.items[0].setValue(false); } }); } else if (itemType == "hidden") { - if(fsItem.setValue){ + if (fsItem.setValue) { fsItem.setValue(""); } } }); } else if (xtype == 'panel') { hideElement.items.each(function (item, index, length) { - if(item.setValue){ + if (item.setValue) { item.setValue(""); } }); @@ -656,7 +656,7 @@ } else if (wrapper[j].items.items[0] && (wrapper[j].items.items[0].fieldLabel == "重新回收" || wrapper[j].items.items[0].fieldLabel == "重新装配")) { continue; } else {//器械包名称,器械包数量 - if(wrapper[j].items.items[0]){ + if (wrapper[j].items.items[0]) { var value = wrapper[j].items.items[0].el.dom.value; if (wrapper[j].items.items[0].fieldLabel == "器械包名称") { tousseBagsList.tousseName = value; @@ -672,9 +672,9 @@ firstTousseBagsList.materialInfos = firstMaterialInfos; tousseBags.unshift(firstTousseBagsList); } else { - if(firstTousseBagsList.tousseName == '' && firstTousseBagsList.tousseDefinitionId == '' && firstMaterialInfos.length == 0){ + if (firstTousseBagsList.tousseName == '' && firstTousseBagsList.tousseDefinitionId == '' && firstMaterialInfos.length == 0) { firstTousseBagsList = []; - }else { + } else { firstTousseBagsList.materialInfos = firstMaterialInfos; tousseBags.unshift(firstTousseBagsList); } @@ -855,7 +855,7 @@ for (var i = 0; i < tousseAndMaterialAllData.length; i++) { var items = tousseAndMaterialAllData[i]; if (items.tousseName == '') { - if (tousseAndMaterialAll[0] && (tousseAndMaterialAll[0].tousseName == '' || tousseAndMaterialAll[0].tousseName == '(未指定器械包)')) { + if (tousseAndMaterialAll[0] && (tousseAndMaterialAll[0].tousseName == '' || tousseAndMaterialAll[0].tousseName == '(未指定器械包)')) { if (tousseAndMaterialAll[0].materialInfos.length == 0) { tousseAndMaterialAll[0].materialInfos = items.materialInfos; } else if (items.materialInfos.length == 0) { @@ -1262,7 +1262,7 @@ arr.push({ optionId: optionId, tousseBarcode: tousseBarcode, - tousseName: tousseName == '(未指定器械包)'?'':tousseName, + tousseName: tousseName == '(未指定器械包)' ? '' : tousseName, tousseDefinitionId: tousseDefinitionId, tousseInstanceId: tousseInstanceId, materialInfos: materialInfos @@ -1463,7 +1463,9 @@ var hideElement = false; if ('是' == isTriggerItem && (value == null || value == "")) { setTimeout(function () { - top.Ext.getCmp('hideElement' + id).hide(); + if (top.Ext.getCmp('hideElement' + id)) { + top.Ext.getCmp('hideElement' + id).hide(); + } }, 100); } if (type == '文本') { @@ -1676,14 +1678,14 @@ style: 'margin-top:10px', id: 'hideCheckbox' + id + '_' + j, items: [{ - id:'checkboxOptions'+optionsJson[j].id, + id: 'checkboxOptions' + optionsJson[j].id, name: 'cconfigItemOption' + id, fieldLabel: optionsJson[j].name, xtype: 'checkbox', checked: checked, inputValue: JSON.stringify(optionsJson[j]), filedIndex: j, - hiddenId:id, + hiddenId: id, listeners: { check: function (thiz, checked) { var elementId = thiz.getName().substring(1); @@ -1757,7 +1759,7 @@ top.Ext.getCmp('showRecordMaterialDetails_' + id + '_' + filedIndex).setValue(str); top.Ext.getCmp('hideRecordMaterialDetails_' + id + '_' + filedIndex).setValue(JSON.stringify(tousseGoodsArr)); top.Ext.getCmp('showRecordMaterialDetailsBox_' + id + '_' + filedIndex).show(); - } + } if (materialInfosArr.length > 0) { for (var j = 0; j < materialInfosArr.length; j++) { var material = materialInfosArr[j].material; @@ -2128,7 +2130,7 @@ top.Ext.getCmp('addQualityMonitoringForm').remove('itemsFieldSet'); hideExtractCheckMaterial(); //BJCYZXYYY-10:添加时新增“合格信息”区域 - if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction) { + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1) { top.Ext.getCmp('qualifiedInformationSet').setVisible(false); } top.Ext.getCmp('addQualityMonitoringForm').doLayout(); @@ -2284,7 +2286,27 @@ //top.Ext.getCmp('materialAmount').setValue(""); //隐藏监测项 hideInspectItem(); - resetRecycleAndRepackingValue(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '', + isChecked: 'false' + }, { + name: 'isAllTousseOfSterile', + checkName: 'allTousseOfSterile', + value: '', + isChecked: 'false' + }]); var responsibilityPart = top.Ext.getCmp('responsibilityPart').getValue(); hideExtractCheckTousse(); tousseItemCount = 0; @@ -2363,10 +2385,30 @@ hideMaterialOrTousseOrTousseMaterial(); //隐藏监测项 hideInspectItem(); - resetRecycleAndRepackingValue(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '', + isChecked: 'false' + }, { + name: 'isAllTousseOfSterile', + checkName: 'allTousseOfSterile', + value: '', + isChecked: 'false' + }]); hideExtractCheckTousse(); - if(top.Ext.getCmp('srDateTime')){ - setStartDate(top.Ext, 'yyyy/MM/dd', 'srDateTime'); + if (top.Ext.getCmp('srDateTime')) { + setStartDate(top.Ext, 'yyyy/MM/dd', 'srDateTime'); } tousseItemCount = 0; } else if (result.data.scope == "材料和器械包") { @@ -2395,7 +2437,27 @@ addMaterialMsg(); //隐藏监测项 hideInspectItem(); - resetRecycleAndRepackingValue(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '', + isChecked: 'false' + }, { + name: 'isAllTousseOfSterile', + checkName: 'allTousseOfSterile', + value: '', + isChecked: 'false' + }]); hideExtractCheckTousse(); tousseItemCount = 0; var responsibilityPart = top.Ext.getCmp('responsibilityPart').getValue(); @@ -2450,7 +2512,27 @@ top.Ext.getCmp('sterilizationRecordInfo').setVisible(false); //FSSDERMYY-18:隐藏器械包信息 top.Ext.getCmp('tousseInfoFieldSet').setVisible(false); - resetRecycleAndRepackingValue(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '', + isChecked: 'false' + }, { + name: 'isAllTousseOfSterile', + checkName: 'allTousseOfSterile', + value: '', + isChecked: 'false' + }]); hideExtractCheckTousse(); tousseItemCount = 0; } @@ -2466,8 +2548,8 @@ top.Ext.getCmp('materialAmount').setValue(1); } top.Ext.getCmp('handleDepart').setValue(result.data.handleDepart); - //BJCYZXYYY-10:添加时新增“合格信息”区域 - if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction) { + //BJCYZXYYY-10:添加时新增“合格信息”区域(HZSRMYY-89改进) + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1) { if (isQualified == '是') { selectEmptyDo(); top.Ext.getCmp('qualifiedInformationSet').setVisible(true); @@ -2485,7 +2567,7 @@ } } } else { - top.Ext.getCmp('isQualified').setValue('否'); + top.Ext.getCmp('isQualified').setValue(isQualified || '否'); } //BJ309YY-25:隐藏或禁用不必要的按钮 disableOrHideBox(); @@ -2556,22 +2638,72 @@ */ function updateControlStatus() { if (allTousseOfSterileChecked()) { - enableRecycleAndRepacking(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isDisable: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + isDisable: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isDisable: 'false' + }]); } else { var tousseType = top.Ext.getCmp('tousseType').getValue(); var tousseInstanceId = top.Ext.getCmp('tousseInstanceId').getValue(); var toussedefRecycling = top.Ext.getCmp('tousseDefRecycling').getValue(); if (isUndefinedOrNullOrEmpty(tousseInstanceId)) { - disableRecycleAndRepacking(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false', + isDisable: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false', + isDisable: 'true' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '', + isChecked: 'false', + isDisable: 'true' + }]); } else if (tousseType == PACKAGE_TYPE_FOREIGN || tousseType == PACKAGE_TYPE_SPLIT || tousseType == '敷料包' || toussedefRecycling == '否') { if (!sessionItem.tousseItems) { - disableRecycleCanRepacking(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false', + isDisable: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false', + isDisable: 'false' + }]); } } else { - enableRecycleAndRepacking(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isDisable: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + isDisable: 'false' + }]); } } } @@ -2606,55 +2738,36 @@ } } -/** - * 将“重新回收”和“重新装配”及“是否整炉”设置为未选中状态. - */ -function resetRecycleAndRepackingValue() { - top.Ext.getCmp('isRecycle').setValue(''); - top.Ext.getCmp('isRepacking').setValue(''); - top.Ext.getCmp('isDiscard').setValue(''); - top.Ext.getCmp('isAllTousseOfSterile').setValue(''); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(false); - top.Ext.getCmp('allTousseOfSterile').setValue(false); +//HZSRMYY-89:更改重新回收,重新装配,是否整炉,废弃条码状态 +function disableOrEnableChecked(objArr) { + var isQualified = '否'; + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 2) { + isQualified = top.Ext.getCmp('isQualified').getValue(); + } + if (objArr && objArr.length > 0) { + for (var i = 0; i < objArr.length; i++) { + var name = objArr[i].name; + var checkName = objArr[i].checkName; + var value = objArr[i].value; + var isChecked = objArr[i].isChecked; + var isDisable = objArr[i].isDisable; + if (value !== undefined) { + top.Ext.getCmp(name).setValue(value); + } + if (isChecked == 'true') { + top.Ext.getCmp(checkName).setValue(true); + } else if (isChecked == 'false') { + top.Ext.getCmp(checkName).setValue(false); + } + if (isDisable == 'true' || isQualified == '是') { + top.Ext.getCmp(checkName).disable(); + } else if (isDisable == 'false') { + top.Ext.getCmp(checkName).enable(); + } + } + } } -/** - * 禁用“重新回收”和“重新装配”的复选框. - */ -function disableRecycleAndRepacking() { - top.Ext.getCmp('isRecycle').setValue(''); - top.Ext.getCmp('isRepacking').setValue(''); - top.Ext.getCmp('isDiscard').setValue(''); - top.Ext.getCmp('recycle').disable(); - top.Ext.getCmp('repacking').disable(); - top.Ext.getCmp('disabledBarcode').disable(); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(false); -} - -/** - * 不能重新回收,可以重新装配. - */ -function disableRecycleCanRepacking() { - top.Ext.getCmp('isRecycle').setValue(''); - top.Ext.getCmp('isRepacking').setValue(''); - top.Ext.getCmp('recycle').disable(); - top.Ext.getCmp('repacking').enable(); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); -} - -/** - * 启用“重新回收”和“重新装配”的复选框. - */ -function enableRecycleAndRepacking() { - top.Ext.getCmp('recycle').enable(); - top.Ext.getCmp('repacking').enable(); -} - //SZSDSRMYY-76:获取条码的备注 function getBarcodeRemark(result) { if (result.remark !== '') { @@ -2745,7 +2858,7 @@ if (!sessionItem.tousseItems) { //4、控制“重新回收”和“重新装配”的复选框的是否可用. updateControlStatus(); - top.Ext.getCmp('disabledBarcode').enable(); + top.Ext.getCmp('disabledBarcode').disable(); top.Ext.getCmp('disabledBarcode').setValue(false); top.Ext.getCmp('isDiscard').setValue(''); } @@ -2900,10 +3013,10 @@ tousseIndex: tousseItemCount, materialIndex: materialItemCount, listeners: { - focus: function(field){ + focus: function (field) { var tousseIndex = field.tousseIndex; var materialIndex = field.materialIndex; - setTimeout(function(){ + setTimeout(function () { focusName = top.Ext.getCmp('material' + tousseIndex + '_' + materialIndex).getValue(); }, 100); }, @@ -2929,13 +3042,13 @@ } }, blur: function (field) { - setTimeout(function(){ + setTimeout(function () { var tousseIndex = field.tousseIndex; var materialIndex = field.materialIndex; var blurName = top.Ext.getCmp('material' + tousseIndex + '_' + materialIndex).getValue(); var blurName2 = top.Ext.getCmp('material' + tousseIndex + '_' + materialIndex).getRawValue(); - if(focusName !== ''){ - if(blurName2 == '' || focusName !== blurName){ + if (focusName !== '') { + if (blurName2 == '' || focusName !== blurName) { clearOptions(); } } @@ -3090,6 +3203,8 @@ if (!addExtractClick) { top.Ext.getCmp('tosseAndMaterialList' + amountChild + '_TMP').add(items); top.Ext.getCmp('tosseAndMaterialList' + amountChild + '_TMP').add(items1); + top.Ext.getCmp('tosseAndMaterialList' + amountChild + '_TMP').add(items3); + top.Ext.getCmp('tosseAndMaterialList' + amountChild + '_TMP').add(items4); } else { var tosseAndMaterialList = { layout: 'column', @@ -3168,6 +3283,9 @@ tousseAndMaterial.doLayout(); // 顺序包括器械包和材料都排进去 var curOrder = materialItemCount + tousseItemCount + 2; + if (orderNumber != null && orderNumber > 0) { + curOrder = orderNumber; + } if (top.Ext.getCmp('materialOrder' + materialItemCount)) { top.Ext.getCmp('materialOrder' + materialItemCount).setValue(curOrder); } @@ -3176,11 +3294,6 @@ top.Ext.getCmp('position' + materialItemCount).setValue(basketPosition); } } - if (orderNumber != null && orderNumber > 0) { - if (top.Ext.getCmp('materialOrder' + materialItemCount)) { - top.Ext.getCmp('materialOrder' + materialItemCount).setValue(orderNumber); - } - } if (isOpenRecord == true) { //打开记录,不允许修改 top.Ext.getCmp('material' + tousseItemCount + '_' + materialItemCount).disable(); @@ -3990,8 +4103,8 @@ anchor: '95%', tousseIndex: tousseItemCount, listeners: { - focus: function(field){ - setTimeout(function(){ + focus: function (field) { + setTimeout(function () { var tousseIndex = field.tousseIndex; focusName = top.Ext.getCmp('tempBarcode' + tousseIndex + "_" + 3).getValue(); }, 100); @@ -4038,12 +4151,12 @@ } } } - setTimeout(function(){ + setTimeout(function () { var tousseIndex = field.tousseIndex; var blurName = top.Ext.getCmp('tempBarcode' + tousseIndex + "_" + 3).getValue(); var blurName2 = top.Ext.getCmp('tempBarcode' + tousseIndex + "_" + 3).getRawValue(); - if(focusName !== ''){ - if(blurName2 == '' || focusName !== blurName){ + if (focusName !== '') { + if (blurName2 == '' || focusName !== blurName) { clearOptions(); } } @@ -4371,8 +4484,19 @@ } loadTousseMsg({}, arr); if (!ids) { - enableRecycleAndRepacking(); - top.Ext.getCmp('disabledBarcode').enable(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isDisable: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + isDisable: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isDisable: 'false' + }]); } } else if (scope == '材料和器械包') { if (tousseItems.length > 0) { @@ -4394,8 +4518,19 @@ } loadMateriaAndTousselMsg({}, arr); if (!ids) { - enableRecycleAndRepacking(); - top.Ext.getCmp('disabledBarcode').enable(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isDisable: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + isDisable: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isDisable: 'false' + }]); } } } @@ -4999,8 +5134,8 @@ top.Ext.getCmp('sterilizationRecordInfo').setVisible(true); // 如果监测范围为灭菌炉记录,隐藏器械包信息 top.Ext.getCmp('tousseInfoFieldSet').setVisible(false); - if(top.Ext.getCmp('srDateTime')){ - setStartDate(top.Ext, 'yyyy/MM/dd', 'srDateTime'); + if (top.Ext.getCmp('srDateTime')) { + setStartDate(top.Ext, 'yyyy/MM/dd', 'srDateTime'); } } else { top.Ext.getCmp('sterilizationRecordInfo').setVisible(false); @@ -5049,9 +5184,19 @@ top.Ext.getCmp('unQualifiedTousseAmount').setValue(result.data.unQualifiedTousseAmount || 0); } //打开已有质量监测记录,器械包条码,器械包名称,重新回收和重新装配都禁用掉,不能再修改 - top.Ext.getCmp('recycle').disable(); - top.Ext.getCmp('repacking').disable(); - top.Ext.getCmp('disabledBarcode').disable(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isDisable: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + isDisable: 'true' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isDisable: 'true' + }]); top.Ext.getCmp('tempBarcode').disable(); top.Ext.getCmp('tousseName').disable(); top.Ext.getCmp('tousseAmount').disable(); @@ -5061,7 +5206,9 @@ top.Ext.getCmp('position').disable(); top.Ext.getCmp('allTousseOfSterile').disable(); //BJCYZXYYY-10:添加时新增“合格信息”区域 - if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction) { + var isQualified = result.data.isQualified || '否'; + //BJCYZXYYY-10:添加时新增“合格信息”区域(HZSRMYY-89改进) + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1) { var recordQualifiedInformation = result.data.recordRecycleInformation; var isQualified = result.data.isQualified; top.Ext.getCmp('isQualified').setValue(isQualified); @@ -5076,7 +5223,7 @@ top.Ext.getCmp('qualifiedInformationSet').setVisible(false); } } else { - top.Ext.getCmp('isQualified').setValue('否'); + top.Ext.getCmp('isQualified').setValue(isQualified); } } else { showResultQM("找不到该条码所对应的器械包实例"); @@ -5096,7 +5243,25 @@ top.Ext.getCmp('positionC').setVisible(false); } setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'dateTime'); //(设置抽检时间,取服务器时间 cjr) - disableRecycleAndRepacking(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false', + isDisable: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false', + isDisable: 'true' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '', + isChecked: 'false', + isDisable: 'true' + }]); var resonPart = top.Ext.getCmp('responsibilityPart').getValue(); if (resonPart != null && resonPart != '') { if (resonPart == '全部环节') { @@ -5116,8 +5281,8 @@ } else { formDefinitionStore.load(); } - if(top.Ext.getCmp('srDateTime')){ - setStartDate(top.Ext, 'yyyy/MM/dd', 'srDateTime'); + if (top.Ext.getCmp('srDateTime')) { + setStartDate(top.Ext, 'yyyy/MM/dd', 'srDateTime'); } } if (tousseItems && tousseItems.length > 0) { @@ -5453,10 +5618,21 @@ var scope = top.Ext.getCmp('scope').getValue(); //监测范围 if (!allTousseOfSterileChecked()) { if (inspectName != '无' && scope != '无' && scope != '灭菌炉记录') { - // 质量检测项为'无',强制登记器械包信息 - if (!material && !tousseName) { - showResultQM("请录入抽验器械或器械包名称"); - return false; + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 2) { + var isQualified = top.Ext.getCmp('isQualified').getValue(); + if (isQualified == '否') { + // 质量检测项为'无',强制登记器械包信息 + if (!material && !tousseName) { + showResultQM("请录入抽验器械或器械包名称"); + return false; + } + } + } else { + // 质量检测项为'无',强制登记器械包信息 + if (!material && !tousseName) { + showResultQM("请录入抽验器械或器械包名称"); + return false; + } } } } @@ -5507,7 +5683,7 @@ "material": material, "amount": amount, "position": position, - "order": "" + "order": 0 }); //获取第一块器械包写死的数据 @@ -5737,12 +5913,12 @@ return false; } - if(top.Ext.getCmp('sterilizationRecordInfo').isVisible()){ + if (top.Ext.getCmp('sterilizationRecordInfo').isVisible()) { var srDateTimeBox = top.Ext.getCmp("srDateTime"); if (srDateTimeBox != null && srDateTimeBox.getRawValue() == "") { showResultQM("灭菌日期不能为空!"); return false; - }else if (!top.Ext.getCmp('srDateTime').isValid()) { + } else if (!top.Ext.getCmp('srDateTime').isValid()) { showResultQM("请正确填写灭菌日期。"); return false; } @@ -5751,35 +5927,35 @@ //HZSRMYY-88:根据是否合格来必填 var responsiblePersonAllowBlank = true; var notAllowBlankFieldsOfQualityMonitoring = sstsConfig.notAllowBlankFieldsOfQualityMonitoring || []; - if(notAllowBlankFieldsOfQualityMonitoring && notAllowBlankFieldsOfQualityMonitoring.length > 0){ - for(var i=0;i 0) { + for (var i = 0; i < notAllowBlankFieldsOfQualityMonitoring.length; i++) { var value = notAllowBlankFieldsOfQualityMonitoring[i]; - if(value.indexOf('responsiblePerson') >= 0){ - if(sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction){ + if (value.indexOf('responsiblePerson') >= 0) { + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction) { var arr = value.split('-'); var isQualified = top.Ext.getCmp('isQualified').getValue(); - if(arr.length > 0){ - if(arr[1] == 'Unqualified'){ - if(isQualified == '否'){ + if (arr.length > 0) { + if (arr[1] == 'Unqualified') { + if (isQualified == '否') { responsiblePersonAllowBlank = false; } - }else if(arr[1] == 'qualified'){ - if(isQualified == '是'){ + } else if (arr[1] == 'qualified') { + if (isQualified == '是') { responsiblePersonAllowBlank = false; } - }else { + } else { responsiblePersonAllowBlank = false; } } - }else { + } else { responsiblePersonAllowBlank = false; } } } } var responsiblePerson = top.Ext.getCmp("responsiblePerson").getValue(); - if(!responsiblePersonAllowBlank && responsiblePerson == ''){ + if (!responsiblePersonAllowBlank && responsiblePerson == '') { showResultQM("责任人不能为空!"); return false; } @@ -5789,7 +5965,6 @@ if (!tousseAndMaterialAll) { return false } - //传参tousseAndMaterialAll checkIsTousseInstanceRepackingAndSubmitFormNew(thiz, JSON.stringify(tousseAndMaterialAll), saveAndCreate); } @@ -6021,35 +6196,77 @@ top.Ext.getCmp('tousseName').setValue(tousseName); top.Ext.getCmp('tousseAmount').setValue(amount); top.Ext.getCmp('tousseDefinitionId').setValue(tousseDefinitionId); + var objArr = []; if ('是' == qualityMonitoringGoodsList[i].isRecycle) { - top.Ext.getCmp('isRecycle').setValue(qualityMonitoringGoodsList[i].isRecycle); - top.Ext.getCmp('isRepacking').setValue('否'); - top.Ext.getCmp('isDiscard').setValue('否'); - top.Ext.getCmp('recycle').setValue(true); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(false); + objArr = [{ + name: 'isRecycle', + checkName: 'recycle', + value: qualityMonitoringGoodsList[i].isRecycle, + isChecked: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '否', + isChecked: 'false' + }] } else if ('是' == qualityMonitoringGoodsList[i].isRepacking) { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue(qualityMonitoringGoodsList[i].isRepacking); - top.Ext.getCmp('isDiscard').setValue('否'); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(true); - top.Ext.getCmp('disabledBarcode').setValue(false); + objArr = [{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: qualityMonitoringGoodsList[i].isRepacking, + isChecked: 'true' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '否', + isChecked: 'false' + }] } else if ('是' == qualityMonitoringGoodsList[i].isDiscard) { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue('否'); - top.Ext.getCmp('isDiscard').setValue(qualityMonitoringGoodsList[i].isDiscard); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(true); + objArr = [{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: qualityMonitoringGoodsList[i].isDiscard, + isChecked: 'true' + }] } else { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue('否'); - top.Ext.getCmp('isDiscard').setValue('否'); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(false); + objArr = [{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '否', + isChecked: 'false' + }] } + disableOrEnableChecked(objArr); if (sstsConfig.enableRepeatPrintingLabelsAddQualityMonitoringFunction) { if (qualityMonitoringInstance.responsibilityPart == '装配管理') { var ids = qualityMonitoringInstance.ids || ''; @@ -6066,9 +6283,19 @@ top.Ext.getCmp('tousseAmount').disable(); top.Ext.getCmp('responsibilityPart').disable(); top.Ext.getCmp('addExtractCheckTousseBtnC').el.dom.style.opacity = 0; - top.Ext.getCmp('recycle').disable(); - top.Ext.getCmp('repacking').disable(); - top.Ext.getCmp('disabledBarcode').disable(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isDisable: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + isDisable: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isDisable: 'false' + }]); } } } @@ -6128,22 +6355,41 @@ function setIsRecycleAndIsRepackingForWholeFurnace(qualityMonitoringInstance) { if (qualityMonitoringInstance.isAllTousseOfSterile == '是') { //是整炉 if ('是' == qualityMonitoringInstance.isRecycle) { - top.Ext.getCmp('isRecycle').setValue(qualityMonitoringInstance.isRecycle); - top.Ext.getCmp('isRepacking').setValue('否'); - - top.Ext.getCmp('recycle').setValue(true); - top.Ext.getCmp('repacking').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: qualityMonitoringInstance.isRecycle, + isChecked: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }]); } else if ('是' == qualityMonitoringInstance.isRepacking) { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue(qualityMonitoringInstance.isRepacking); - - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(true); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: qualityMonitoringInstance.isRepacking, + isChecked: 'true' + }]); } else { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue('否'); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }]); } } } @@ -6171,36 +6417,73 @@ top.Ext.getCmp('tousseName').setValue(tousseName); top.Ext.getCmp('tousseAmount').setValue(amount); if ('是' == qualityMonitoringGoodsList[i].isRecycle) { - top.Ext.getCmp('isRecycle').setValue(qualityMonitoringGoodsList[i].isRecycle); - top.Ext.getCmp('isRepacking').setValue('否'); - top.Ext.getCmp('isDiscard').setValue('否'); - - top.Ext.getCmp('recycle').setValue(true); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: qualityMonitoringGoodsList[i].isRecycle, + isChecked: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '否', + isChecked: 'false' + }]); } else if ('是' == qualityMonitoringGoodsList[i].isRepacking) { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue(qualityMonitoringGoodsList[i].isRepacking); - top.Ext.getCmp('isDiscard').setValue('否'); - - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(true); - top.Ext.getCmp('disabledBarcode').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: qualityMonitoringGoodsList[i].isRepacking, + isChecked: 'true' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '否', + isChecked: 'false' + }]); } else if ('是' == qualityMonitoringGoodsList[i].isDiscard) { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue('否'); - top.Ext.getCmp('isDiscard').setValue(qualityMonitoringGoodsList[i].isDiscard); - - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(true); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: qualityMonitoringGoodsList[i].isDiscard, + isChecked: 'true' + }]); } else { - top.Ext.getCmp('isRecycle').setValue('否'); - top.Ext.getCmp('isRepacking').setValue('否'); - top.Ext.getCmp('isDiscard').setValue('否'); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); - top.Ext.getCmp('disabledBarcode').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '否', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '否', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '否', + isChecked: 'false' + }]); } } else { var mateialName = qualityMonitoringGoodsList[i].material; @@ -7235,7 +7518,26 @@ select: function (combo, record, index) { var formDefinitionId = top.Ext.getCmp("formDefinitionId").getValue(); var name = top.Ext.getCmp("name").getValue(); - addQualityMonitoringItem(formDefinitionId, name, record.data.value); + //BJCYZXYYY-10:添加时新增“合格信息”区域(HZSRMYY-89改进) + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1) { + addQualityMonitoringItem(formDefinitionId, name, record.data.value); + } else if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 2) { + if (record.data.value == '是') { + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isDisable: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + isDisable: 'true' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isDisable: 'true' + }]); + } + } } } }] @@ -7292,11 +7594,25 @@ listeners: { check: function (thiz, checked) { if (checked) { - top.Ext.getCmp('isRecycle').setValue('是'); - top.Ext.getCmp('disabledBarcode').setValue(false); - top.Ext.getCmp('repacking').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '是' + }, { + name: 'isRepacking', + checkName: 'repacking', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isChecked: 'false' + }]); } else { - top.Ext.getCmp('isRecycle').setValue('否'); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '否' + }]); } } } @@ -7315,11 +7631,25 @@ listeners: { check: function (thiz, checked) { if (checked) { - top.Ext.getCmp('isRepacking').setValue('是'); - top.Ext.getCmp('disabledBarcode').setValue(false); - top.Ext.getCmp('recycle').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '是' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + isChecked: 'false' + }]); } else { - top.Ext.getCmp('isRepacking').setValue('否'); + disableOrEnableChecked([{ + name: 'isRepacking', + checkName: 'repacking', + value: '否' + }]); } } } @@ -7339,11 +7669,25 @@ listeners: { check: function (thiz, checked) { if (checked) { - top.Ext.getCmp('isDiscard').setValue('是'); - top.Ext.getCmp('recycle').setValue(false); - top.Ext.getCmp('repacking').setValue(false); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + isChecked: 'false' + }, { + name: 'isRepacking', + checkName: 'repacking', + isChecked: 'false' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '是' + }]); } else { - top.Ext.getCmp('isDiscard').setValue('否'); + disableOrEnableChecked([{ + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '否' + }]); } } } @@ -7444,8 +7788,8 @@ typeAhead: false, anchor: '95%', listeners: { - focus: function(field){ - setTimeout(function(){ + focus: function (field) { + setTimeout(function () { focusName = top.Ext.getCmp('tousseName').getValue(); }, 100); }, @@ -7483,11 +7827,11 @@ } } } - setTimeout(function(){ + setTimeout(function () { var blurName = top.Ext.getCmp('tousseName').getValue(); var blurName2 = top.Ext.getCmp('tousseName').getRawValue(); - if(focusName !== ''){ - if(blurName2 == '' || focusName !== blurName){ + if (focusName !== '') { + if (blurName2 == '' || focusName !== blurName) { clearOptions(); } } @@ -7538,8 +7882,8 @@ typeAhead: false, anchor: '95%', listeners: { - focus: function(field){ - setTimeout(function(){ + focus: function (field) { + setTimeout(function () { focusName = top.Ext.getCmp('material').getValue(); }, 100); }, @@ -7562,11 +7906,11 @@ } }, blur: function (field) { - setTimeout(function(){ + setTimeout(function () { var blurName = top.Ext.getCmp('material').getValue(); var blurName2 = top.Ext.getCmp('material').getRawValue(); - if(focusName !== ''){ - if(blurName2 == '' || focusName !== blurName){ + if (focusName !== '') { + if (blurName2 == '' || focusName !== blurName) { clearOptions(); } } @@ -7750,7 +8094,25 @@ } function recycleAddQualityMonitoringDo(errorDamageQmKey, tousseName, recyclingUser, depart, circuitNurse, operationRoom) { setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'dateTime'); //(设置抽检时间,取服务器时间 cjr) - disableRecycleAndRepacking(); + disableOrEnableChecked([{ + name: 'isRecycle', + checkName: 'recycle', + value: '', + isChecked: 'false', + isDisable: 'true' + }, { + name: 'isRepacking', + checkName: 'repacking', + value: '', + isChecked: 'false', + isDisable: 'true' + }, { + name: 'isDiscard', + checkName: 'disabledBarcode', + value: '', + isChecked: 'false', + isDisable: 'true' + }]); var responPartName = "回收清点"; top.Ext.getCmp('responsibilityPart').setValue(responPartName); if (sstsConfig.hasOwnProperty('responsibilityPartNotLimitInspect') && sstsConfig.responsibilityPartNotLimitInspect) {