Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r36456 -r36458 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36456) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36458) @@ -14,16 +14,16 @@ //XJJQZYY-120:配置项改进为可配置为必填、选填 //检查人 var showInspectorField = false; -var inspectorFieldAllowBlank = false; +var inspectorFieldAllowBlank = true; //审核人 var showReviewerField = false; -var reviewerFieldAllowBlank = false; +var reviewerFieldAllowBlank = true; //包装人 var showWrapperField = false; -var wrapperFieldAllowBlank = false; +var wrapperFieldAllowBlank = true; //灭菌人 var showSterileField = false; -var sterileFieldAllowBlank = false; +var sterileFieldAllowBlank = true; var packingToussesArray = []; // 装配的器械包数组,用于Selenium自动化测试 var packedToussesArray = [];// 用于一次打印所有装配的包 @@ -622,46 +622,46 @@ //检查人 showInspectorField = false; - inspectorFieldAllowBlank = false; + inspectorFieldAllowBlank = true; if(sstsConfig.showInspectorField == true || sstsConfig.showInspectorField === 1 || sstsConfig.showInspectorField === 2){ showInspectorField = true; - if(sstsConfig.showInspectorField == 2){ - inspectorFieldAllowBlank = true; - }else { + if(sstsConfig.showInspectorField !== 2){ inspectorFieldAllowBlank = false; + }else { + inspectorFieldAllowBlank = true; } } //审核人 showReviewerField = false; - reviewerFieldAllowBlank = false; + reviewerFieldAllowBlank = true; if(!sstsConfig.hideReviewerField || sstsConfig.hideReviewerField === 1 || sstsConfig.hideReviewerField === 2){ showReviewerField = true; - if(sstsConfig.hideReviewerField == 2){ - reviewerFieldAllowBlank = true; - }else { + if(sstsConfig.hideReviewerField !== 2){ reviewerFieldAllowBlank = false; + }else { + reviewerFieldAllowBlank = true; } } //包装人 showWrapperField = false; - wrapperFieldAllowBlank = false; + wrapperFieldAllowBlank = true; if(sstsConfig.showWrapperField == true || sstsConfig.showWrapperField === 1 || sstsConfig.showWrapperField === 2){ showWrapperField = true; - if(sstsConfig.showWrapperField === 2){ - wrapperFieldAllowBlank = true; - }else { + if(sstsConfig.showWrapperField !== 2){ wrapperFieldAllowBlank = false; + }else { + wrapperFieldAllowBlank = true; } } //灭菌人 showSterileField = false; - sterileFieldAllowBlank = false; + sterileFieldAllowBlank = true; if(sstsConfig.showSterileField == true || sstsConfig.showSterileField === 1 || sstsConfig.showSterileField === 2){ showSterileField = true; - if(sstsConfig.showSterileField == 2){ - sterileFieldAllowBlank = true; - }else { + if(sstsConfig.showSterileField !== 2){ sterileFieldAllowBlank = false; + }else { + sterileFieldAllowBlank = true; } } Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r36454 -r36458 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 36454) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 36458) @@ -7,62 +7,62 @@ //XJJQZYY-120:配置项改进为可配置为必填、选填 //检查人 var showInspectorField = false; -var inspectorFieldAllowBlank = false; +var inspectorFieldAllowBlank = true; //审核人 var showReviewerField = false; -var reviewerFieldAllowBlank = false; +var reviewerFieldAllowBlank = true; //包装人 var showWrapperField = false; -var wrapperFieldAllowBlank = false; +var wrapperFieldAllowBlank = true; //灭菌人 var showSterileField = false; -var sterileFieldAllowBlank = false; +var sterileFieldAllowBlank = true; Ext.onReady(function() { Ext.QuickTips.init(); //检查人 showInspectorField = false; - inspectorFieldAllowBlank = false; + inspectorFieldAllowBlank = true; if(sstsConfig.showInspectorField == true || sstsConfig.showInspectorField === 1 || sstsConfig.showInspectorField === 2){ showInspectorField = true; - if(sstsConfig.showInspectorField == 2){ - inspectorFieldAllowBlank = true; - }else { + if(sstsConfig.showInspectorField !== 2){ inspectorFieldAllowBlank = false; + }else { + inspectorFieldAllowBlank = true; } } //审核人 showReviewerField = false; - reviewerFieldAllowBlank = false; + reviewerFieldAllowBlank = true; if(!sstsConfig.hideReviewerField || sstsConfig.hideReviewerField === 1 || sstsConfig.hideReviewerField === 2){ showReviewerField = true; - if(sstsConfig.hideReviewerField == 2){ - reviewerFieldAllowBlank = true; - }else { + if(sstsConfig.hideReviewerField !== 2){ reviewerFieldAllowBlank = false; + }else { + reviewerFieldAllowBlank = true; } } //包装人 showWrapperField = false; - wrapperFieldAllowBlank = false; + wrapperFieldAllowBlank = true; if(sstsConfig.showWrapperField == true || sstsConfig.showWrapperField === 1 || sstsConfig.showWrapperField === 2){ showWrapperField = true; - if(sstsConfig.showWrapperField === 2){ - wrapperFieldAllowBlank = true; - }else { + if(sstsConfig.showWrapperField !== 2){ wrapperFieldAllowBlank = false; + }else { + wrapperFieldAllowBlank = true; } } //灭菌人 showSterileField = false; - sterileFieldAllowBlank = false; + sterileFieldAllowBlank = true; if(sstsConfig.showSterileField == true || sstsConfig.showSterileField === 1 || sstsConfig.showSterileField === 2){ showSterileField = true; - if(sstsConfig.showSterileField == 2){ - sterileFieldAllowBlank = true; - }else { + if(sstsConfig.showSterileField !== 2){ sterileFieldAllowBlank = false; + }else { + sterileFieldAllowBlank = true; } }