Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r27682 -r27722 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 27682) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 27722) @@ -2669,7 +2669,6 @@ }, success : function(response, options) { var result = Ext.decode(response.responseText); - if(result.success){ var monitorTousseDisplay = result.data.monitorTousseDisplay; top.Ext.getCmp('monitorTousseDisplay').setValue(monitorTousseDisplay); @@ -3978,7 +3977,9 @@ // waitMsg : '正在加载数据,请稍候', timeout:90000, success : function(form, action) { - var sr = action.result.data; //此灭菌记录对象 + var sr = action.result.data; //此灭菌记录对象 + var monitorPackageBarcode = sr.monitorPackageBarcode || ''; + if(!id) { //新加的记录 setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'startDate'); //(设置开始时间,取服务器时间cjr) if(scanUser == true){ @@ -3997,6 +3998,11 @@ top.Ext.getCmp('startDate').setValue(formatDateYear(sr.startDate)); top.Ext.getCmp('endDate').setValue(formatDateYear(sr.endDate)); top.Ext.getCmp('srSituationComfirmer').setValue(sr.srSituationComfirmer); + + if(monitorPackageBarcode !== ''){ + top.Ext.getCmp('biologicalMonitoring').setValue("已扫描"); + top.Ext.getCmp('monitorPackageBarcode').setValue(monitorPackageBarcode); + } //加载条码放至全局数组中 var fixedBarcodes = action.result.fixedBarcodes Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r27681 -r27722 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 27681) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 27722) @@ -1104,34 +1104,90 @@ } } }]; + + var addWin; + + var formPanelCf = new Ext.form.FormPanel({ + autoWidth:true, + layout:"form", + frame:true, + labelWidth:260, + labelAlign:"left", + items:[{ + xtype:"label", + height : 20, + text :"请输入打印数量:", + style:'margin-bottom:0px;display: block;' + },{ + xtype : "textfield", + inputType : 'number', + hideLabel : true, + id:"printCount", + anchor : "95%", + height : 20, + regex: /^\+?[1-9]\d*$/, + regexText: '打印数量只能为正整数' + }] + }); + if (!addWin) { + addWin = new Ext.Window({ + title:"打印监测包条码", + modal:true, + width:300, + height:130, + collapsible:false, + resizable:false, + closeAction:'hide', + items : formPanelCf, + buttons : [{ + text : '确定', + handler : function(){ + var txt = Ext.getCmp('printCount').getValue(); + if(txt == null || txt == ''){ + showResult('请输入打印数量'); + }else{ + var str = new RegExp(/^\+?[1-9]\d*$/); + if(str.test(txt)){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!createBiologyMonitorTousseBarcodes.do', + params : { + amount : txt + }, + success : function(response, options) { + var result = Ext.decode(response.responseText); + var barcodes = []; + for(var i=0;i=0 && biologicalMonitoring == ''){ + showResult('当前灭菌记录需要扫描监测包条编码,否则不能提交保存。', null); + return; + }else if(monitorTousseDisplayArray.indexOf('每天第一炉') >=0 && frequency == 1 && biologicalMonitoring == ''){ + showResult('当前灭菌记录每天第一炉需要扫描监测包条编码,否则不能提交保存。', null); + return; + }else if(monitorTousseDisplayArray.indexOf('有植入物时') >=0 && implantAmount > 0 && biologicalMonitoring == ''){ + showResult('当前灭菌记录有植入物时需要扫描监测包条编码,否则不能提交保存。', null); + return; + }else if(monitorTousseDisplayArray.indexOf('有外来器械包时') >=0 && foreignTousseAmount > 0 && biologicalMonitoring == ''){ + showResult('当前灭菌记录有外来器械包时需要扫描监测包条编码,否则不能提交保存。', null); + return; + } + } + } if (!formObj.getForm().isValid()) { showResult('请正确填写表单各值'); return false;