anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-10-11 10:04:15 +08:00
commit 0e97e44c4a
10 changed files with 89 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
View File

@ -171,9 +171,14 @@
if(vUser.length==1&&type=="radio"){
$("input[name=phaseaction"+cindex+"]:first").attr("checked",true);
}
if((phase=="0010"&&flowNo=="FundPaymentCarFlow")||((phase=="0020"||phase=="0010")&&flowNo=="BusinessApplyFlow")){
/* if((phase=="0010"&&flowNo=="FundPaymentCarFlow")||((phase=="0020"||phase=="0010")&&flowNo=="BusinessApplyFlow")){
actionSet.hide();
} */
if(phase=="0010"&&(flowNo!="ProjectCreditFlow"&&flowNo!="ProjectRecreditFlow"&&flowNo!="Mortgage2FileFlow"&&flowNo!="ContractOnhireFlow"&&flowNo!="AdjustInterestFlow")){
actionSet.hide();
}
}
}else{
actionSet.html("");

7
WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp
View File

@ -63,12 +63,12 @@
<script type="text/javascript">
window.onload=function(){
var RowCount = getRowCount(0);
/* var RowCount = getRowCount(0);
for(var i=0;i<RowCount;i++){
if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="±Ø±¸"){
$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
}
}
} */
heping();
$("#DWTD").width( document.body.offsetWidth - 10);
@ -131,6 +131,9 @@ function afterSearch(){
}
getObj(0,i,"filelist").innerHTML=html;
getObj(0,i,"filelist").style["white-space"]="pre-wrap";
if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="±Ø±¸"){
$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
}
};
}
function showPDF(id,name){

2
WebContent/Tenwa/Comm/DocList/DocListMain.jsp
View File

@ -40,7 +40,7 @@
var docList="<%=docList%>";
myleft.width=1;
if("SingleRow"=="<%=type%>"){
if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"||"ProjectCancelFlow"=="<%=sFlowNo%>"||"Mortgage2FileFlow"=="<%=sFlowNo%>"){
if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"||"ProjectCancelFlow"=="<%=sFlowNo%>"||"Mortgage2FileFlow"=="<%=sFlowNo%>"||"ContractCancelFlow"=="<%=sFlowNo%>"||"ContractChangeFlow"=="<%=sFlowNo%>"){
AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
}else if("ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractApprovalFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"){
AsControl.OpenView("/Tenwa/Comm/DocList/PayDocListTradition.jsp","docList="+docList,"right","");

7
WebContent/Tenwa/Comm/DocList/PayDocList.jsp
View File

@ -100,12 +100,12 @@
<script type="text/javascript">
window.onload=function(){
var RowCount = getRowCount(0);
/* var RowCount = getRowCount(0);
for(var i=0;i<RowCount;i++){
if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="±Ø±¸"){
$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
}
}
} */
heping();
$("#DWTD").width( document.body.offsetWidth - 10);
@ -168,6 +168,9 @@ function afterSearch(){
}
getObj(0,i,"filelist").innerHTML=html;
getObj(0,i,"filelist").style["white-space"]="pre-wrap";
if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="±Ø±¸"){
$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
}
};
}
function showPDF(id,name){

7
WebContent/Tenwa/Comm/DocList/PayDocListTradition.jsp
View File

@ -73,12 +73,12 @@
<script type="text/javascript">
window.onload=function(){
var RowCount = getRowCount(0);
/* var RowCount = getRowCount(0);
for(var i=0;i<RowCount;i++){
if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="±Ø±¸"){
$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
}
}
} */
heping();
$("#DWTD").width( document.body.offsetWidth - 10);
@ -141,6 +141,9 @@ function afterSearch(){
}
getObj(0,i,"filelist").innerHTML=html;
getObj(0,i,"filelist").style["white-space"]="pre-wrap";
if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="±Ø±¸"){
$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
}
};
}
function showPDF(id,name){

2
WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectRentReback.xml
View File

@ -11,7 +11,7 @@
<![CDATA[
SELECT O.ID,O.CONTRACT_NUMBER,rentincome.PAYMENT_NUMBER,ifnull(rentincome.rent,'0.00') as rent ,ifnull(rentincome.penalty,'0.00') as penalty,O.PROJECT_NAME,lul.CUSTOMER_NAME, uinfo.username, getOrgName(O.PROJECT_DEPT) AS PROJECT_DEPT,O.PROJECT_ID,O.PRODUCT_ID FROM LB_CONTRACT_INFO O LEFT JOIN (SELECT CONTRACT_ID, PAYMENT_NUMBER,SUM(RENT) AS rent,SUM(PENALTY) AS penalty FROM LC_RENT_INCOME where roll_back<>'1' GROUP BY CONTRACT_ID,PAYMENT_NUMBER) rentincome ON rentincome.CONTRACT_ID = O.ID
LEFT JOIN LB_UNION_LESSEE lul ON O.ID = lul.CONTRACT_ID AND lul.IS_MAIN = 'Y'
LEFT JOIN user_info uinfo ON uinfo.userid = O.PROJECT_MANAGE WHERE (rentincome.rent>0 or rentincome.penalty >0) AND O.CONTRACT_STATUS<100 {O,contract} ORDER BY O.CONTRACT_NUMBER DESC
LEFT JOIN user_info uinfo ON uinfo.userid = O.PROJECT_MANAGE WHERE (rentincome.rent>0 or rentincome.penalty >0) AND O.CONTRACT_STATUS<100 and O.businesstype='#businessType' {O,contract} ORDER BY O.CONTRACT_NUMBER DESC
]]>
</table_sql>
</MYSQL>

8
WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
View File

@ -119,6 +119,9 @@
function changeRegisterInfo(){//客户状态为正式时注册信息必填，否则不必填
var status = getItemValue(0,getRow(),"status");
if(status == "status02"){
setItemRequired(0,"custkind",true);
setItemRequired(0,"COUNTRYTAXNO",true);
setItemRequired(0,"CERTID",true);
setItemRequired(0,"economytypename",true);
setItemRequired(0,"orgnaturename",true);
setItemRequired(0,"orgnaturecategoryname",true);
@ -131,6 +134,8 @@
setItemRequired(0,"establish_date",true);
setItemRequired(0,"licensematurity",true);
setItemRequired(0,"operationperiod",true);
setItemRequired(0,"custsource",true);
setItemRequired(0,"certtype",true);
}else{
setItemRequired(0,"economytypename",false);
@ -148,7 +153,8 @@
setItemRequired(0,"custsource",false);
setItemRequired(0,"certtype",false);
setItemRequired(0,"custkind",false);
setItemRequired(0,"CERTID",false);
setItemRequired(0,"COUNTRYTAXNO",false);
}
}

39
WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/Mortgage2FileApplyList.jsp Normal file
View File

@ -0,0 +1,39 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf"%>
<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=自定义函数;]~*/%>
<script type="text/javascript">
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newApply()
{
AsDialog.OpenSelector("SelectLbContractInfo","","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
//alert(getHtmlMessage('1'));//请选择一条信息！
return;
}
sReturn = sReturn.split("@");
var contract_id=sReturn[0];
var project_id=sReturn[1];
var product_id=sReturn[2];
var contract_number = sReturn[3];
var project_name = sReturn[4];
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams =sParams+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name;
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");
if(sReturnInfos[0]=="success")
{
var objectNo=sReturnInfos[1];
FlowFunction.openStartFlowPage(objectNo);
}
else
{
var mes=sReturnInfos[1];
alert(mes);
}
reloadSelf();
},"请选择发起合同");
}
</script>
<%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%>

2
WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/MortgageFileApplyList.jsp
View File

@ -6,7 +6,7 @@
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newApply()
{
AsDialog.OpenSelector("SelectLbContractInfo","","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
AsDialog.OpenSelector("SelectLbContractInfoQC","","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
//alert(getHtmlMessage('1'));//请选择一条信息！
return;

20
WebContent/Tenwa/Lease/Flow/Rent/RentReback/RentRebackApplyList.jsp
View File

@ -4,7 +4,25 @@
<script type="text/javascript">
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newApply(){
AsDialog.OpenSelector("SelectRentReback","","dialogWidth=" + parseInt(window.screen.width * 0.9) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
debugger;
var userid="<%=CurUser.getUserID()%>";
var flowno="<%=CurPage.getParameter("ApplyType")%>";
var selname="";
var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
var businessType="";
if(flowno=="RentRebackApply"){
businessType="1";
}else{
if(orgId=="8009010"){
businessType="2";
}else if(orgId=="8009011"){
businessType="3";
}else{
alert("当前用户不能发起申请！");
return;
}
}
AsDialog.OpenSelector("SelectRentReback","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.9) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
var info=sReturn||"";
if(info.length>0 && info.indexOf("_CANCEL_")<0){
sReturn = sReturn.split("@");