diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPaymentKE.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPaymentKE.xml new file mode 100644 index 000000000..bef0b75ca --- /dev/null +++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPaymentKE.xml @@ -0,0 +1,203 @@ + + + + + + + + 0 + + ]]> + + + + + 0 + ]]> + + + dataSource + false + +
+
\ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index cb6551995..e47d28bf0 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -9,14 +9,23 @@ }) function newApply() - { var userid="<%=CurUser.getUserID()%>"; + { + var userid="<%=CurUser.getUserID()%>"; var flowno="<%=CurPage.getParameter("ApplyType")%>"; var selname=""; - var orgId="<%=CurUser.getOrgID()%>".substring(0,7); + var param="userid,"+userid; + var getorgid="<%=CurUser.getOrgID()%>"; + var orgId="<%=CurUser.getOrgID()%>".substring(0,7); var businessType=""; if(flowno=="BContractApproveApply"){ selname="SelectProjectForContract_Car"; businessType="1"; + //¿¨¶û + if(getorgid=="8006009"){ + selname="SelectProjectForContract_Car_KE"; + param="orgid,"+getorgid; + } + }else{ selname="SelectProjectForContract"; if(orgId=="8009010"){ @@ -28,7 +37,7 @@ return; } } - AsDialog.OpenSelector(selname,"userid,"+userid+",businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector(selname,param+",businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡ return; diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp index 335f98376..93c0b4d94 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp @@ -5,8 +5,17 @@ /*~[Describe=ÐÂÔö¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/ function newApply() { - var userid="<%=CurUser.getUserID()%>"; - AsDialog.OpenSelector("SelectContractCar","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + debugger; + var selname="SelectContractCar"; + var param="userid,"+userid; + var userid="<%=CurUser.getUserID()%>"; + var orgid="<%=CurUser.getOrgID()%>"; + //¿¨¶û + if(orgid=="8006009"){ + selname="SelectContractCar_KE"; + param="orgid,"+orgid; + } + AsDialog.OpenSelector(selname,param,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡ return; diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp index d011c6a28..7fcc55781 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp @@ -5,7 +5,15 @@ /*~[Describe=ÐÂÔö¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/ function newApply(){ var userid="<%=CurUser.getUserID()%>"; - AsDialog.OpenSelector("SelectContractPayment","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var orgid="<%=CurUser.getOrgID()%>"; + var selName="SelectContractPayment"; + var param="userid,"+userid; + //¿¨¶û + if(orgid=="8006009"){ + selName="SelectContractPayment_KE"; + param="orgid,"+orgid; + } + AsDialog.OpenSelector(selName,param,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ return; }