Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r14769 -r14898 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 14769) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 14898) @@ -90,5 +90,7 @@ //隐藏外部代理灭菌的部分元素(页面属性),为true时部分隐藏,未配置或配置为其它值时与原来保持一致 hiddenForeignProxyPartElement : true, //是否显示包实例科室(待灭菌与待灭菌装载的表格) - showDepartOfTousseInstanceSterile : true + showDepartOfTousseInstanceSterile : true, + //是否显示默认配包者(外来器械拆分小包界面) + isShowDefaultPackerOfSplitForeignTousse : false } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r14766 -r14898 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 14766) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 14898) @@ -301,7 +301,10 @@ } } -function loadReviewerByBarcode(barcodeField){ +function loadReviewerByBarcode(barcodeField,elementName,elementCode){ + var nameTextfieldObj = top.Ext.getCmp(elementName); + var codeTextfieldObj = top.Ext.getCmp(elementCode); + var peopleOfBarcode = barcodeField.getValue(); if(peopleOfBarcode){ UserTableManager.getUserByBarcode(peopleOfBarcode,function(responseText){ @@ -311,21 +314,28 @@ showResult("输入的条码有误!"); return; }else{ - top.Ext.getCmp('reviewer2').setValue(result.fullName); - top.Ext.getCmp('reviewerCode2').setValue(result.name); + nameTextfieldObj.setValue(result.fullName); + codeTextfieldObj.setValue(result.name); + if(elementName == "operator2"){ + top.Ext.getCmp('reviewerBarcode2').focus('', 10); + } } }else{ + codeTextfieldObj.setValue(""); + nameTextfieldObj.setValue(""); showResult('找不到该条码所对应的人员信息'); - top.Ext.getCmp('reviewer2').setValue(); } }); } - barcodeField.setValue(); + barcodeField.setValue(""); } function splitForeignTousse(packTaskId,foreignTousseName,showName,applicationid,thizAmount,supplierName,basketBarcode){ //器械报基础信息 tempforeignTousseName = showName; + + var isShowDefaultPackerOfSplitForeignTousse = getBoolValueFromJs("sstsConfig.isShowDefaultPackerOfSplitForeignTousse",true); + splitforeignPanel = new top.Ext.form.FormPanel( { labelAlign : 'right', buttonAlign : 'center', @@ -354,7 +364,7 @@ xtype : 'hidden', id : 'operatorCode2', name : 'operatorCode', - value : $Id('userLoginName').value + value : (isShowDefaultPackerOfSplitForeignTousse ? $Id('userLoginName').value : "") },{ xtype : 'hidden', id : 'reviewerCode2', @@ -366,11 +376,31 @@ labelWidth : 70, items : [{ xtype : 'textfield', + fieldLabel : "配包人条码", + name : "packerBarcode", + id : "packerBarcode2", + allowBlank : true, + listeners : { + specialkey : function(thiz, e){ + if(e.getKey() == 13){ + loadReviewerByBarcode(thiz,"operator2","operatorCode2"); + } + } + }, + anchor : '80%' +// allowBlank :false + }] + },{ + columnWidth : .33, + layout : 'form', + labelWidth : 70, + items : [{ + xtype : 'textfield', fieldLabel : '配包人', maxLength : '16', id : 'operator2', name : 'operator', - value : $Id('userName').value, + value : (isShowDefaultPackerOfSplitForeignTousse ? $Id('userName').value : ""), allowBlank : false, readOnly : true, anchor : '80%' @@ -388,12 +418,11 @@ listeners : { specialkey : function(thiz, e){ if(e.getKey() == 13){ - loadReviewerByBarcode(thiz); + loadReviewerByBarcode(thiz,"reviewer2","reviewerCode2"); } } }, anchor : '80%' -// allowBlank :false }] },{ columnWidth : .33, @@ -491,6 +520,12 @@ text : packingBtnText, handler : function() { + if (!splitforeignPanel.form.isValid()) { + showResult('请正确填写表单各值'); + this.enable(); + return false; + } + packingToussesArray = []; // 清除所装配的器械包数组 var v = leftMaterialStore.getCount(); @@ -504,11 +539,6 @@ return false; } - if (!splitforeignPanel.form.isValid()) { - showResult('请正确填写表单各值'); - this.enable(); - return false; - } top.Ext.getCmp('taskGroup2').setValue(taskGroup); var ids = packTaskId; if(ids == ""){