diff --git a/.tomcatplugin b/.tomcatplugin
index 99785289a..546ecaf04 100644
--- a/.tomcatplugin
+++ b/.tomcatplugin
@@ -7,5 +7,5 @@
true
- /apzl_leasing
+ /apzl
diff --git a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
new file mode 100644
index 000000000..0e224f109
--- /dev/null
+++ b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
@@ -0,0 +1,30 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-04
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempList.jsp";
+
+ String sTempletNo = "LBEquipmentCarTempInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.setColTips("", "测试");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ //dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+
+ String sButtons[][] = {
+ {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+ {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempList.jsp b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempList.jsp
new file mode 100644
index 000000000..6597afc5a
--- /dev/null
+++ b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempList.jsp
@@ -0,0 +1,50 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-04
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("LBEquipmentCarTempList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+ {"true","","Button","估值","估值"," vehicleAppraisement()","","","","btn_icon_check",""}
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/generatededitshow.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/generatededitshow.jsp
index f4bd52ea5..f09f614cd 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/generatededitshow.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/generatededitshow.jsp
@@ -24,12 +24,10 @@
alert("请选择发送日期!");
return false;
}
- /*
var fparams="payment_number="+'<%=CurPage.getParameter("payment_number")%>'+",senddate="+senddate+",contractlist=<%=CurPage.getParameter("contractlist")%>"+",inputuserid=<%=inputuserid%>"+",inputorgid=<%=inputorgid%>,userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>";
var sReturnInfo = RunJavaMethodTrans("com.amarsoft.app.lc.reminder.GeneratedReminderLetterAction","saveGeneratedReminderLetter",fparams);
- */
AsDialog.ClosePage(senddate);
-
+
}
<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/cache.xml b/WebContent/WEB-INF/etc/cache.xml
index 49ec67ab2..379f3638b 100644
--- a/WebContent/WEB-INF/etc/cache.xml
+++ b/WebContent/WEB-INF/etc/cache.xml
@@ -11,9 +11,9 @@
+ ");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
+
+ out.write("\n");
+ out.write("
\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("");
+/* 椤圭洰搴旂敤鎵╁睍鍐呭*/
+ out.write("\n");
+ out.write(" ");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
boolean isShowFilter = true;
boolean isShowButton = true;
@@ -310,12 +289,12 @@ try{
String sASWizardHtml = "";
String pageSize = CurPage.getParameter("PageSize");
if(CurConfig.getConfigure("ListQuerySelection")!=null){
-
- out.write("\n");
- out.write("\t\n");
-}
+
+ out.write("\n");
+ out.write("\t\n");
+}
/*
Author: undefined 2018-05-29
@@ -335,195 +314,195 @@ try{
{"true","","Button","璇︽儏","璇︽儏","viewAndEdit()","","","","btn_icon_detail",""},
{"true","","Button","鍒犻櫎","鍒犻櫎","if(confirm('纭疄瑕佸垹闄ゅ悧?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
};
-
+
String pagesize=CurPage.getParameter("PageSize");
if(pagesize==null){pagesize=dwTemp.getPageSize()+"";}
dwTemp.setPageSize(Integer.valueOf(pagesize));
dwTemp.genHTMLObjectWindow("");
-
- out.write('\n');
- out.write("\n");
- out.write("\n");
-for(String outString : CurPage.getObjectWindowOutput()) out.print(outString);
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("
\n");
- out.write("
\n");
- out.write("
\n");
- out.write("
\n");
- out.write(" \t
\n");
- out.write("\t
\n");
- out.write("\t
\n");
- out.write("\t\t
\n");
- out.write("\t
\n");
- out.write("\t
\n");
- out.write("
\n");
- out.write("
\n");
- out.write("\n");
-if(!com.amarsoft.are.lang.StringX.isSpace(sASNavigatorHtml)){
- out.write("\n");
- out.write("\t| \n");
- out.write("\t\t");
- out.print(sASNavigatorHtml);
- out.write("\n");
- out.write(" | \n");
- out.write("
");
-}
- out.write('\n');
-if(!com.amarsoft.are.lang.StringX.isSpace(sASWizardHtml)){
- out.write("\n");
- out.write("\t| \n");
- out.write("\t\t");
- out.print(sASWizardHtml);
- out.write("\n");
- out.write(" | \n");
- out.write("
");
-}
- out.write('\n');
-if(com.amarsoft.awe.ui.model.ItemHelp.isShowButton(isShowButton,sButtons) && sButtons.length > 0 && ("both".equalsIgnoreCase(sButtonPosition) || "north".equalsIgnoreCase(sButtonPosition))){
- out.write("\n");
- out.write("\n");
- out.write("\t| \n");
- out.write("\t\t");
- out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
- out.write("\n");
- out.write(" | \n");
- out.write("
\n");
-}
- out.write("\n");
- out.write("\n");
- out.write("\t \n");
- out.write("\t \t\n");
- out.write("\t \t\t \n");
- out.write("\t \t \n");
- out.write("\t\t\t\n");
- out.write("\t\t\t");
+
+ out.write('\n');
+ out.write("\n");
+ out.write("\n");
+for(String outString : CurPage.getObjectWindowOutput()) out.print(outString);
+ out.write("\n");
+ out.write("\n");
+ out.write("\n");
+ out.write(" \n");
+ out.write(" \n");
+ out.write(" \n");
+ out.write(" \n");
+ out.write(" \t \n");
+ out.write("\t \n");
+ out.write("\t \n");
+ out.write("\t\t \n");
+ out.write("\t \n");
+ out.write("\t \n");
+ out.write(" \n");
+ out.write(" \n");
+ out.write("\n");
+if(!com.amarsoft.are.lang.StringX.isSpace(sASNavigatorHtml)){
+ out.write("\n");
+ out.write("\t| \n");
+ out.write("\t\t");
+ out.print(sASNavigatorHtml);
+ out.write("\n");
+ out.write(" | \n");
+ out.write(" ");
+}
+ out.write('\n');
+if(!com.amarsoft.are.lang.StringX.isSpace(sASWizardHtml)){
+ out.write("\n");
+ out.write("\t| \n");
+ out.write("\t\t");
+ out.print(sASWizardHtml);
+ out.write("\n");
+ out.write(" | \n");
+ out.write(" ");
+}
+ out.write('\n');
+if(com.amarsoft.awe.ui.model.ItemHelp.isShowButton(isShowButton,sButtons) && sButtons.length > 0 && ("both".equalsIgnoreCase(sButtonPosition) || "north".equalsIgnoreCase(sButtonPosition))){
+ out.write("\n");
+ out.write("\n");
+ out.write("\t| \n");
+ out.write("\t\t");
+ out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
+ out.write("\n");
+ out.write(" | \n");
+ out.write(" \n");
+}
+ out.write("\n");
+ out.write("\n");
+ out.write("\t \n");
+ out.write("\t \t\n");
+ out.write("\t \t\t \n");
+ out.write("\t \t \n");
+ out.write("\t\t\t\n");
+ out.write("\t\t\t");
//鐢熸垚鎼滅储鎸夐挳
String[][] sSearchButtons = {
{"true","纭畾","纭畾","if(tableSearchFromInput())document.getElementById('TableFilter').style.display='none';","","","",""},
{"true","鍙栨秷","鍙栨秷","document.getElementById('TableFilter').style.display='none'","","","",""}
};
-
- out.write("\n");
- out.write("\t\t\t\n");
- out.write("\t\t\t\t\n");
- out.write("\t\t\t \n");
- out.write("\t\t\t\n");
- out.write("\t\t\t\n");
- out.write("\t\t\t");
- out.write('\n');
+
+ out.write("\n");
+ out.write("\t\t\t\n");
+ out.write("\t\t\t\t\n");
+ out.write("\t\t\t \n");
+ out.write("\t\t\t\n");
+ out.write("\t\t\t\n");
+ out.write("\t\t\t");
+ out.write('\n');
ButtonItem btFIlter1 = new ButtonItem("纭畾","纭畾","if(tableSearchFromInput())document.getElementById('TableFilter').style.display='none';");
ButtonItem btFIlter2 = new ButtonItem("楂樼骇","楂樼骇","openFullFilter(0,event)");
ButtonItem btFIlter20 = new ButtonItem("杩樺師","杩樺師","TableFactory.clearFilter(0);if(tableSearchFromInput())document.getElementById('TableFilter').style.display='none';");
ButtonItem btFIlter21 = new ButtonItem("鍏抽棴","鍏抽棴","document.getElementById('TableFilter').style.display='none';");
-
- out.write("\n");
- out.write("\t \n");
- out.write("\t| \n");
- out.write("\t");
- out.print(new Button(btFIlter1).getHtmlText());
- out.write("\n");
- out.write("\t | \n");
- out.write("\t\n");
- out.write("\t");
- out.print(new Button(btFIlter2).getHtmlText());
- out.write("\n");
- out.write("\t | \n");
- out.write("\t\n");
- out.write("\t");
- out.print(new Button(btFIlter20).getHtmlText());
- out.write("\n");
- out.write("\t | \n");
- out.write("\t\n");
- out.write("\t");
- out.print(new Button(btFIlter21).getHtmlText());
- out.write("\n");
- out.write("\t | \n");
- out.write("\t
\n");
- out.write(" \n");
- out.write("\n");
- out.write("\t\n");
- out.write(" \n");
- out.write("");
- out.write("\n");
- out.write("\t\t\t\n");
- out.write("\t\t\t\n");
- out.write("\t\t\t\n");
- out.write("\t\t\t\n");
- out.write("\t\t | \n");
- out.write("\t \n");
- out.write("\t\n");
- out.write("\t");
-if(com.amarsoft.awe.ui.model.ItemHelp.isShowButton(isShowButton,sButtons) && ("both".equalsIgnoreCase(sButtonPosition) || "south".equalsIgnoreCase(sButtonPosition))){
- out.write("\n");
- out.write("\t\n");
- out.write("\n");
- out.write("\t| \n");
- out.write("\t\t");
- out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
- out.write("\n");
- out.write(" | \n");
- out.write(" \n");
-}
- out.write("\n");
- out.write(" \n");
+
+ out.write("var sbDWFullFiterButtons = new StringBuffer();\n");
+ out.write("sbDWFullFiterButtons.append('');\n");
+ out.write("sbDWFullFiterButtons.append('| ");
+ out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter3).getHtmlText()));
+ out.write(" | ');\n");
+ out.write("sbDWFullFiterButtons.append('");
+ out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter4).getHtmlText()));
+ out.write(" | ');\n");
+ out.write("sbDWFullFiterButtons.append('");
+ out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter5).getHtmlText()));
+ out.write(" | ');\n");
+ out.write("sbDWFullFiterButtons.append('");
+ out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter6).getHtmlText()));
+ out.write(" | ');\n");
+ out.write("sbDWFullFiterButtons.append(' ');\n");
+ out.write("DWFullFiterButtons = sbDWFullFiterButtons.toString();\n");
+ out.write("sbDWFullFiterButtons = new StringBuffer();\n");
+ out.write("sbDWFullFiterButtons.append('');\n");
+ out.write("DWFullFiterButtons2 = sbDWFullFiterButtons.toString();\n");
+ out.write("");
+ out.write("\n");
+ out.write("\t\t\t\n");
+ out.write("\t\t\t\n");
+ out.write("\t\t\t\n");
+ out.write("\t\t\t\n");
+ out.write("\t\t | \n");
+ out.write("\t
\n");
+ out.write("\t\n");
+ out.write("\t");
+if(com.amarsoft.awe.ui.model.ItemHelp.isShowButton(isShowButton,sButtons) && ("both".equalsIgnoreCase(sButtonPosition) || "south".equalsIgnoreCase(sButtonPosition))){
+ out.write("\n");
+ out.write("\t\n");
+ out.write("\n");
+ out.write("\t| \n");
+ out.write("\t\t");
+ out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
+ out.write("\n");
+ out.write(" | \n");
+ out.write("
\n");
+}
+ out.write("\n");
+ out.write("
\n");
String sUrlBase2 = request.getRequestURI().substring(request.getRequestURI().indexOf(sWebRootPath)+sWebRootPath.length());
ButtonItem [] biButtonArray = ItemHelp.getButtonItemArray(CurUser,sButtons,CurComp.getAttribute("RightType",10),sUrlBase2);
-
- out.write("\n");
- out.write("