Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r16334 -r16369 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 16334) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 16369) @@ -419,6 +419,7 @@ displayField : 'result', triggerAction: 'all', allowBlank : false, + editable:false, store: isBigPackageStore }) },{ @@ -431,6 +432,7 @@ displayField : 'typeName', triggerAction: 'all', allowBlank : false, + editable:false, store: fToussePackageTypeStore }) }, { @@ -700,6 +702,20 @@ showResult("请扫描审核人条码!"); return false; } + var splitedTousseStore = top.Ext4.getCmp("splitedTousseGrid").getStore(); + var isHaveEmptyPackingType = false; + for ( var i = 0; i < splitedTousseStore.getCount(); i++) { + var record = splitedTousseStore.getAt(i); + var packageType = record.get("packingType"); + if(packageType == ""){ + isHaveEmptyPackingType = true; + break; + } + } + if(isHaveEmptyPackingType){ + showResult("有已拆分的器械包未设置包装类型!"); + return false; + } //验证失效期 var result = validateValidUntil(foreignTousseName,supplierName); if(result != ""){ @@ -893,8 +909,10 @@ if (sstsConfig.printLabelWhenReviewing == true){ var reviewer2 = top.Ext4.getCmp("reviewer2"); + reviewer2.disable(); + reviewer2.hide(); var reviewerBarcode2 = top.Ext4.getCmp("reviewerBarcode2"); - hideField(reviewer2); - hideField(reviewerBarcode2); + reviewerBarcode2.disable(); + reviewerBarcode2.hide(); } }