Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r25704 -r26122 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 25704) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 26122) @@ -228,7 +228,6 @@ function loadReviewerByBarcode(barcodeField,elementName,elementCode){ var nameTextfieldObj = top.Ext4.getCmp(elementName); var codeTextfieldObj = top.Ext4.getCmp(elementCode); - var peopleOfBarcode = barcodeField.getValue(); if(peopleOfBarcode){ UserTableManager.getUserByBarcode(peopleOfBarcode,function(responseText){ @@ -245,8 +244,16 @@ }else if(elementName == "reviewer2"){ if(top.Ext4.getCmp('wrapperBarcode2').isVisible()){ top.Ext4.getCmp('wrapperBarcode2').focus('', 10); + }else if(top.Ext4.getCmp('inspectorBarcode2').isVisible()){ + top.Ext4.getCmp('inspectorBarcode2').focus('', 10); } jobType_review_name = nameTextfieldObj.getValue(); + }else if(elementName == "sterileUser2"){ + if(top.Ext4.getCmp('inspectorBarcode2').isVisible()){ + top.Ext4.getCmp('inspectorBarcode2').focus('', 10); + } + }else if(elementName == "inspector2"){ + jobType_inspector_name = nameTextfieldObj.getValue(); } } }else{ @@ -256,7 +263,7 @@ } }); } - barcodeField.setValue(""); + barcodeField.setValue(""); } var cameraPhotos = []; @@ -527,6 +534,11 @@ name : 'sterileCode', value : sterileUserCode },{ + xtype : 'hidden', + id : 'inspectorCode2', + name : 'inspectorCode2', + value : inspectorCode + },{ xtype:'hidden', id : 'foreignToussePackageType', name : 'foreignToussePackageType', @@ -600,7 +612,7 @@ xtype : 'textfield', columnWidth : .33, labelWidth : 70, - hidden: !sstsConfig.showWrapperField, + hidden:!sstsConfig.showWrapperField, fieldLabel : "包装人条码", name : "wrapperBarcode2", id : "wrapperBarcode2", @@ -662,6 +674,39 @@ anchor : '80%', value : jobType_sterile_name, readOnly: true + },{ + xtype : 'textfield', + columnWidth : .33, + labelWidth : 70, + hidden :!sstsConfig.ShowSplitForeignTousseViewInspector, + fieldLabel : "检查人条码", + name : "inspectorBarcode2", + id : "inspectorBarcode2", + labelAlign:'right', + margin :'5 0 0 0', + allowBlank : true, + listeners : { + specialkey : function(thiz, e){ + if(e.getKey() == 13){ + loadReviewerByBarcode(thiz,"inspector2","inspectorCode2"); + } + } + }, + anchor : '80%' + },{ + xtype : 'textfield', + columnWidth : .33, + labelWidth : 70, + hidden : !sstsConfig.ShowSplitForeignTousseViewInspector, + fieldLabel : "检查人", + name : "inspector2", + id : "inspector2", + labelAlign:'right', + margin :'5 0 0 0', + allowBlank : true, + anchor : '80%', + value : jobType_inspector_name, + readOnly: true }, { xtype : "combo", columnWidth : .33, @@ -823,15 +868,15 @@ id : 'foreignTousseWin', title : '['+showName + ']拆分', width : 850, - height: 630, + height: 670, resizable :false, modal : true, border : false, plain : true, layout : 'border', items : [{ region : 'north', - height : 150, + height : 190, layout : 'fit', items : [foreignToussePanel] }, { @@ -1103,6 +1148,8 @@ sterileUserCode = top.Ext4.getCmp('sterileCode2').getValue(); wrapper = top.Ext4.getCmp('wrapper2').getValue(); wrapperCode = top.Ext4.getCmp('wrapperCode2').getValue(); + inspector = top.Ext4.getCmp('inspector2').getValue(); + inspectorCode = top.Ext4.getCmp('inspectorCode2').getValue(); var packageType = ""; var sterilingType = top.Ext4.getCmp('sterilingType2').getValue(); var stock = ""; @@ -1119,8 +1166,8 @@ var params = { taskIds: ids, - inspector: '', - inspectorCode: '', + inspector: inspector, + inspectorCode: inspectorCode, operator: operator, operatorCode: operatorCode, reviewer: reviewer, Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js =================================================================== diff -u -r26012 -r26122 --- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 26012) +++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 26122) @@ -201,5 +201,8 @@ //是否启用清点确认按钮 (true为启用,false或者不配置都不启用) enbaleCheckToConfirm:true, //是否按包显示消毒物品,默认false按材料统计.true:按包统计,不统计非整包申请的消毒物品 - showDisinfectionByPackage : false + showDisinfectionByPackage : false, + //外来器械包拆包显示检查人字段,true显示,false不显示 + ShowSplitForeignTousseViewInspector:true + } \ No newline at end of file