Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js =================================================================== diff -u -r23501 -r23516 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js (.../supplierForm.js) (revision 23501) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js (.../supplierForm.js) (revision 23516) @@ -245,6 +245,10 @@ var supplierTypeRecord = Ext.data.Record.create([{name : 'type'}]); var supplierTypeStore = new top.Ext.data.Store({ }); + supplierTypeStore.add(new supplierTypeRecord({type : madeCompany})); + supplierTypeStore.add(new supplierTypeRecord({type : supplier})); + supplierTypeStore.add(new supplierTypeRecord({type : renttousse})); + supplierTypeStore.add(new supplierTypeRecord({type : expensivegoodssupplier})); //根据是否是生产厂家与供应商,来调整证件的显示窗口 function adjustCertificate(isManufacturer, isSupplier){ @@ -1188,6 +1192,7 @@ layout : 'form', columnWidth : 0.5, labelWidth : 90, + hidden : !needCertificate, items : [ { xtype : 'combo', width : 130, @@ -1217,6 +1222,7 @@ layout : 'form', columnWidth : 0.5, labelWidth : 90, + hidden : !needCertificate, items : [ { xtype : 'combo', width : 130, @@ -1360,7 +1366,9 @@ top.Ext.getCmp('supplierWin').setSize(480,500); if(id == 0){ - adjustCertificate(false, true); + if(needCertificate){ + adjustCertificate(false, true); + } return ; } formObj.form @@ -1402,12 +1410,14 @@ } top.Ext.getCmp('userNames').setValue(action.result.data.userNames); } - adjustCertificate(action.result.data.isManufacturer, action.result.data.isSupplier); - - var certificates = action.result.certificates; - if(!isUndefinedOrNullOrEmpty(certificates)){ - fillCertificateStores(certificates, action.result.data.isManufacturer, action.result.data.isSupplier); + if(needCertificate){ + adjustCertificate(action.result.data.isManufacturer, action.result.data.isSupplier); + var certificates = action.result.certificates; + if(!isUndefinedOrNullOrEmpty(certificates)){ + fillCertificateStores(certificates, action.result.data.isManufacturer, action.result.data.isSupplier); + } } + }, failure : function(form, action) { }, @@ -1676,8 +1686,14 @@ showResult("允许申请人不能选择超过300个!"); return; } - - var certificates = getAllCertificatesInfo(); + if(needCertificate){ + var certificates = getAllCertificatesInfo(); + }else{ +// top.Ext.getCmp('isManufacturer').setValue(false); + top.Ext.getCmp('isManufacturer').setRawValue("否"); +// top.Ext.getCmp('isSupplier').setValue(false); + top.Ext.getCmp('isSupplier').setRawValue("否"); + } Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/baseData/supplierAction!validate.do', Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.jsp =================================================================== diff -u -r23501 -r23516 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.jsp (.../supplierView.jsp) (revision 23501) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.jsp (.../supplierView.jsp) (revision 23516) @@ -1,5 +1,6 @@ <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Certificate"%> +<%@ page import="com.forgon.disinfectsystem.common.CssdUtils" %> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> @@ -13,6 +14,11 @@ <%@ include file="/common/include_Ext42_Js.jsp"%> + +<% + String project = CssdUtils.getConfigProperty("project"); + session.setAttribute("profile", project); +%> @@ -24,6 +30,7 @@ + @@ -77,6 +84,11 @@ var warningStatus = '<%=request.getParameter("warningStatus")%>'; +var needCertificate = false; +if(sstsConfig.hasOwnProperty('enableDisposableGoodsCertificateManager') && sstsConfig.enableDisposableGoodsCertificateManager){ + needCertificate = true; +} +