Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js =================================================================== diff -u -r35890 -r40493 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js (.../loadScanBarcodeMsg.js) (revision 35890) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js (.../loadScanBarcodeMsg.js) (revision 40493) @@ -35,6 +35,11 @@ Ext.getCmp(cleaningEndTime).setValue(records[0].data.endDate); Ext.getCmp(scanWashRecordId).setValue(records[0].data.washRecordID); Ext.getCmp('responsiblePerson').setValue(records[0].json.personInCharge); + if(sstsConfig.enableAddingMultipleResponsiblePersons && getBarcodeResponsiblePerson){ + getBarcodeResponsiblePerson('',records[0].json.personInCharge); + }else { + Ext.getCmp('responsiblePerson').setValue(records[0].json.personInCharge); + } }else if(top.Ext.getCmp('responsiblePerson')){ top.Ext.getCmp(rinseBasketsName).setValue(records[0].data.washBasketName); top.Ext.getCmp(cleaningMachinePosition).setValue(records[0].data.position); @@ -44,7 +49,11 @@ top.Ext.getCmp(cleaningStartTime).setValue(records[0].data.startDate); top.Ext.getCmp(cleaningEndTime).setValue(records[0].data.endDate); top.Ext.getCmp(scanWashRecordId).setValue(records[0].data.washRecordID); - top.Ext.getCmp('responsiblePerson').setValue(records[0].json.personInCharge); + if(sstsConfig.enableAddingMultipleResponsiblePersons && getBarcodeResponsiblePerson){ + getBarcodeResponsiblePerson('',records[0].json.personInCharge); + }else { + top.Ext.getCmp('responsiblePerson').setValue(records[0].json.personInCharge); + } } formWindowRinseRecord.close(); Index: ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js =================================================================== diff -u -r40478 -r40493 --- ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 40478) +++ ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 40493) @@ -126,6 +126,8 @@ enableOperatorAndResponsibleOfficerScanOfwashanddisinfectrecord:true, //启用清洗器械工作量及不合格率月报中统计包内材料数量的功能 enableCountToussesMaterialsDuringWashWorkloadReport:true, + //启用添加多个责任人功能 + enableAddingMultipleResponsiblePersons:true, //启用可登记合格的质量监测功能 enableRecordsQualifiedOfQualityMonitoringFunction:2 //质量监测单的表单字段必填项配置 Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r40482 -r40493 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40482) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40493) @@ -541,133 +541,20 @@ var firstTousseBagsList = {}; var firstMaterialInfos = []; var tousseName = top.Ext.getCmp('tousseName').getRawValue(); - var barcode = top.Ext.getCmp('barcode').getValue(); + var barcode = top.Ext.getCmp('hiddenTempBarcode').getValue(); var tousseDefinitionId = top.Ext.getCmp('tousseDefinitionId').getValue(); var tousseInstanceId = top.Ext.getCmp('tousseInstanceId').getValue(); + var responsiblePerson = top.Ext.getCmp('hiddenResponsiblePerson').getValue(); firstTousseBagsList.tousseBarcode = barcode; firstTousseBagsList.tousseName = tousseName; firstTousseBagsList.tousseDefinitionId = tousseDefinitionId; firstTousseBagsList.tousseInstanceId = tousseInstanceId; + firstTousseBagsList.responsiblePerson = responsiblePerson; - if (top.Ext.getCmp("materialWrapper")) { - var firstMaterialItems = top.Ext.getCmp("materialWrapper").items.items; - var firstMaterialArrHidden = [] - for (var m = 0; m < firstMaterialItems.length; m++) { - var materiaItemsId = firstMaterialItems[m].id; - if (materiaItemsId.indexOf("materialC") >= 0 || materiaItemsId.indexOf("materialAmountC") >= 0) { - if (firstMaterialItems[m].items.items[0] && firstMaterialItems[m].items.items[0].fieldLabel == "抽检器械" && m > 1) { + var tosseAndMaterialFirstWrapper = top.Ext.getCmp("tosseAndMaterial").items.items; + var tousseBags = setTousseArgument(tosseAndMaterialFirstWrapper); - if (firstMaterialArrHidden[0] && firstMaterialArrHidden[0] !== '') { - firstMaterialInfos.push({ - material: firstMaterialArrHidden[0], - amount: firstMaterialArrHidden[1] - }) - } - - firstMaterialArrHidden = []; - } - if (top.Ext.getCmp(materiaItemsId)) { - firstMaterialArrHidden.push(firstMaterialItems[m].items.items[0].el.dom.value); - } - } - } - - if (firstMaterialArrHidden[0] && firstMaterialArrHidden[0] !== '') { - firstMaterialInfos.push({ - material: firstMaterialArrHidden[0], - amount: firstMaterialArrHidden[1] - }) - } - } - - var wrapper = []; - var tousseBagsList = {}; - var tousseArrHidden = []; - var tousseBags = []; - if (top.Ext.getCmp("tosseAndMaterial")) { - wrapper = top.Ext.getCmp("tosseAndMaterial").items.items;//获取默认显示的第一个器械包信息，就是第一个块 - for (var j = 0; j < wrapper.length; j++) { - var parentId = wrapper[j].id; - if (parentId.indexOf("tosseAndMaterialList") != -1 && scope !== '器械包') {//是抽检器械，往下找items - tousseBagsList.tousseInstanceId = tousseArrHidden[0]; - tousseBagsList.tousseBarcode = tousseArrHidden[4];//器械包条码隐藏域值 - var materialInfos = []; - var materialArrHidden = []; - //抽检器械数据 - var materiaItems = wrapper[j].items.items; - for (var m = 0; m < materiaItems.length; m++) { - var materiaItemsId = materiaItems[m].id; - if (materiaItemsId.indexOf("materialC") >= 0 || materiaItemsId.indexOf("materialAmountC") >= 0) { - if (materiaItems[m].items.items[0] && materiaItems[m].items.items[0].fieldLabel == "抽检器械" && m > 1) { - - if (materialArrHidden[0] && materialArrHidden[0] !== '') { - materialInfos.push({ - "material": materialArrHidden[0], - "amount": materialArrHidden[1] - }) - materialArrHidden = []; - } - } - if (top.Ext.getCmp(materiaItemsId)) { - materialArrHidden.push(materiaItems[m].items.items[0].el.dom.value); - } - } - } - - if (scope !== '材料') { - if (materialArrHidden[0] && materialArrHidden[0] !== '') { - materialInfos.push({ - "material": materialArrHidden[0], - "amount": materialArrHidden[1] - }) - materialArrHidden = []; - } - tousseBagsList.materialInfos = materialInfos; - tousseBags.push(tousseBagsList); - tousseArrHidden = []; - tousseBagsList = {}; - } else { - if (materialArrHidden[0] && materialArrHidden[0] !== '') { - firstMaterialInfos.push({ - "material": materialArrHidden[0], - "amount": materialArrHidden[1] - }) - materialArrHidden = []; - } - } - } else if (wrapper[j].items == undefined) {//隐藏域的情况 - var tousseRecycleOrRePacking = top.Ext.getCmp(parentId).getValue(); - var index = parentId.split('_')[1]; - if (index == '5') { - tousseArrHidden[0] = tousseRecycleOrRePacking || ''; - } else if (index == '1') { - tousseArrHidden[4] = tousseRecycleOrRePacking || ''; - } - if (top.Ext.getCmp("scope").getValue() == "器械包") { - tousseBagsList.tousseInstanceId = tousseArrHidden[0]; - tousseBagsList.tousseBarcode = tousseArrHidden[4]; - if (tousseBagsList.tousseName) { - tousseBags.push(tousseBagsList); - } - tousseArrHidden = []; - tousseBagsList = {}; - } - } 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]) { - var value = wrapper[j].items.items[0].el.dom.value; - if (wrapper[j].items.items[0].fieldLabel == "器械包名称") { - tousseBagsList.tousseName = value; - tousseBagsList.tousseDefinitionId = wrapper[j].items.items[1] ? wrapper[j].items.items[1].el.dom.value : ''; - } - } - } - } - - } - if (firstTousseBagsList.tousseName !== '' && firstTousseBagsList.tousseDefinitionId !== '') { firstTousseBagsList.materialInfos = firstMaterialInfos; tousseBags.unshift(firstTousseBagsList); @@ -2478,6 +2365,7 @@ tousseDefinitionId: res.tousseDefinitionId, tousseName: tousseDefinitionName + '(' + barcode + ')', amount: tousseItems[i].data.amount || 1, + responsiblePerson: res.responsiblePerson || '', orderNumber: (i + 1), isRecycle: '否', isRePacking: '否', @@ -2491,6 +2379,9 @@ responsibilityPart: sessionItem.responPartName, ids: sessionItem.ids }, arr); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson(); + } } } else { top.Ext.getCmp('disabledBarcode').enable(); @@ -2551,7 +2442,7 @@ //BJCYZXYYY-10：添加时新增“合格信息”区域（HZSRMYY-89改进） if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction) { if (isQualified == '是') { - if(sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1){ + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1) { selectEmptyDo(); } top.Ext.getCmp('qualifiedInformationSet').setVisible(true); @@ -2561,7 +2452,7 @@ } else { var recordQualifiedInformation = result.data.recordQualifiedInformation; if (recordQualifiedInformation == '是') { - if(sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1){ + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1) { selectEmptyDo(); } top.Ext.getCmp('qualifiedInformationSet').setVisible(true); @@ -2575,6 +2466,9 @@ } //BJ309YY-25:隐藏或禁用不必要的按钮 disableOrHideBox(); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson(); + } } }, failure: function (response, options) { @@ -2791,6 +2685,53 @@ } } +//HZSRMYY-90:获取条码的责任人 +function getBarcodeResponsiblePerson(oldResponsiblePerson, newResponsiblePerson) { + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction) { + var isQualified = top.Ext.getCmp('isQualified').getValue(); + if (isQualified == '是') { + return + } + } + var tousseAndMaterialAllData = getAllTousseAndMaterialData(); + if (tousseAndMaterialAllData.length > 0) { + var responsiblePersonValue = ''; + for (var i = 0; i < tousseAndMaterialAllData.length; i++) { + var responsiblePerson = tousseAndMaterialAllData[i].responsiblePerson; + if (responsiblePersonValue == '') { + responsiblePersonValue = responsiblePerson; + } else { + if (responsiblePersonValue.indexOf(responsiblePerson) == -1) { + responsiblePersonValue += ';' + responsiblePerson; + } + } + } + if (newResponsiblePerson) { + if (responsiblePersonValue.indexOf(newResponsiblePerson) == -1) { + responsiblePersonValue += ';' + newResponsiblePerson; + } + top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); + } else { + var responsiblePerson2 = top.Ext.getCmp('responsiblePerson').getValue(); + if (responsiblePerson2 == '') { + top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); + } else { + var arr = responsiblePerson2.split(';'); + if (responsiblePersonValue !== '') { + for (var i = 0; i < arr.length; i++) { + if (arr[i] !== oldResponsiblePerson && responsiblePersonValue.indexOf(arr[i]) == -1) { + responsiblePersonValue += ';' + arr[i]; + } + } + top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue); + } + } + } + } else { + top.Ext.getCmp('responsiblePerson').setValue(newResponsiblePerson || ''); + } +} + /** * 根据“器械包条码”以及“监测项定义id”，获取器械包名字以及监测环节的责任人. * @param tempBarcode 器械包条码 @@ -2819,11 +2760,16 @@ top.Ext.getCmp('tousseName').setValue(result.tousseName); } top.Ext.getCmp('barcode').setValue(tempBarcode); + top.Ext.getCmp('hiddenTempBarcode').setValue(tempBarcode); top.Ext.getCmp('tousseInstanceId').setValue(result.tousseInstanceId); top.Ext.getCmp('tousseType').setValue(result.tousseType); top.Ext.getCmp('tousseDefRecycling').setValue(result.isRecycle); - if ((result.responsiblePerson || '') !== '') { - top.Ext.getCmp('responsiblePerson').setValue(result.responsiblePerson); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + var responsiblePerson = top.Ext.getCmp('hiddenResponsiblePerson').getValue(); + top.Ext.getCmp('hiddenResponsiblePerson').setValue(result.responsiblePerson || ''); + getBarcodeResponsiblePerson(responsiblePerson); + } else { + top.Ext.getCmp('responsiblePerson').setValue(result.responsiblePerson || ''); } //2、如果有炉号炉次，则需要设值 @@ -2859,6 +2805,7 @@ if (isScan) { getBarcodeRemark(result); } + if (!sessionItem.tousseItems) { //4、控制“重新回收”和“重新装配”的复选框的是否可用. updateControlStatus(); @@ -3825,6 +3772,7 @@ var items14 = new Array(); var idpreKey = 'tempBarcode' + tousseItemCount; var idpreKey2 = 'tempBarcodeHidden' + tousseItemCount; + var idpreKey3 = 'hiddenResponsiblePerson' + tousseItemCount; var rememberNum = tousseAndMaterialWrapperCount; items1 = { layout: 'form', @@ -3944,6 +3892,7 @@ if (e.getKey() == 13) { var result = getTousseInstanceMsg(field.getValue()); if (result != null) { + var oldResponsiblePerson = top.Ext.getCmp(idpreKey3 + "_" + 1).getValue(); // 获取条码成功 // 设置器械包名称，器械包条码，器械包id，器械包类型 if (result.barcode != null && result.barcode != '') { @@ -3957,6 +3906,7 @@ /* 判断器械包条码是否已经扫描end */ top.Ext.getCmp(idpreKey + "_" + 3).setValue(result.tousseName + "(" + field.getValue() + ")"); top.Ext.getCmp(idpreKey2 + "_" + 1).setValue(field.getValue());//存入隐藏域 + top.Ext.getCmp(idpreKey3 + "_" + 1).setValue(result.responsiblePerson || ''); } else { top.Ext.getCmp('tousseName').setValue(result.tousseName); top.Ext.getCmp(idpreKey + "_" + 3).setValue(result.tousseName); @@ -3995,6 +3945,9 @@ } } } + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson(oldResponsiblePerson); + } } getNextFocus(field); field.setValue(""); @@ -4016,6 +3969,10 @@ } }, anchor: '95%' + }, { + xtype: 'hidden', + id: 'hiddenResponsiblePerson' + tousseItemCount + "_" + 1, + name: 'hiddenResponsiblePerson' + tousseItemCount + "_" + 1 }] }; @@ -4408,18 +4365,26 @@ * @returns */ function getTousseInstanceMsg(barcode) { - if (barcode) { + var qmDefinitionId = top.Ext.getCmp('formDefinitionId').getValue() || ''; + if (barcode && qmDefinitionId !== '') { var result; - DWREngine.setAsync(false); - TousseInstanceTableManager.getTousseInstanceMsgByBarcode(barcode, function (responseText) { - result = top.Ext.decode(responseText); - if (result.success) { - } else { - result = null; - showResultQM("找不到该条码所对应的器械包实例"); + Ext4.Ajax.request({ + async: false, + url: WWWROOT + '/disinfectSystem/qualityMonitoringDefinitionAction!getTousseInstanceNameAndResponsiblePerson.do', + params: { barcode: barcode, qmDefinitionId: qmDefinitionId }, + success: function (response, options) { + result = Ext.decode(response.responseText); + if (result.success) { + + } else { + if (result.message) { + showResultQM(result.message); + } else { + showResultQM("找不到该条码所对应的器械包实例"); + } + } } }); - DWREngine.setAsync(true); return result; } return null; @@ -4512,6 +4477,7 @@ tousseDefinitionId: result.tousseDefinitionId, tousseName: tousseItems[i].data.tousseDefinitionName + '(' + tousseItems[i].data.barcode + ')', amount: tousseItems[i].data.amount, + responsiblePerson: result.responsiblePerson || '', orderNumber: (i + 1), isRecycle: '否', isRePacking: '否', @@ -4536,6 +4502,9 @@ isDisable: 'false' }]); } + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson(); + } } } } @@ -4634,6 +4603,9 @@ top.Ext.getCmp('formName').setValue(""); top.Ext.getCmp("formDefinitionId").setValue(""); top.Ext.getCmp("name").setValue(""); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson(); + } } }, anchor: '95%' @@ -5216,7 +5188,7 @@ var isQualified = result.data.isQualified; top.Ext.getCmp('isQualified').setValue(isQualified); if (isQualified == '是') { - if(sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1){ + if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 1) { selectEmptyDo(); top.Ext.getCmp('qualifiedInformationSet').setVisible(true); } @@ -5437,27 +5409,30 @@ materialArrHidden.push(top.Ext.getCmp(materiaItemsId).getValue()); } else { if (materiaItems[m].items.items[0].fieldLabel == "抽检器械" && m > 1) { - - materialInfos.push({ - "material": materialArrHidden[0], - "amount": materialArrHidden[1], - "position": materialArrHidden[2], - "order": materialArrHidden[3] - }) - materialArrHidden = []; + if (materialArrHidden[0] !== '') { + materialInfos.push({ + "material": materialArrHidden[0], + "amount": materialArrHidden[1], + "position": materialArrHidden[2], + "order": materialArrHidden[3] + }) + materialArrHidden = []; + } } materialArrHidden.push(materiaItems[m].items.items[0].el.dom.value); } } } - materialInfos.push({ - "material": materialArrHidden[0], - "amount": materialArrHidden[1], - "position": materialArrHidden[2], - "order": materialArrHidden[3] - }) - materialArrHidden = []; + if (materialArrHidden[0] !== '') { + materialInfos.push({ + "material": materialArrHidden[0], + "amount": materialArrHidden[1], + "position": materialArrHidden[2], + "order": materialArrHidden[3] + }) + materialArrHidden = []; + } tousseBagsList.materialInfos = materialInfos; tousseBags.push(tousseBagsList); @@ -5505,10 +5480,10 @@ } else {//器械包名称，器械包数量 var tousseBarcode = wrapper[j].items.items[0].el.dom.value; if (wrapper[j].items.items[0].fieldLabel == "器械包条码") { - //tousseBagsList.tousseBarcode = tousseBarcode;已经被清空了 + tousseBagsList.responsiblePerson = wrapper[j].items.items[1].el.dom.value; } else if (wrapper[j].items.items[0].fieldLabel == "器械包名称") { tousseBagsList.tousseName = tousseBarcode; - tousseBagsList.tousseDefinitionId = wrapper[j].items.items[1].el.dom.value; + tousseBagsList.tousseDefinitionId = wrapper[j].items.items[1] ? wrapper[j].items.items[1].el.dom.value : ''; } else if (wrapper[j].items.items[0].fieldLabel == "器械包数量") { tousseBagsList.tousseAmount = tousseBarcode; } @@ -5691,7 +5666,8 @@ var firstTousseBagsList = {}; if (top.Ext.getCmp("scope").getValue() == "材料和器械包" || top.Ext.getCmp("scope").getValue() == "器械包") { var tousseName = top.Ext.getCmp('tousseName').getRawValue(); - var barcode = top.Ext.getCmp('tempBarcode').getValue(); + var barcode = top.Ext.getCmp('hiddenTempBarcode').getValue(); + var responsiblePerson = top.Ext.getCmp('hiddenResponsiblePerson').getValue(); var tousseInstanceId = top.Ext.getCmp('tousseInstanceId').getValue(); var tousseDefinitionId = top.Ext.getCmp('tousseDefinitionId').getValue(); var amount = top.Ext.getCmp('tousseAmount').getValue(); @@ -5707,6 +5683,7 @@ firstTousseBagsList.tousseDefinitionId = tousseDefinitionId; firstTousseBagsList.tousseRecycle = isRecycle; firstTousseBagsList.tousseRePacking = isRepacking; + firstTousseBagsList.responsiblePerson = responsiblePerson; firstTousseBagsList.tousseReprint = (isReprint == '') ? '否' : isReprint; firstTousseBagsList.tousseDiscard = (isDiscard == '') ? '否' : isDiscard; firstTousseBagsList.order = 0; @@ -5996,7 +5973,11 @@ return; } } - top.Ext.getCmp(domId).setValue(result.fullName); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson('', result.fullName); + } else { + top.Ext.getCmp(domId).setValue(result.fullName); + } } else { showResultQM('找不到该条码所对应的人员信息'); } @@ -6192,8 +6173,11 @@ var amount = qualityMonitoringGoodsList[i].amount; var tousseDefinitionId = qualityMonitoringGoodsList[i].tousseDefinitionId; var isReprint = qualityMonitoringGoodsList[i].isReprint; + var responsiblePerson = qualityMonitoringGoodsList[i].responsiblePerson; top.Ext.getCmp('tousseInstanceId').setValue(tousseInstanceId); top.Ext.getCmp('tempBarcode').setValue(barcode); + top.Ext.getCmp('hiddenTempBarcode').setValue(barcode); + top.Ext.getCmp('hiddenResponsiblePerson').setValue(responsiblePerson); top.Ext.getCmp('tousseName').setValue(tousseName); top.Ext.getCmp('tousseAmount').setValue(amount); top.Ext.getCmp('tousseDefinitionId').setValue(tousseDefinitionId); @@ -6412,9 +6396,12 @@ var tousseInstanceId = qualityMonitoringGoodsList[i].tousseInstanceId; var tousseDefinitionId = qualityMonitoringGoodsList[i].tousseDefinitionId; var amount = qualityMonitoringGoodsList[i].amount; + var responsiblePerson = qualityMonitoringGoodsList[i].responsiblePerson; top.Ext.getCmp('tousseInstanceId').setValue(tousseInstanceId); top.Ext.getCmp('tousseDefinitionId').setValue(tousseDefinitionId); top.Ext.getCmp('tempBarcode').setValue(barcode); + top.Ext.getCmp('hiddenTempBarcode').setValue(barcode); + top.Ext.getCmp('hiddenResponsiblePerson').setValue(responsiblePerson); top.Ext.getCmp('tousseName').setValue(tousseName); top.Ext.getCmp('tousseAmount').setValue(amount); if ('是' == qualityMonitoringGoodsList[i].isRecycle) { @@ -7024,9 +7011,13 @@ top.Ext.getCmp('cleaningStartTime').setValue(record.startDate); top.Ext.getCmp('cleaningEndTime').setValue(record.endDate); top.Ext.getCmp('scanWashRecord_id').setValue(record.washRecordID); - top.Ext.getCmp('responsiblePerson').setValue(record.personInCharge); top.Ext.getCmp('tousseDefinitionId').setValue(record.tousseDefinitionId || ''); top.Ext.getCmp('tousseName').setValue(record.tousseName || ''); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson('', record.personInCharge); + } else { + top.Ext.getCmp('responsiblePerson').setValue(record.personInCharge); + } materialDefinitionStore.load() } } @@ -7539,6 +7530,13 @@ }]); } } + if (record.data.value == '是') { + top.Ext.getCmp('responsiblePerson').setValue(''); + } else { + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson(); + } + } } } }] @@ -7741,6 +7739,14 @@ } }, anchor: '95%' + }, { + xtype: 'hidden', + id: 'hiddenResponsiblePerson', + name: 'hiddenResponsiblePerson' + }, { + xtype: 'hidden', + id: 'hiddenTempBarcode', + name: 'hiddenTempBarcode' }] }, { layout: 'form', Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js =================================================================== diff -u -r37073 -r40493 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 37073) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 40493) @@ -151,7 +151,7 @@ // {header : "器械包名称",width : 120,dataIndex : 'tousseName'}, // {header : "材料名称",width : 120,dataIndex : 'material'}, // {header : "数量",width : 40,dataIndex : 'amount'}, - {header : "责任人",width : 60,dataIndex : 'responsiblePerson'}, + {header : "责任人",width : 130,dataIndex : 'responsiblePerson'}, {header : "登记时间",width : 120,dataIndex : 'createDate',renderer : myDateFormatByMinute}, {header : "灭菌炉",width : 120,dataIndex : 'sterilizerName'}, {header : "灭菌炉次",width : 120,dataIndex : 'sterilizerFrequency'},