Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r36856 -r36857 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 36856) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 36857) @@ -959,14 +959,15 @@ return false; } id = records[0].data['id']; - editRecord(id); + var isHasVerifier = records[0].data['isHasVerifier']; + editRecord(id,isHasVerifier); }; /* * "根据id查看入库单信息表" */ -function editRecord(id){ +function editRecord(id,isHasVerifier){ commonEntry.setId(id); - addGodownEntry(); + addGodownEntry(isHasVerifier); top.Ext.getCmp("serialNum").show(); top.Ext.getCmp('godownEntryForm').form.load({ url : WWWROOT + '/disinfectSystem/godownEntryAction!loadGodownEntry.do', @@ -1038,10 +1039,6 @@ top.Ext.getCmp("originalItems").setValue(originalItems); if(action.result.data.isHasVerifier == '是'){ top.Ext.getCmp("saveVerifier").hide(); - top.Ext.getCmp("supplyRoomVerifierBarcodeBox").hide(); - top.Ext.getCmp("supplyRoomVerifierBox").hide(); - top.Ext.getCmp("equipmentVerifierBarcodeBox").hide(); - top.Ext.getCmp("equipmentVerifierBox").hide(); } }, failure : function(form, action) { @@ -1059,7 +1056,7 @@ commonEntry.setSupplyRoomVerifier(data['supplyRoomVerifier']); commonEntry.setEquipmentVerifier(data['equipmentVerifier']); }; - editRecord(data['id']); + editRecord(data['id'],data['isHasVerifier']); } Ext.onReady(function() { Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js =================================================================== diff -u -r36856 -r36857 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js (.../godownEntryForm.js) (revision 36856) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js (.../godownEntryForm.js) (revision 36857) @@ -1,6 +1,6 @@ var selectModel = new top.Ext.grid.CheckboxSelectionModel(); //从入库单列表点添加或点击列表中某一行的单都会调用此function -function addGodownEntry() { +function addGodownEntry(isHasVerifier) { //根据配置获得注册证tbar var certificationTbar; //需要校验则为ComboBox @@ -212,15 +212,14 @@ columnWidth : .25, layout : 'form', labelWidth : 130, - id : 'supplyRoomVerifierBarcodeBox', items :[{ xtype : 'textfield', fieldLabel :'扫描供应室核对人条码', id : 'supplyRoomVerifierBarcode', name : 'supplyRoomVerifierBarcode', width : 100, enableKeyEvents : true, - disabled : commonEntry.hasSupplyRoomVerifier() ? true:false, + disabled : (commonEntry.hasSupplyRoomVerifier() || isHasVerifier == '是') ? true:false, listeners : { render : function(c) { c.getEl().on('keypress',function(e) { @@ -236,7 +235,6 @@ columnWidth : .25, layout : 'form', labelWidth : 80, - id : 'supplyRoomVerifierBox', items:[{ xtype : 'combo', fieldLabel : '供应室核对人', @@ -255,7 +253,7 @@ typeAhead : false, allowBlank : true, width : 100, - readOnly : commonEntry.hasSupplyRoomVerifier() ? true:false, + readOnly : (commonEntry.hasSupplyRoomVerifier() || isHasVerifier == '是') ? true:false, listeners : { select : function(combo, record, index) { top.Ext.getCmp('supplyRoomVerifier').setValue(record.data.name); @@ -273,15 +271,14 @@ columnWidth : .25, layout : 'form', labelWidth : 130, - id : 'equipmentVerifierBarcodeBox', items :[{ xtype : 'textfield', fieldLabel :'扫描设备科核对人条码', id : 'equipmentVerifierBarcode', name : 'equipmentVerifierBarcode', width : 100, enableKeyEvents : true, - disabled : commonEntry.hasEquipmentVerifier() ? true:false, + disabled : (commonEntry.hasEquipmentVerifier() || isHasVerifier == '是') ? true:false, listeners : { render : function(c) { c.getEl().on('keypress',function(e) { @@ -297,7 +294,6 @@ columnWidth : .25, layout : 'form', labelWidth : 80, - id : 'equipmentVerifierBox', items:[{ xtype : 'combo', fieldLabel : '设备科核对人', @@ -316,7 +312,7 @@ typeAhead : false, allowBlank : true, width : 100, - readOnly : commonEntry.hasEquipmentVerifier() ? true:false, + readOnly : (commonEntry.hasEquipmentVerifier() || isHasVerifier == '是') ? true:false, listeners : { select : function(combo, record, index) { top.Ext.getCmp('equipmentVerifier').setValue(record.data.name);