Merge remote-tracking branch 'origin/dailyfix' into dailyfix

This commit is contained in:
gityjf 2021-04-09 08:12:46 +08:00
commit c008458f24

View File

@ -1,3 +1,4 @@
<%@ page import="org.apache.commons.lang3.StringUtils" %>
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
/*
@ -15,7 +16,16 @@
String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
String projectId = CurPage.getParameter("ProjectId");
String gpsVendor = Sqlca.getString("select cl.itemname from lb_project_info lpi left join LM_GPS_ORDER lgr on lgr.apply_no=lpi.project_no left join code_library cl on cl.itemno=lgr.source and cl.codeno='gpsVendor' where lpi.id='"+projectId+"'");
String userId = CurUser.getUserID();
String orderNo = Sqlca.getString("SELECT ORDER_NO from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'");
String vin = Sqlca.getString("SELECT CAR_VIN from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'");
String applyNo = Sqlca.getString("SELECT APPLY_NO from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'");
System.out.println("projectId=" + projectId);
System.out.println("userId=" + userId);
System.out.println("orderNo=" + orderNo);
System.out.println("vin=" + vin);
System.out.println("applyNo=" + applyNo);
String sTempletNo = "LB_CONTRACT_INFO_PAY";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
@ -34,13 +44,29 @@
dwTemp.replaceColumn("INVOICEINFO", "<iframe type='iframei' id='frame_listi' name=\"frame_listi\" width=\"100%\" height=\"150px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp?CompClientID="+compClientID+"&ContractId="+contractId+"&flowunid="+flowunid+"\"></iframe>", CurPage.getObjectWindowOutput());
//租赁物列表信息页面
dwTemp.replaceColumn("EQUIPMENT_LIST", "<iframe type='iframe' id='equipment_list' name=\"frame_list\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Comm/LBEquipment_Car/PayLBEquipmentList.jsp?CompClientID="+compClientID+"&ContractId="+contractId+"&RightType=ReadOnly\"></iframe>", CurPage.getObjectWindowOutput());
String sButtons[][] = {
{"true","","Button","保存","保存所有修改","save()","","","","btn_icon_save"},
};
String sButtons[][] ={
{"true","","Button","保存","保存所有修改","save()","","","","btn_icon_save"},
{"true","All","Button","查看GPS定位信息","查看GPS定位信息","queryOrder()","","","","",""},
};
//sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function queryOrder(){
var applyNo = "<%=applyNo%>";
var userId = "<%=userId%>";
var orderNo = "<%=orderNo%>";
var projectId = "<%=projectId%>";
var vin = "<%=vin%>";
if(applyNo == 'null' || orderNo == 'null' || vin == 'null'){
alert("查询GPS安装订单不存在该订单暂未安装GPS。");
return;
}
var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","queryOrder",
"userId=<%=userId%>,flowUnid=流程外查询,applyNo=<%=applyNo%>,orderNo=<%=orderNo%>,tableName=LM_GPS_ORDER,projectId=<%=projectId%>,vin=<%=vin%>");
AsDialog.PopView("/Tenwa/Gps/LmGpsLocationList.jsp","ProjectNo=<%=applyNo%>","dialogWidth=1300px;dialogHeight=200px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){
},'GPS定位信息');
}
function save(){
var orgid= "<%=orgId%>".substring(0,4);
if("FundPaymentCarFlow"=="<%=CurPage.getParameter("FlowNo")%>" && "<%=phaseNo%>"!="0010" && orgid != "8006" ){