diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentICMS.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentICMS.jsp new file mode 100644 index 000000000..3b2edf2da --- /dev/null +++ b/WebContent/Tenwa/Comm/Document/LBDocumentICMS.jsp @@ -0,0 +1,64 @@ +<%@ page contentType="text/html; charset=GBK"%><%@ + include file="/IncludeBegin.jsp"%><% + /* + Author: undefined 2017-10-24 + Content: + History Log: + */ +%> +<% + String FlowNo=CurPage.getParameter("FlowNo"); + String FlowUnid=CurPage.getParameter("ObjectNo"); + String sPhaseNo = CurPage.getParameter("PhaseNo"); + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); +%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp index d5f5249eb..12f608bbc 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp @@ -55,11 +55,11 @@ let sResult = RunJavaMethodTrans("com.ample.icms.service.ImageOcrService","invoiceOrcOfInvoice","contractId=<%=ContractId%>,flowNo=FundPaymentCarFlow"); if(sResult!=null&&sResult.error_code==0&&sResult.result.发票号码!=''){ const resultList = sResult.result; - let Invoice_code = resultList.发票号码; - let Invoice_number = resultList.发票代码; + let Invoice_code = resultList.发票代码; + let Invoice_number = resultList.发票号码; let Invoice_date = resultList.开票日期; Invoice_date = Invoice_date.substr(0,4)+'/'+Invoice_date.substr(4,2)+'/'+Invoice_date.substr(6,2); - let Invoice_money = resultList.不含税价小写; + let Invoice_money = resultList.价税合计小写; let tax_due = resultList.增值税税额; let tax_rate = resultList.增值税税率或征收税率; setItemValue(0,0,"Invoice_code", Invoice_code); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp index cd64e4f57..73b8d0eac 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp @@ -30,7 +30,10 @@ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String IsShowFormal = CurPage.getParameter("IsShowFormal");//流程编号 - +String projectNo=CurPage.getParameter("ProjectNo");//项目编号 +String isHistory=CurPage.getParameter("IsHistory"); +String userId= CurUser.getUserID(); +String userName = CurUser.getUserName(); BizObject flow=GetFlowAction.getFlowBussinessObject(sFlowUnid); String product_id=""; if("true".equals(IsShowFormal)){ @@ -137,7 +140,8 @@ // 原版的 sButtons= new String[][]{ - {"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""} + {"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""}, + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""}, }; @@ -305,6 +309,39 @@ setItemValue(0,0,"subjectname",sReturn[1]); },"请选择客户",''); } + + + function openFileList(){ + let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); + let params = getRequestParam(); + if(params!=null){ + AsControl.postICMS(url,params); + } + } + function getRequestParam(){ + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); + let index = appInfo.indexOf("@"); + if(index==-1){ + alert(appInfo); + return; + } + let appCode = appInfo.substr(0,index); + let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } + let code = 'ECM0002'; + if(("<%=FlowNo%>"=="RentRebackFlow"||"<%=FlowNo%>"=="FundRebackFlow")&&"<%=sPhaseNo%>"=="0010"&&"<%=isHistory%>"!="true"){ + code = 'ECM0001'; + } + let busiNo= "<%=projectNo%>"; + if(busiNo==null||busiNo==""||busiNo=="null"){ + busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); + } + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); + return param; + } <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index 007e377f8..dcf5c07b9 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -45,7 +45,7 @@ {btnflag,"","Button","查询签约结果","查询签约结果","getStatus()","","","","btn_icon_obtain",""}, {btnflag,"","Button","重新发送短信","重新发送短信","sendMessageAgain()","","","","btn_icon_refresh",""}, {signs,"","Button","公司盖章","公司盖章","sign()","","","","btn_icon_refresh",""}, - {"true","","Button","上传合同","暂时测试上传用按钮","uploadContract()","","","","btn_icon_refresh",""}, + {"false","","Button","上传合同","暂时测试上传用按钮","uploadContract()","","","","btn_icon_refresh",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>