Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js =================================================================== diff -u -r15362 -r15367 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15362) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15367) @@ -224,6 +224,7 @@ type:'get', url:WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getBarcodeInfoForWash.do?time='+new Date()+'&barcode='+barcode+'', dataType:'json', + async : false, success:function(result){ var success = result.success; if(success){ @@ -382,8 +383,8 @@ function cleanPage(){ $("#basketsUl").empty(); - $("#disinfectIdentification").val(defaultDisinfectIdentification); - $("#disinfectProgram").val(defaultDisinfectProgram); + loadBarcodeDevice(defaultDisinfectIdentificationBarcode); + loadBarcodeDevice(defaultDisinfectProgramBarcode); $("#startDate").val(""); $("#endDate").val(""); } @@ -440,8 +441,8 @@ function initDate(){ document.onkeydown = showKeyDown; $("#operator").val(userName); - $("#disinfectIdentification").val(defaultDisinfectIdentification); - $("#disinfectProgram").val(defaultDisinfectProgram); + loadBarcodeDevice(defaultDisinfectIdentificationBarcode); + loadBarcodeDevice(defaultDisinfectProgramBarcode); $("#startDate").val(today); $("#endDate").val(today); } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js =================================================================== diff -u -r15362 -r15367 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 15362) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 15367) @@ -66,8 +66,8 @@ stRecordScanPosition : false, //装配界面显示灭菌员字段 showSterileField : true, - //触摸屏清洗默认清洗机 - defaultDisinfectIdentification : "", - //触摸屏清洗默认清洗程序 - defaultDisinfectProgram : "" + //触摸屏清洗默认清洗机条码 + defaultDisinfectIdentificationBarcode : "", + //触摸屏清洗默认清洗程序条码 + defaultDisinfectProgramBarcode : "" } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp =================================================================== diff -u -r15362 -r15367 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp (.../washForTouchScreen.jsp) (revision 15362) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp (.../washForTouchScreen.jsp) (revision 15367) @@ -65,8 +65,8 @@ var secondOrgUnitCoding = '<%=request.getAttribute("orgUnitCoding")%>'; var secondOrgUnitName = '<%=request.getAttribute("orgUnitName")%>'; var personInChargeAllowBlank = getBoolValueFromJs('sstsConfig.washAndDisinfectRecordPersonInChargeAllowBlank',true); -var defaultDisinfectIdentification = getStrValueFromJs('sstsConfig.defaultDisinfectIdentification',""); -var defaultDisinfectProgram = getStrValueFromJs('sstsConfig.defaultDisinfectProgram',""); +var defaultDisinfectIdentificationBarcode = getStrValueFromJs('sstsConfig.defaultDisinfectIdentificationBarcode',""); +var defaultDisinfectProgramBarcode = getStrValueFromJs('sstsConfig.defaultDisinfectProgramBarcode',""); document.write('');