From 13a78be8d6bbae02749986f316f907140dc553d0 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 13 Sep 2018 19:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectContractOnhireWithDeduction.xml | 2 +- .../SelectContractOnhireWithReturn.xml | 2 +- .../SelectTraditionContractPayment.xml | 2 +- .../TraditionContractFileList.jsp | 11 ++++++++--- .../ContractApprovalApplyList.jsp | 13 ++++++++++++- .../ActualPayment/ActualPaymentApplyList.jsp | 12 +++++++++++- .../Fund/FundPayment/FundPaymentApplyList.jsp | 1 - .../FundPaymentApplyList.jsp | 12 +++++++++++- .../ProjectCredit/ProjectCreditApplyList.jsp | 12 +++++++++++- .../ProjectRecreditApplyList.jsp | 1 - .../CautionMoneyDeductionApplyList.jsp | 18 +++++++++++++++++- .../CautionMoneyReturnApplyList.jsp | 17 ++++++++++++++++- .../PenaltyReductionApplyList.jsp | 17 ++++++++++++++++- 13 files changed, 105 insertions(+), 15 deletions(-) diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithDeduction.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithDeduction.xml index cfdbc62eb..fb5e4e037 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithDeduction.xml +++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithDeduction.xml @@ -84,7 +84,7 @@ FROM ON lccs.payment_number = lcc.payment_number LEFT JOIN lb_contract_status lcs ON lcs.STATUS_CODE = lccs.plan_status -WHERE IFNULL(l.fact_money, 0) = lcc.CAUTION_MONEY +WHERE lci.businesstype='#businessType' AND IFNULL(l.fact_money, 0) = lcc.CAUTION_MONEY AND ( lcc.CAUTION_DEDUCTION_MONEY - IFNULL(lr.fact_money, 0) ) > 0 diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithReturn.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithReturn.xml index 00fa65b06..02a704622 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithReturn.xml +++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractOnhireWithReturn.xml @@ -74,7 +74,7 @@ FROM ON lccs.payment_number = lcc.payment_number LEFT JOIN lb_contract_status lcs ON lcs.status_code = lccs.plan_status -WHERE IFNULL(l.fact_money, 0) > 0 +WHERE lci.businesstype='#businessType' AND IFNULL(l.fact_money, 0) > 0 AND ( lcc.CAUTION_MONEY_REMAIN - IFNULL(lr.fact_money, 0) ) > 0 diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml index 6ae542b9c..d857d69c9 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml +++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml @@ -85,7 +85,7 @@ FROM LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no -WHERE ( +WHERE lci.businesstype='#businessType' AND ( lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26' diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp index 451d2ef6e..5e8e59aff 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp @@ -6,7 +6,8 @@ Content: History Log: */ - String sObjectType = CurPage.getParameter("FlowNo");//流程类型 + String sObjectType = CurPage.getParameter("FlowNo");//流程类型PhaseNo + String phaseno = CurPage.getParameter("PhaseNo"); String flowunid = CurPage.getParameter("FlowUnid"); String RightType= CurPage.getParameter("RightType"); String contractid= CurPage.getParameter("ContractId"); @@ -19,10 +20,14 @@ dwTemp.setPageSize(10); dwTemp.genHTMLObjectWindow(flowunid); + String button = "false"; + if("0010".equals(phaseno)){ + button = "true"; + } //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { - {"true","All","Button","上传","上传合同","upload()","","","","btn_icon_save"}, - {"true","","Button","删除","删除","deletefile()","","","","btn_icon_delete",""}, + {button,"All","Button","上传","上传合同","upload()","","","","btn_icon_save"}, + {button,"","Button","删除","删除","deletefile()","","","","btn_icon_delete",""}, }; sButtonPosition = "north"; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index 9a5d22a1e..07e267a7f 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -12,12 +12,23 @@ { var userid="<%=CurUser.getUserID()%>"; var flowno="<%=CurPage.getParameter("ApplyType")%>"; var selname=""; + var orgId="<%=CurUser.getOrgID()%>".substring(0,7); + var businessType=""; if(flowno=="BContractApproveApply"){ selname="SelectProjectForContract_Car"; + businessType="1"; }else{ selname="SelectProjectForContract"; + if(orgId=="8009010"){ + businessType="2"; + }else if(orgId=="8009011"){ + businessType="3"; + }else{ + alert("当前用户不能发起申请！"); + return; + } } - AsDialog.OpenSelector(selname,"userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + 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){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//请选择一条信息！ return; diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentApplyList.jsp index c22430720..f85a9f5f4 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentApplyList.jsp @@ -5,7 +5,17 @@ /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newApply() { - AsDialog.OpenSelector("SelectPassPaymentPlan","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var orgId="<%=CurUser.getOrgID()%>".substring(0,7); + var businessType=""; + if(orgId=="8009010"){ + businessType="2"; + }else if(orgId=="8009011"){ + businessType="3"; + }else{ + alert("当前用户不能发起申请！"); + return; + } + AsDialog.OpenSelector("SelectPassPaymentPlan","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ //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 e7a4fd361..e0680ba70 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp @@ -4,7 +4,6 @@