diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index 38d042fed..6bd2f770d 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -31,13 +31,6 @@
if("01".equals(customerType)){
doTemp.setVisible("SEX",false);//如果是法人客户隐藏性别字段
}
- if(("业务申请流程".equals(flowName)&&"ANYBACK".equals(flowstate))&&("0010".equals(phaseNo)||"0020".equals(phaseNo))){
- doTemp.setVisible("InterOpinion1",false);
- doTemp.setVisible("InterOpinion2",false);
- doTemp.setVisible("DistriOpinion2",false);
- doTemp.setVisible("InterOpinion3",false);
- doTemp.setReadOnly("DistriOpinion1",true);//设置所有字段都只读。
- }
doTemp.setHtmlEvent("firstchoice","onChange","changeFirstChoice");
doTemp.setHtmlEvent("secondchoice","onChange","changeSecondChoice");
doTemp.setHtmlEvent("thirdchoice","onChange","changeThirdChoice");
@@ -63,8 +56,8 @@
dwTemp.getDataObject().setVisible("secondopinion", true);
dwTemp.getDataObject().setReadOnly("secondchoice", true);
dwTemp.getDataObject().setReadOnly("secondopinion", true);
- dwTemp.getDataObject().setVisible("InterOpinion2", true);
- dwTemp.getDataObject().setReadOnly("InterOpinion2", true);
+// dwTemp.getDataObject().setVisible("InterOpinion2", true);
+// dwTemp.getDataObject().setReadOnly("InterOpinion2", true);
dwTemp.setGroupHidden("0040,0050");
}
}else if("0040".equals(phaseNo)){//复审
@@ -82,8 +75,8 @@
dwTemp.getDataObject().setVisible("thirdopinion", true);
dwTemp.getDataObject().setReadOnly("thirdchoice", true);
dwTemp.getDataObject().setReadOnly("thirdopinion", true);
- dwTemp.getDataObject().setVisible("INTEROPINION3", true);
- dwTemp.getDataObject().setReadOnly("INTEROPINION3", true);
+// dwTemp.getDataObject().setVisible("INTEROPINION3", true);
+// dwTemp.getDataObject().setReadOnly("INTEROPINION3", true);
dwTemp.setGroupHidden("0050");
}
if(CurUser.hasRole("401")){
@@ -112,10 +105,10 @@
dwTemp.getDataObject().setVisible("secondopinion", false);
dwTemp.getDataObject().setVisible("thirdchoice", false);
dwTemp.getDataObject().setVisible("thirdopinion", false);
- dwTemp.getDataObject().setVisible("INTEROPINION2", false);
- dwTemp.getDataObject().setVisible("DISTRIOPINION2", false);
- dwTemp.getDataObject().setVisible("INTEROPINION3", false);
- dwTemp.getDataObject().setVisible("DISTRIOPINION3", false);
+// dwTemp.getDataObject().setVisible("INTEROPINION2", false);
+// dwTemp.getDataObject().setVisible("DISTRIOPINION2", false);
+// dwTemp.getDataObject().setVisible("INTEROPINION3", false);
+// dwTemp.getDataObject().setVisible("DISTRIOPINION3", false);
dwTemp.setGroupHidden("0030,0040,0050");
}
@@ -179,8 +172,8 @@
$("#FIRSTCHOICE").attr("disabled","disabled");//初审意见
$("#FIRSTOPINION").attr("disabled","disabled");//审批意见
- $("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
- $("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
+// $("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
+// $("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
if("BACK"=="<%=flowstate%>"||"ANYBACK"=="<%=flowstate%>"){
$("#A_div_1250").attr("style","display:block;");
$("#A_div_1260").attr("style","display:block;");
@@ -205,12 +198,12 @@
$("#FIRSTCHOICE").attr("disabled","disabled");//初审意见
$("#FIRSTOPINION").attr("disabled","disabled");//审批意见
- $("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
- $("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
+// $("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
+// $("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
$("#SECONDCHOICE").attr("disabled","disabled");//复审意见
$("#SECONDOPINION").attr("disabled","disabled");//审批意见
- $("#INTEROPINION2").attr("disabled","disabled");//复审内部意见
- $("#DISTRIOPINION2").attr("disabled","disabled");//复审经销商意见
+// $("#INTEROPINION2").attr("disabled","disabled");//复审内部意见
+// $("#DISTRIOPINION2").attr("disabled","disabled");//复审经销商意见
if("true"=="<%=ishistory%>"&&<%=CurUser.hasRole("401")%>){
$("#A_div_1130").attr("style","display:none;");
$("#A_div_1140").attr("style","display:none;");
@@ -237,12 +230,12 @@
$("#FIRSTCHOICE").attr("disabled","disabled");//初审意见
$("#FIRSTOPINION").attr("disabled","disabled");//审批意见
- $("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
- $("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
+// $("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
+// $("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
$("#SECONDCHOICE").attr("disabled","disabled");//复审意见
$("#SECONDOPINION").attr("disabled","disabled");//审批意见
- $("#INTEROPINION2").attr("disabled","disabled");//复审内部意见
- $("#DISTRIOPINION2").attr("disabled","disabled");//复审经销商意见
+// $("#INTEROPINION2").attr("disabled","disabled");//复审内部意见
+// $("#DISTRIOPINION2").attr("disabled","disabled");//复审经销商意见
if("BACK"=="<%=flowstate%>"||"ANYBACK"=="<%=flowstate%>"){
$("#A_div_1130").attr("style","display:none;");
$("#A_div_1140").attr("style","display:none;");
@@ -272,14 +265,14 @@
}
var firstchoice = getItemValue(0,0,"firstchoice");
if(firstchoice==""){
- setItemRequired(0,"InterOpinion1",false);
- setItemRequired(0,"DistriOpinion1",false);
+// setItemRequired(0,"InterOpinion1",false);
+// setItemRequired(0,"DistriOpinion1",false);
$("#FIRSTOPINION").attr("disabled","");
}
if(firstchoice=="0010"){
setItemRequired(0,"A_div_1220",true);
- setItemRequired(0,"InterOpinion1",false);
- setItemRequired(0,"DistriOpinion1",true);
+// setItemRequired(0,"InterOpinion1",false);
+// setItemRequired(0,"DistriOpinion1",true);
$("#FIRSTOPINION").attr("disabled","");
var obj=document.getElementById('FIRSTOPINION');
for(var i=0;i<7;i++){
@@ -288,8 +281,8 @@
obj.options[7].style.display = "none";
}
if(firstchoice=="0030"){
- setItemRequired(0,"InterOpinion1",true);
- setItemRequired(0,"DistriOpinion1",false);
+// setItemRequired(0,"InterOpinion1",true);
+// setItemRequired(0,"DistriOpinion1",false);
$("#FIRSTOPINION").attr("disabled","");
var obj=document.getElementById('FIRSTOPINION');
for(var i=0;i<7;i++){
@@ -298,8 +291,8 @@
obj.options[7].style.display = "block";
}
if(firstchoice=="0040"){
- setItemRequired(0,"InterOpinion1",false);
- setItemRequired(0,"DistriOpinion1",true);
+// setItemRequired(0,"InterOpinion1",false);
+// setItemRequired(0,"DistriOpinion1",true);
setItemValue(0,0,"firstopinion","");
$("#FIRSTOPINION").attr("disabled","disabled");
}
@@ -320,14 +313,14 @@
var firstchoice = getItemValue(0,0,"firstchoice");
var attribute1="";
if(firstchoice==""){
- setItemRequired(0,"InterOpinion1",false);
- setItemRequired(0,"DistriOpinion1",false);
+// setItemRequired(0,"InterOpinion1",false);
+// setItemRequired(0,"DistriOpinion1",false);
$("#FIRSTOPINION").removeAttr("disabled");
}
if(firstchoice=="0010"){
setItemRequired(0,"A_div_1220",true);
- setItemRequired(0,"InterOpinion1",true);
- setItemRequired(0,"DistriOpinion1",false);
+// setItemRequired(0,"InterOpinion1",true);
+// setItemRequired(0,"DistriOpinion1",false);
setItemRequired(0,"FIRSTOPINION",true);
$("#FIRSTOPINION").removeAttr("disabled");
/* var obj=document.getElementById('FIRSTOPINION');
@@ -338,8 +331,8 @@
attribute1="1";
}
if(firstchoice=="0020"){
- setItemRequired(0,"InterOpinion1",true);
- setItemRequired(0,"DistriOpinion1",false);
+// setItemRequired(0,"InterOpinion1",true);
+// setItemRequired(0,"DistriOpinion1",false);
setItemRequired(0,"FIRSTOPINION",true);
$("#FIRSTOPINION").removeAttr("disabled");
/* var obj=document.getElementById('FIRSTOPINION');
@@ -350,16 +343,16 @@
attribute1="2";
}
if(firstchoice=="0030"){
- setItemRequired(0,"InterOpinion1",true);
- setItemRequired(0,"DistriOpinion1",false);
+// setItemRequired(0,"InterOpinion1",true);
+// setItemRequired(0,"DistriOpinion1",false);
setItemRequired(0,"FIRSTOPINION",false);
setItemValue(0,0,"firstopinion","");
$("#FIRSTOPINION").attr("disabled","disabled");
attribute1="";
}
if(firstchoice=="0040"){
- setItemRequired(0,"InterOpinion1",false);
- setItemRequired(0,"DistriOpinion1",true);
+// setItemRequired(0,"InterOpinion1",false);
+// setItemRequired(0,"DistriOpinion1",true);
setItemRequired(0,"FIRSTOPINION",false);
setItemValue(0,0,"firstopinion","");
$("#FIRSTOPINION").attr("disabled","disabled");
@@ -539,14 +532,14 @@
phaseChoice = getItemValue(0,0,"fourchoice");
phaseOpinion = getItemValue(0,0,"fouropinion");
}
- var InterOpinion1 = getItemValue(0,0,"InterOpinion1");
- var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1");
- var InterOpinion2 = getItemValue(0,0,"InterOpinion2");
- var DistriOpinion2 = getItemValue(0,0,"DistriOpinion2");
- var InterOpinion3 = getItemValue(0,0,"InterOpinion3");
- var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3");
+// var InterOpinion1 = getItemValue(0,0,"InterOpinion1");
+// var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1");
+// var InterOpinion2 = getItemValue(0,0,"InterOpinion2");
+// var DistriOpinion2 = getItemValue(0,0,"DistriOpinion2");
+// var InterOpinion3 = getItemValue(0,0,"InterOpinion3");
+// var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3");
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveApproveOpinion",
- "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",InterOpinion1="+InterOpinion1+",DistriOpinion1="+DistriOpinion1+",InterOpinion2="+InterOpinion2+",DistriOpinion2="+DistriOpinion2+",InterOpinion3="+InterOpinion3+",DistriOpinion3="+DistriOpinion3+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
+ "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
if("SUCCESS" == sResult){
resetDWDialog("保存成功!",true);
reloadSelf();
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
index 5113fefb4..2db3c0922 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
@@ -226,10 +226,14 @@
return;
}else{ */
var flowunid = getItemValue(0,0,"flowunid");
+ var customerid = getItemValue(0,0,"customerid");
if(null==flowunid||""==flowunid){
setItemValue(0, 0, "flowunid", "<%=FlowUnid%>");
setItemValue(0, 0, "Partner_", "Y");
}
+ if(null==customerid||""==customerid){
+ setItemValue(0, 0, "customerid","<%=customerid%>");
+ }
as_save(0);
// }
}
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 5ec0f75ac..84aaaba7b 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -4506,6 +4506,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml
index 2b1b18be0..f0aa119cb 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml
@@ -2254,5 +2254,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/fileTemplate/鐩存帴鎵f鎺堟潈濮旀墭涔.docx b/WebContent/fileTemplate/鐩存帴鎵f鎺堟潈濮旀墭涔.docx
index 5d4e06590..cec319ba0 100644
Binary files a/WebContent/fileTemplate/鐩存帴鎵f鎺堟潈濮旀墭涔.docx and b/WebContent/fileTemplate/鐩存帴鎵f鎺堟潈濮旀墭涔.docx differ
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
index 95fc77cb7..dbfe7e1b5 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
@@ -4,6 +4,7 @@ import jbo.app.LB_EQUIPMENT_CAR;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
import jbo.sys.CAR_PLATENUMBER_CODE;
import jbo.sys.FLOW_OPINION;
+import jbo.sys.FLOW_OPINION_BUSINESS;
import jbo.sys.FLOW_TASK;
import com.amarsoft.are.jbo.BizObject;
@@ -147,7 +148,7 @@ public class BusinessApproveManager {
BizObjectManager bomFT = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,tx);
BizObject boFT = bomFT.createQuery("objectno=:flowunid and phaseno=:phaseNo and relativeobjectno is not null")
.setParameter("flowunid", flowunid).setParameter("phaseNo", phaseNo).getSingleResult(true);
- BizObjectManager bomFO = JBOFactory.getBizObjectManager(FLOW_OPINION.CLASS_NAME,tx);
+ BizObjectManager bomFO = JBOFactory.getBizObjectManager(FLOW_OPINION_BUSINESS.CLASS_NAME,tx);
BizObject bo = bomFO.createQuery("serialno='"+serialNo+"'").getSingleResult(true);
if(boFT != null){
boFT.setAttributeValue("relativeobjectno", null);
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
index c7904250b..03caf8e81 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
@@ -281,7 +281,7 @@ public class CustomerInfoManage {
public String saveCustomerFamily(JBOTransaction tx){
try{
BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME,tx);
- BizObject bo = bom.createQuery("flowunid=:flowunid and customerid=:customerid").setParameter("flowunid", flowunid).setParameter("customerid", customerid).getSingleResult(true);
+ BizObject bo = bom.createQuery("flowunid=:flowunid and customerid=:customerid and Spouse_='Y' ").setParameter("flowunid", flowunid).setParameter("customerid", customerid).getSingleResult(true);
if(bo != null){
bo.setAttributeValue("certid", certid);
bo.setAttributeValue("name", name);