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

1.租金红冲流程汽车和传统区分开，并增加权限

Browse Source
This commit is contained in:
zhangbb 2018-10-10 22:10:04 +08:00
parent 4d55f74333
commit 0af7b983aa
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>

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("@");