From 0a133c473f4c6c55f4312c5e06021dffa89ddb72 Mon Sep 17 00:00:00 2001 From: maliang Date: Wed, 23 Jun 2021 14:14:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E4=B8=80=E8=BD=A6=E5=A4=9A=E5=90=88=E5=90=8C=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FundPaymentInvoice/LBInvoiceList.jsp | 10 +++++++--- .../FundPaymentInvoice/LbInvoiceTemp.jsp | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LBInvoiceList.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LBInvoiceList.jsp index d4cc114c9..076133eda 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LBInvoiceList.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LBInvoiceList.jsp @@ -56,10 +56,14 @@ var equipment_id=getItemValue(0, i, "id"); //console.log(contract_id+','+equipment_id); - var sUrl = "/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp"; - var frameNumber = getItemValue(0,getRow(0),'FRAME_NUMBER'); + var sUrl = "/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp"; + var frameNumber = getItemValue(0,getRow(0),'FRAME_NUMBER'); + var ENGINE_NUMBER = getItemValue(0,getRow(0),'ENGINE_NUMBER'); + var EQUIP_PRICE = getItemValue(0,getRow(0),'EQUIP_PRICE'); - var sParam = "FlowUnid=<%=FlowUnid%>&ContractId=<%=ContractId%>&FlowKey=<%=ContractNumber%>&phaseNo=<%=phaseNo%>&frameNumber="+frameNumber+"&equipment_id="+equipment_id; + + var sParam = "FlowUnid=<%=FlowUnid%>&ContractId=<%=ContractId%>&FlowKey=<%=ContractNumber%>&phaseNo=<%=phaseNo%>&frameNumber=" + +frameNumber+"&equipment_id="+equipment_id+"&ENGINE_NUMBER="+ENGINE_NUMBER+"&EQUIP_PRICE="+EQUIP_PRICE; //console.log(sParam); AsControl.OpenView(sUrl,sParam ,'_self',''); } diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp index 48d4875da..3a1148421 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp @@ -13,6 +13,10 @@ String ContractId = CurPage.getParameter("ContractId"); String ContractNumber = CurPage.getParameter("FlowKey"); String equipment_id = CurPage.getParameter("equipment_id"); + String EQUIP_PRICE = CurPage.getParameter("EQUIP_PRICE"); + String ENGINE_NUMBER = CurPage.getParameter("ENGINE_NUMBER"); + String frameNumber = CurPage.getParameter("frameNumber"); + String sTempletNo = "LbInvoiceTemp";//--Δ£°εΊΕ-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); @@ -160,6 +164,16 @@ $(function(){ //setItemReadOnly(0,0,"INVOICE_DATE",true); document.getElementById("INVOICE_DATE").readOnly=true; + var Invoice_money=getItemValue(0,getRow(0),"Invoice_money"); + console.log("Invoice_money:"+Invoice_money); + + console.log(Invoice_money==null || Invoice_money=='undefined' || Invoice_money==""); + if(Invoice_money==null || Invoice_money=='undefined' || Invoice_money==""){ + setItemValue(0,getRow(0),"Invoice_money","<%=EQUIP_PRICE%>"); + setItemValue(0,getRow(0),"ENGINE_NUMBER","<%=ENGINE_NUMBER%>"); + setItemValue(0,getRow(0),"FRAME_NUMBER","<%=frameNumber%>"); + checkInvoiceMoney(); + } }) function returnList(){ From ea63f8d03340a19eda5a9dbb399cd0aac11d3ce1 Mon Sep 17 00:00:00 2001 From: maliang Date: Wed, 23 Jun 2021 14:15:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E4=B8=80=E5=90=88=E5=90=8C=E5=A4=9A=E8=BD=A6=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp index 3a1148421..0da453464 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp @@ -172,6 +172,7 @@ setItemValue(0,getRow(0),"Invoice_money","<%=EQUIP_PRICE%>"); setItemValue(0,getRow(0),"ENGINE_NUMBER","<%=ENGINE_NUMBER%>"); setItemValue(0,getRow(0),"FRAME_NUMBER","<%=frameNumber%>"); + checkInvoiceMoney(); } })