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/CarPhoto/CarPhotoList.jsp b/WebContent/Tenwa/CarPhoto/CarPhotoList.jsp
index f4bcedc14..a37eb212b 100644
--- a/WebContent/Tenwa/CarPhoto/CarPhotoList.jsp
+++ b/WebContent/Tenwa/CarPhoto/CarPhotoList.jsp
@@ -1,7 +1,8 @@
<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
-String orgid=CurUser.getOrgID();
-String userid=CurUser.getUserID();
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+<%
+ String orgid=CurUser.getOrgID();
+ String userid=CurUser.getUserID();
ASObjectModel doTemp = new ASObjectModel("LB_CAR_LICENSE_PLATE_LIST");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1";
@@ -10,14 +11,35 @@ String userid=CurUser.getUserID();
dwTemp.genHTMLObjectWindow("");
String sButtons[][] = {
- {"true","All","Button","新增","新增","newRecord()","","","",""},
+ /* {"true","All","Button","新增","新增","newRecord()","","","",""}, */
{"true","All","Button","修改","修改","edit()","","","",""},
{"true","All","Button","删除","删除","do_delete()","","","","btn_icon_delete"},
- {"true","All","Button","牌照管理导入","牌照管理导入","importExcel()","","","","btn_icon_import"}
+ {"true","All","Button","导入Excel","导入Excel","importExcel()","","","","btn_icon_import"},
+ {"true","","Button","牌照模版下载","牌照模版下载","LicensePlateDownload()","","","","btn_icon_down",""},
};
%><%@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/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp
index 0a644f994..f65013e51 100644
--- a/WebContent/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp
+++ b/WebContent/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp
@@ -5,12 +5,15 @@
//获得组件参数
String sObjectType=CurPage.getParameter("ObjectType");//
String contract_id=CurPage.getParameter("contract_id");
- String car_id=CurPage.getParameter("car_id");
+
+ //String contract_id=CurPage.getParameter("contract_id");
+ //String car_id=CurPage.getParameter("car_id");
ASObjectModel doTemp = new ASObjectModel("LB_CAR_LICENSE_PLATE_INFO");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="2"; // 设置DW风格 1:Grid 2:Freeform
dwTemp.ReadOnly = "0"; // 设置是否只读 1:只读 0:可写
- dwTemp.genHTMLObjectWindow(car_id);
+ //dwTemp.genHTMLObjectWindow(car_id);
+ dwTemp.genHTMLObjectWindow(contract_id);
String[][] sButtons=null;
sButtons=new String[][]{
{"true","","Button","保存","保存所有修改","importRecord()","","","",""},
@@ -18,7 +21,7 @@
%><%@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..d5428435f
--- /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/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp
index fdb5a8951..90eaac670 100644
--- a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp
@@ -1,30 +1,30 @@
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
- /*
- Author: undefined 2018-06-03
- Content: 示例详情页面
- History Log:
- */
- String sPrevUrl = CurPage.getParameter("PrevUrl");
- if(sPrevUrl == null) sPrevUrl = "";
-
- String sTempletNo = "LbEquipmentCarInfo";//--模板号--
- 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"%>
-
+<%@ 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 = "";
+
+ String sTempletNo = "LbEquipmentCarInfo";//--模板号--
+ 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/LbEquipmentCarList.jsp b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarList.jsp
index 64b5110ce..9f36bf524 100644
--- a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarList.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarList.jsp
@@ -1,37 +1,37 @@
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
- /*
- Author: undefined 2018-06-03
- Content:
- History Log:
- */
- ASObjectModel doTemp = new ASObjectModel("LbEquipmentCarList");
- 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,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
- };
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
-
+<%@ 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("LbEquipmentCarList");
+ 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,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ };
+%><%@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/Comm/LBContractTemplate/LBContractTemplateList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
index 3c69e843b..dc3b8b642 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
@@ -46,8 +46,8 @@
{"false","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
{"false","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""},
{"true","","Button","删除","删除","deletecontract()","","","","btn_icon_delete",""},
- {"true","","Button","生成合同","删除","createContractByTemplate()","","","","btn_icon_up",""},
- {"true","","Button","上传","新增文档信息","uploadContract()","","","","btn_icon_up",""}
+ //{"true","","Button","生成合同","删除","createContractByTemplate()","","","","btn_icon_up",""},
+ //{"true","","Button","上传","新增文档信息","uploadContract()","","","","btn_icon_up",""}
};
}
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/FileUpload.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/FileUpload.jsp
new file mode 100644
index 000000000..db68babc7
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/FileUpload.jsp
@@ -0,0 +1,86 @@
+<%@page import="java.net.URLDecoder"%>
+<%@page import="com.amarsoft.are.jbo.impl.BizObjectTableMapper"%>
+<%@page import="com.amarsoft.awe.util.DBKeyHelp"%>
+<%@page import="com.amarsoft.awe.common.attachment.*"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%><%
+ AmarsoftUpload myAmarsoftUpload = new AmarsoftUpload();
+ myAmarsoftUpload.initialize(pageContext);
+ myAmarsoftUpload.upload();
+ String FileSizejs=(String)myAmarsoftUpload.getRequest().getParameter("FileSize2");
+ String docType=(String)myAmarsoftUpload.getRequest().getParameter("DOC_TYPE");
+ String oneClassfiy=(String)myAmarsoftUpload.getRequest().getParameter("ONE_CLASSIFY");
+ String twoClassfiy=(String)myAmarsoftUpload.getRequest().getParameter("TWO_CLASSIFY");
+ String objectType=(String)myAmarsoftUpload.getRequest().getParameter("OBJECTTYPE");
+// String sFileName =URLDecoder.decode((String)myAmarsoftUpload.getRequest().getParameter("FILENAMEX"),"UTF-8"); //文件名称
+ String sFileName = myAmarsoftUpload.getFiles().getFile(0).getFileName();
+// System.out.println("文件名==="+ URLDecoder.decode((String)myAmarsoftUpload.getRequest().getParameter("FILENAMEX"),"UTF-8"));
+// String Remark=URLDecoder.decode((String)myAmarsoftUpload.getRequest().getParameter("REMARK2"),"UTF-8"); //备注InputTime
+ String Remark= (String)myAmarsoftUpload.getRequest().getParameter("REMARK"); //备注InputTime
+ String libraryId= (String)myAmarsoftUpload.getRequest().getParameter("ID"); //附件编号
+ String InputTime= StringFunction.getTodayNow(); //附件编号上传时间
+
+ BizObjectManager libBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCLIBRARY");
+ BizObjectManager attrBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE");
+ BizObject lib=libBm.createQuery("id=:id").setParameter("id", libraryId).getSingleResult(true);
+// lib.setAttributeValue("Remark", Remark);
+// libBm.saveObject(lib);
+ BizObject attr=attrBm.newObject();
+ attr.setAttributeValue("Library_Id", libraryId);
+ attr.setAttributeValue("FileName", sFileName);
+ attr.setAttributeValue("InputUserId", CurUser.getUserID());
+ attr.setAttributeValue("InputOrgId", CurUser.getOrgID());
+ attr.setAttributeValue("InputTime",InputTime);
+ attr.setAttributeValue("objectType", objectType);
+
+ //得到不带路径的文件名
+ sFileName = StringFunction.getFileName(sFileName);
+ sFileName = URLDecoder.decode(URLDecoder.decode(sFileName,"UTF-8"),"UTF-8");
+ //定义数据库操作变量
+ SqlObject so = null;
+ String sNewSql = "";
+ String sFileSaveMode = CurConfig.getConfigure("FileSaveMode");
+ String sFileSavePath = CurConfig.getConfigure("FileSavePath");
+ String sFileNameType = CurConfig.getConfigure("FileNameType");
+
+ String trueTable = ((BizObjectTableMapper)attrBm).getTable(); //取得真实的表名
+ String sAttachmentNo = DBKeyHelp.getSerialNo(trueTable,"Id");
+
+ if (!myAmarsoftUpload.getFiles().getFile(0).isMissing()){
+ try {
+ //System.out.println("sDocNo="+libraryId+"--sAttachmentNo="+sAttachmentNo+"--sFileName="+sFileName+"--sFileSavePath="+sFileSavePath);
+ //System.out.println("sFileNameType="+sFileNameType+"--application="+application);
+ //String sFullPath = com.amarsoft.awe.common.attachment.FileNameHelper.getFullPath(libraryId, sAttachmentNo,sFileName, sFileSavePath, sFileNameType, application);
+ String uuid=java.util.UUID.randomUUID().toString().replaceAll("-", "");
+ String sFullPath =com.tenwa.officetempalte.util.FileOperatorUtil.getuploadFileDir(sFileSavePath) +uuid+"_"+sFileName;
+// if(myAmarsoftUpload.getFiles().getFile(0).getSize()!=Integer.parseInt(FileSizejs)){
+// throw new Exception("上传文件失败,请联系管理员!");
+// }
+ myAmarsoftUpload.getFiles().getFile(0).saveAs(sFullPath);
+ //得到带相对路径的文件名
+ String sFilePath = sFullPath.replace(sFileSavePath, "");
+ attr.setAttributeValue("FilePath",sFilePath);
+ attr.setAttributeValue("FullPath",sFullPath);
+ attr.setAttributeValue("Content_Type",DataConvert.toString(myAmarsoftUpload.getFiles().getFile(0).getContentType()));
+ attr.setAttributeValue("FileSize",DataConvert.toString(String.valueOf(myAmarsoftUpload.getFiles().getFile(0).getSize())));
+ attrBm.saveObject(attr);
+ myAmarsoftUpload = null;
+ }catch(Exception e){
+ e.printStackTrace();
+ out.println("An error occurs : " + e.toString());
+ attrBm.deleteObject(attr);
+ myAmarsoftUpload = null;
+%>
+
+<%
+ }
+ }
+%>
+
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbDoclibraryInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbDoclibraryInfo.jsp
new file mode 100644
index 000000000..10c179595
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbDoclibraryInfo.jsp
@@ -0,0 +1,99 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-07
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "";
+
+ String sTempletNo = "LbDoclibraryInfo";//--模板号--
+ 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("SerialNo"));
+
+ 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/Flow/FileManager/MortgageFile/LbDoclibraryList.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbDoclibraryList.jsp
index 8e0fa30a7..e961bf2c7 100644
--- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbDoclibraryList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbDoclibraryList.jsp
@@ -61,7 +61,6 @@
//上传
function upload(id){
- debugger;
var param="Library_id="+id;
var sUrl="/Tenwa/Lease/Flow/FileManager/MortgageFile/LbDoclibraryInfo.jsp";
AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 6f28a9388..2dc042fa1 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -41,7 +41,7 @@
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
- dwTemp.genHTMLObjectWindow("");
+ dwTemp.genHTMLObjectWindow("");
%>
<%/*~END~*/%>
@@ -85,6 +85,9 @@
var certid =getItemValue(0,getRow(),"certid");
var carSeries = getItemValue(0,getRow(),"carSeries");
var productModel =getItemValue(0,getRow(),"productModel");
+ var brandid = getItemValue(0,getRow(),"brandid");
+ var seriesid = getItemValue(0,getRow(),"seriesid");
+ var modelid = getItemValue(0,getRow(),"modelid");
if(certtype==""){
alert("请选择证件类型");
@@ -192,10 +195,10 @@
}
- <%/*~[Describe=选择产品车型;]~*/%>
+ <%/*~[Describe=选择车品牌;]~*/%>
function selectProductModel()
{
- AsDialog.OpenSelector("SelectProductModel","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
+ AsDialog.OpenSelector("SelectCardataBrand","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
{
@@ -203,38 +206,19 @@
return;
}
sReturn = sReturn.split("@");
- MyOjbect.productModel=sReturn[1];
+ MyOjbect.brandid=sReturn[0];
+ MyOjbect.brandname=sReturn[1];
setItemValue(0,getRow(),"productModel",sReturn[1]);
- },"请选择产品车型",'');
+ },"请选择车品牌",'');
}
- <%/*~[Describe=选择品牌车系;]~*/%>
- function selectCarSystem()
- {
- var carSeries=" ";
- if(MyOjbect.carSeries){
- carSeries=MyOjbect.carSeries;
- AsDialog.OpenSelector("SelectCarSystem","carSeries,"+carSeries,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
- function(sReturn){
- if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
- {
- //alert(getHtmlMessage('1'));//请选择一条信息!
- return;
- }
- sReturn = sReturn.split("@");
- setItemValue(0,getRow(),"carSystem",sReturn[1]);
- },"请选择品牌车系",'');
- }else{
- alert("请先选择品牌车型");
- }
- }
- <%/*~[Describe=选择品牌车型;]~*/%>
+ <%/*~[Describe=请选择车系;]~*/%>
function selectCarSeries()
{
- var productModel="";
- if(MyOjbect.productModel){
- productModel=MyOjbect.productModel;
-
- AsDialog.OpenSelector("SelectCarSeries","productModel,"+productModel,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
+
+ var brandid="";
+ if(MyOjbect.brandid){
+ brandid=MyOjbect.brandid;
+ AsDialog.OpenSelector("SelectCardataSeries","brandid,"+brandid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
{
@@ -242,14 +226,37 @@
return;
}
sReturn = sReturn.split("@");
- MyOjbect.carSeries=sReturn[1];
+ MyOjbect.seriesid=sReturn[0];
+ MyOjbect.seriesname=sReturn[1];
setItemValue(0,getRow(),"carSeries",sReturn[1]);
- },"请选择品牌车型",'');
+ },"请选择车系",'');
}else{
- alert("请先选择汽车品牌")
+ alert("请先选择车品牌")
}
}
+ <%/*~[Describe=选择车型;]~*/%>
+ function selectCarSystem()
+ {
+ var seriesid="";
+ if(MyOjbect.seriesid){
+ seriesid=MyOjbect.seriesid;
+ AsDialog.OpenSelector("SelectCardataModel","seriesid,"+seriesid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
+ function(sReturn){
+ if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
+ {
+ //alert(getHtmlMessage('1'));//请选择一条信息!
+ return;
+ }
+ sReturn = sReturn.split("@");
+ MyOjbect.modelid=sReturn[0];
+ MyOjbect.modelname=sReturn[1];
+ setItemValue(0,getRow(),"carSystem",sReturn[1]);
+ },"请选择车型",'');
+ }else{
+ alert("请先选择车系");
+ }
+ }
<%/*~END~*/%>
@@ -266,7 +273,7 @@
var sReturn = RunJavaMethodSqlca("com.tenwa.lease.flow.project.projectapproval.BusinessTypeController","getBusinessType","");
sReturn = sReturn.split("@");
setItemValue(0,0,"productId",sReturn[0]);
- setItemValue(0,0,"productName",sReturn[1]);
+ setItemValue(0,0,"productName",sReturn[1]);
}else if(num>1){
showItem(0,"productName");//字段显示
showItem(0,"product_id");//字段显示
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp
index 57f203103..1c3d01677 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp
@@ -1,4 +1,3 @@
-<%@page import="com.tenwa.comm.dataRightmanager.DataRightManager"%>
<%@page import="java.util.Date"%>
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
@@ -12,14 +11,17 @@
SimpleDateFormat df=new SimpleDateFormat("yyyy/MM/dd");
String now=df.format(new Date(d.getTime()));//yyyy/MM/dd格式
ASObjectModel doTemp = new ASObjectModel("GeneratedReminderLetterList");
- String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
- doTemp.appendJboWhere(sCondtion);
+/* String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
+ doTemp.appendJboWhere(sCondtion); */
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.MultiSelect=true;
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
- dwTemp.genHTMLObjectWindow(StringFunction.getToday("yyyy/MM/dd"));
+ //dwTemp.genHTMLObjectWindow(StringFunction.getToday("yyyy/MM/dd"));
+
+ dwTemp.genHTMLObjectWindow("");
+
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
String sButtons[][] = {
@@ -40,7 +42,7 @@
AsDialog.PopView("/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/generatededitshow.jsp","contractlist="+sPara+"&payment_number="+payment_number,
{width:"500px",height:"200px",title:"选择发送日期"},function(sReturn){
if(sReturn!=null&&sReturn.length>0){
- exportExcel(sReturn);
+ exportExcel(sReturn);
alert("生成催款函成功!");
}
return;
@@ -58,8 +60,6 @@
}
function exportExcel(sReturn){
-
-
var payment_numbers = getItemValueArray(0,'payment_number');
var allPaymentNumbers="";
for(var i=0;i";
+ tempParam["ID"]=getItemValue(0,getRow(0),"ID");
+/* tempParam["payment_number"]=getItemValue(0,getRow(0),"PAYMENT_NUMBER");
+ tempParam["PLAN_LIST"]=PLAN_LISTS[i];
+ tempParam["PLAN_NUMBER"]=PAYMENT_NUMBERS[i];
+ tempParam["customername"]=getItemValue(0,getRow(0),"customername");
+ tempParam["contract_number"]=getItemValue(0,getRow(0),"contract_number"); */
//生成模板固定参数
tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
@@ -85,13 +92,14 @@
if(sparam.length>0){sparam+=",";}
sparam+=key+"="+param[key];
}
- //RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentCollectDeleteAction","deletequtation","plan_number="+payment_numbers[i]);
- console.log(getNowFormatDate());
+ RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentCollectDeleteAction","deletequtation","plan_number="+payment_numbers[i]);
+ console.log(sparam);
var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
console.log(getNowFormatDate());
reloadSelf();
}
+
function downloadFile(id){
if(!frames["downloadTemplate"]) $("").appendTo("body");
window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
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/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
index 13688dd16..4d9daf5da 100644
--- a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
@@ -59,7 +59,8 @@
var tempParam={};
var sparam="";
//模板号
- param["templateNo"]="7bb0ad99651e42bf969a2a4e18bd20b6";
+ debugger;
+ param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87";
//生成文件关联关系
tempParam["OBJECTTYPE"]="租金通知书";
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index f0cfdfc40..afc64ed12 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1,5 +1,16 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1024,11 +1035,12 @@
-
+
-
+
+
@@ -1042,8 +1054,13 @@
-
-
+
+
+
+
+
+
+
@@ -1069,9 +1086,20 @@
-
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index b50a5d0f2..e9b530c78 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -1,118 +1,190 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
index 093d1cb3a..7a968f719 100644
--- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
@@ -1,4 +1,5 @@
-
+
+
@@ -9,7 +10,7 @@
-
+
@@ -40,7 +41,7 @@
-
+
@@ -56,4 +57,6 @@
-
\ No newline at end of file
+
+
+
\ 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("