Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r15654 -r15876 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 15654) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 15876) @@ -211,12 +211,12 @@ showResult("请填写失效日期!"); return false; } - - if(top.Ext.getCmp('supplier1').getValue() == null || top.Ext.getCmp('supplier1').getValue() == ''){ + + if(!sstsConfig.notValidateSupply && (top.Ext.getCmp('supplier1').getValue() == null || top.Ext.getCmp('supplier1').getValue() == '') ){ showResult("请填写供应商!"); return false; } - + for(var i = 0;i < top.Ext.getCmp('godownEntryItemGrid').getStore().getCount();i++){ if(top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.disposableGoodsID == disposableGoodsID && top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.batchNumber == batchNumber){ showResult("该物品已经存在,不能重复添加!"); Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js =================================================================== diff -u -r15807 -r15876 --- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js (.../config.js) (revision 15807) +++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js (.../config.js) (revision 15876) @@ -69,5 +69,7 @@ //按照时间查询格式 timeSearchFmt : 'Y-m-d H:i', //是否显示按照时间查询 - showTimeSearch : true + showTimeSearch : true, + // 是否不校验供应商 + notValidateSupply : true } \ No newline at end of file