Merge branch 'release20210831' into dailyfix
This commit is contained in:
commit
6cd8a8e5fb
@ -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','');
|
||||
}
|
||||
|
||||
@ -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,17 @@
|
||||
$(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(){
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user