diff --git a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
index c4f774602..75971f348 100644
--- a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
@@ -1,3 +1,4 @@
+<%@page import="com.itextpdf.text.log.SysoCounter"%>
<%@page import="com.amarsoft.app.base.util.SystemHelper"%>
<%@page import="com.amarsoft.app.base.util.ObjectWindowHelper"%>
<%@page import="com.amarsoft.app.base.businessobject.*"%>
@@ -13,19 +14,32 @@
if("business_product".equals(productType2)) {
dwTemp.getDataObject().setVisible("LeasForm", false);
dwTemp.getDataObject().setVisible("equip_type", false);
- dwTemp.getDataObject().setVisible("IS_ALL_DEALER", false);
+ dwTemp.getDataObject().setVisible("IS_ALL_DEALER", false);
dwTemp.getDataObject().setVisible("IS_ALL_CAR", false);
dwTemp.getDataObject().setVisible("HaveCommission", false);
dwTemp.getDataObject().setVisible("payType", false);
- dwTemp.getDataObject().setRequired("LeasForm", false);
+ dwTemp.getDataObject().setVisible("signType", false);
+ dwTemp.getDataObject().setVisible("sealType", false);
+ dwTemp.getDataObject().setVisible("EarlySettleBreachRatio", false);
+ dwTemp.getDataObject().setVisible("operationType", false);
+
+ /* dwTemp.getDataObject().setRequired("LeasForm", false);
dwTemp.getDataObject().setRequired("equip_type", false);
dwTemp.getDataObject().setRequired("IS_ALL_DEALER", false);
dwTemp.getDataObject().setRequired("IS_ALL_CAR", false);
dwTemp.getDataObject().setRequired("HaveCommission", false);
- dwTemp.getDataObject().setRequired("payType", false);
+ dwTemp.getDataObject().setRequired("payType", false); */
+ String a = dwTemp.getDataObject().getColumnAttribute("payType", "COLREQUIRED");
+ System.out.println("================传统"+a);
+
+ }else{
+ dwTemp.getDataObject().setRequired("LeasForm,equip_type,IS_ALL_DEALER,IS_ALL_CAR,HaveCommission,payType", true);
+
+ String a = dwTemp.getDataObject().getColumnAttribute("payType", "COLREQUIRED");
+ System.out.println("================汽车"+a);
}
- ASDataObject doTemp=dwTemp.getDataObject();
+ ASDataObject doTemp=dwTemp.getDataObject();
//将ParaID作为参数传给显示模板
dwTemp.genHTMLObjectWindow("");
@@ -67,6 +81,7 @@ include file="/Frame/resources/include/ui/include_info.jspf"%>
// }
function openComponentDef(){
+
var serialNo = getItemValue(0,getRow(),"SerialNo");
var versionID = getItemValue(0,getRow(),"VERSIONID");
if(typeof(serialNo) != "undefined" && serialNo != "" && typeof(versionID) != "undefined" && versionID != "") {
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp
index 4af67a8af..cede83f7f 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp
@@ -45,13 +45,14 @@ $(function(){
if(relines<0){
$("#RELINES").css("color","red");
}
- var phaseNo="<%=phaseNo%>";
+ //安鹏要求改到产品配置中
+ <%-- var phaseNo="<%=phaseNo%>";
if(phaseNo=='0010'){
setItemReadOnly(0, 0, "LENDING_TYPE", true);
}else{
setItemReadOnly(0, 0, "LENDING_TYPE", false);
}
- lendingType();
+ lendingType(); --%>
});
function lendingType(){
var lendingType = getItemValue(0, 0, "LENDING_TYPE");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
index 7aec52319..8b05b1ae0 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
@@ -84,6 +84,7 @@
+
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java
index 746a9a79a..5542098bf 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java
@@ -5,6 +5,7 @@ import java.util.Map;
import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+import jbo.prd.PRD_SPECIFIC_LIBRARY;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
@@ -38,8 +39,13 @@ public class LBProjectIntoTempToContractCarBusiness extends BaseBussiness {
String distributor_id=bo.getAttribute("distributor_id").getString();
String carType = bo.getAttribute("car_type").getString();
String LENDING_TYPE = "";
- if("used_car".equals(carType)){LENDING_TYPE="AFTER";}
- if("new_car".equals(carType)){LENDING_TYPE="FIRST";}
+ BizObjectManager bmp = JBOFactory.getFactory().getManager(PRD_SPECIFIC_LIBRARY.CLASS_NAME);
+ BizObject bop = bmp.createQuery("productid=:productid").setParameter(productid, productid).getSingleResult(false);
+ if(bop.getAttribute("LENDING_TYPE")!=null){
+ LENDING_TYPE = bop.getAttribute("LENDING_TYPE").getString();
+ };
+ // if("used_car".equals(carType)){LENDING_TYPE="AFTER";}
+ // if("new_car".equals(carType)){LENDING_TYPE="FIRST";}
//String area_code=bo.getAttribute("AREA_CODE").getString();
String dept="";
if(deptid.equals("8000900020001")){//cx