diff --git a/.tomcatplugin b/.tomcatplugin
index 99785289a..546ecaf04 100644
--- a/.tomcatplugin
+++ b/.tomcatplugin
@@ -7,5 +7,5 @@
     <updateXml>true</updateXml>
     <warLocation></warLocation>
     <extraInfo></extraInfo>
-    <webPath>/apzl_leasing</webPath>
+    <webPath>/apzl</webPath>
 </tomcatProjectProperties>
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"%>
-<script type="text/javascript">
-	function returnList(){
-		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
-	}
-</script>
+<%@ 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"%>
+<script type="text/javascript">
+	function returnList(){
+		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
+	}
+</script>
 <%@ 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"%>
-<script type="text/javascript">
-	function newRecord(){
-		 var sUrl = "/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp";
-		 AsControl.OpenView(sUrl,'','_self','');
-	}
-	function viewAndEdit(){
-		 var sUrl = "/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp";
-		 var sPara = getItemValue(0,getRow(0),'ID');
-		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
-			alert("参数不能为空！");
-			return ;
-		 }
-		AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
-	}
-</script>
+<%@ 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"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "/Tenwa/Lease/App/Interface/VehicleEvaluation/LbEquipmentCarInfo.jsp";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
+	}
+</script>
 <%@ 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;
+%>          
+      <script type="text/javascript">
+          alert("上传失败");//上传文件失败！
+          parent.AsDialog.ClosePage();
+      </script>
+<%
+     		}
+       	}
+%>
+<script type="text/javascript">
+    alert("上传成功");//上传文件成功！
+    parent.AsDialog.ClosePage("success");
+</script>
+<%@ 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"%>
+<script type="text/javascript">
+	$(function() {
+		$("#FILE2").attr("type","file");
+		$("#myiframe0").attr("enctype","multipart/form-data");
+// 		var params={};
+<%-- 		params["OBJECTTYPE"]="<%=flowNo%>"; --%>
+// 		params["FILENAMEX"]="";
+// 		params["REMARK2"]="";
+// 		params["FileSize2"]="";
+// 		var sparma="";
+// 	    for(var key in params){
+// 	    	sparma=sparma+"<input type=\"text\" name=\""+key+"\" id=\""+key+"\" value=\""+params[key]+"\">"
+// 	    }
+// 	    $("#FILE2").append(sparma);
+		$("#myiframe0").attr("action","<%=sWebRootPath%>/Tenwa/Lease/Flow/FileManager/MortgageFile/FileUpload.jsp?CompClientID=<%=CurComp.getClientID()%>");
+		$("#myiframe0").attr("method","post");
+	});
+	
+	function viewAndEdit_attachment(){
+		if(confirm("确认取消上传？")){
+			parent.AsDialog.ClosePage("_CANCEL_");
+		}
+	}
+	
+	function importRecord(){
+		var o = document.forms["myiframe0"];
+		var sFileName = o.FILE2.value;
+		var nameArr = sFileName.split("\\");
+		
+		setItemValue(0,0,"FileName",encodeURI(nameArr[nameArr.length-1]));
+		$("#FILENAMEX").val(encodeURI(nameArr[nameArr.length-1]));
+		o.REMARK2.value= encodeURI(getItemValue(0,0,"REMARK"));
+		if (typeof(sFileName) == "undefined" || sFileName==""){
+			alert("请选上传的附件!");
+			return false;
+		}
+		if(/[!@'"#$%&\^*]/.test(nameArr[nameArr.length-1])){
+			alert("文件名不合法");
+			return;
+		}
+		var flag=CheckStr(nameArr[nameArr.length-1].toLowerCase());
+		if(flag!="true"){
+			alert("只能上传后缀名为"+flag+"的文件");
+			return ;
+		}
+		var fileSize;
+		if(typeof(ActiveXObject) == "function"){ // IE
+			var fso = new ActiveXObject("Scripting.FileSystemObject");
+			var f1 = fso.GetFile(sFileName);
+			fileSize = f1.size;
+		}else{
+			fileSize = o.FILE2.files[0].size;
+		}
+		if(fileSize > 50*1024*1024){
+			alert("文件大于50MB，不能上传！");
+			return false;
+		}
+		$("#FileSize2").val(fileSize);
+		return o.submit();
+	}
+	function CheckStr(filename){
+		var s="jpg,jpeg,png,bmp,gif,pdf,doc,docx,xls,xlsx";
+		var flag="false";
+		var s2=s.split(",");
+		var filenamelast = filename.lastIndexOf(".");
+		var fileimage  = filename.substr(filenamelast+1).toLowerCase();
+		for(var i=0;i<s2.length;i++){
+			if(fileimage==s2[i]){
+				return "true";
+			}
+		}
+		return s;
+	}
+</script>
+<%@ 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("请先选择车系");
+			 }
+		 }
 	 </script>
 <%/*~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<payment_numbers.length;i++){
@@ -70,10 +70,17 @@
 			var tempParam={};
 			var sparam="";
 			//模板号
-			param["templateNo"]="dc51852d44214eda9a4d320a063673d1";
+			debugger;
+			param["templateNo"]="a67d1e799d35435e866010dd1325674c";
 			//生成文件关联关系
 			tempParam["OBJECTTYPE"]="打印催款函";
 			tempParam["FLOW_UNID"]="<%=new java.util.Date().getTime()%>";
+			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"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").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); 
-
+		
 	}
 </script>
 <%@ 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/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 @@
     <cache name="错误代码信息" loadClass="com.amarsoft.dict.als.cache.loader.ErrMsgLoader"/>
     <cache name="ObjectWindow缓存" loadClass="com.amarsoft.dict.als.cache.loader.AWEDataWindowLoader" size="50" expireTime="1200"/> 
     <cache name="JBO关联对象缓存" loadClass="com.amarsoft.asquery.JBORelatedObjLoader"/>
+    <!-- 
     <cache name="APP_CODE缓存" loadClass="apx.com.amarsoft.als.base.constant.cache.loader.AppCodeLoader"/>
     <cache name="APP_DO缓存" loadClass="apx.com.amarsoft.als.base.constant.cache.loader.AppAweDoLoader" size="10000" />
-    <!-- 
     <cache name="SYSCONF_CLTYPE" loadClass="com.amarsoft.app.creditline.cache.loader.CreditLineTypeDefinitionLoader"/>额度类型信息
     <cache name="SYSCONF_LIMITATIONTYPE" loadClass="com.amarsoft.app.creditline.cache.loader.LimitationTypeDefinitionLoader"/>额度限制类型信息
     <cache name="SYSCONF_CL_ERROR_TYPE" loadClass="com.amarsoft.app.creditline.cache.loader.ErrorTypeDefinitionLoader"/>额度异常点类型信息
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index 474843d14..9d5b40ac3 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -4544,7 +4544,6 @@
 				</managerProperties>
 			</manager>
 		</class>
-	
 		<class name="LB_EQUIPMENT_CAR_TEMP" label="姹借溅绉熻祦鐗╀复鏃惰〃" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="鏍囪瘑" type="STRING" length="32"/>
@@ -4630,8 +4629,6 @@
 				<attribute name="normal_dealer_low_sold_price" label="鏅�氭渶浣庤溅鍟嗛浂鍞环" type="STRING" length="32"/>
 				<attribute name="normal_dealer_price" label="鏅�氳溅鍟嗛浂鍞环" type="STRING" length="32"/>
 				<attribute name="normal_dealer_high_sold_price" label="鏅�氭渶楂樿溅鍟嗛浂鍞环" type="STRING" length="32"/>
-				<attribute name="discharge_standard" label="鎺掓斁鏍囧噯" type="STRING" length="32"/>
-				<attribute name="detail_report_url" label="璇︾粏浼板�肩粨鏋滄姤鍛婇〉闈㈠湴鍧�" type="STRING" length="100"/>
 				<attribute name="taken" label="鏌ヨ缂栧彿" type="STRING" length="32"/>
 				<attribute name="modelId" label="杞﹀瀷ID" type="STRING" length="32"/>
 				<attribute name="zone" label="鍩庡競鏍囪瘑" type="STRING" length="32"/>
@@ -4639,9 +4636,6 @@
 				<attribute name="mile" label="杞﹁締琛岄┒閲岀▼" type="STRING" length="32"/>
 				<attribute name="CITYID" label="CITYID" type="STRING" length="32"/>
 				<attribute name="CITYNAME" label="CITYNAME" type="STRING" length="100"/>
-				<attribute name="retainfield1" label="淇濈暀瀛楁1" type="STRING" length="100"/>
-				<attribute name="retainfield2" label="淇濈暀瀛楁2" type="STRING" length="100"/>
-				<attribute name="retainfield3" label="淇濈暀瀛楁3" type="STRING" length="100"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洖绉燂紙jl20180603锛�.doc b/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洖绉燂紙jl20180603锛�.doc
new file mode 100644
index 000000000..b85c8b7ac
Binary files /dev/null and b/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洖绉燂紙jl20180603锛�.doc differ
diff --git a/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洿绉燂紙jl20180603锛�.doc b/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洿绉燂紙jl20180603锛�.doc
new file mode 100644
index 000000000..cb3761bdd
Binary files /dev/null and b/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洿绉燂紙jl20180603锛�.doc differ
diff --git a/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洿绉燂紙jl20180603锛�.docx b/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洿绉燂紙jl20180603锛�.docx
new file mode 100644
index 000000000..b571279a0
Binary files /dev/null and b/WebContent/fileTemplate/1銆佽瀺璧勭璧佸悎鍚�-C绔洿绉燂紙jl20180603锛�.docx differ
diff --git a/WebContent/fileTemplate/4銆佹姷鎶煎悎鍚岋紙jl20180603锛�.docx b/WebContent/fileTemplate/4銆佹姷鎶煎悎鍚岋紙jl20180603锛�.docx
new file mode 100644
index 000000000..d69fa29bf
Binary files /dev/null and b/WebContent/fileTemplate/4銆佹姷鎶煎悎鍚岋紙jl20180603锛�.docx differ
diff --git a/WebContent/fileTemplate/鍌敹閫氱煡涔�.docx b/WebContent/fileTemplate/鍌敹閫氱煡涔�.docx
new file mode 100644
index 000000000..dcc0e8d42
Binary files /dev/null and b/WebContent/fileTemplate/鍌敹閫氱煡涔�.docx differ
diff --git a/WebContent/fileTemplate/鍥炵涓汉鎺堟潈鍗忚涔�.docx b/WebContent/fileTemplate/鍥炵涓汉鎺堟潈鍗忚涔�.docx
new file mode 100644
index 000000000..d7498c7d0
Binary files /dev/null and b/WebContent/fileTemplate/鍥炵涓汉鎺堟潈鍗忚涔�.docx differ
diff --git a/WebContent/fileTemplate/鎶垫娂鍚堝悓.docx b/WebContent/fileTemplate/鎶垫娂鍚堝悓.docx
new file mode 100644
index 000000000..d69fa29bf
Binary files /dev/null and b/WebContent/fileTemplate/鎶垫娂鍚堝悓.docx differ
diff --git a/WebContent/fileTemplate/鐩寸涓汉鎺堟潈鍗忚涔�.docx b/WebContent/fileTemplate/鐩寸涓汉鎺堟潈鍗忚涔�.docx
new file mode 100644
index 000000000..c83b0b593
Binary files /dev/null and b/WebContent/fileTemplate/鐩寸涓汉鎺堟潈鍗忚涔�.docx differ
diff --git a/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔�.docx b/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔�.docx
new file mode 100644
index 000000000..49a21b590
Binary files /dev/null and b/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔�.docx differ
diff --git a/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洖绉�.docx b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洖绉�.docx
new file mode 100644
index 000000000..f7c0c5378
Binary files /dev/null and b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洖绉�.docx differ
diff --git a/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洿绉�.docx b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洿绉�.docx
new file mode 100644
index 000000000..b571279a0
Binary files /dev/null and b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洿绉�.docx differ
diff --git a/WebContent/fileTemplate/楣忕洓鐗╀笟绉熼噾鏀粯閫氱煡涔�-绗叚鏈�-2.18鏃� (1).docx b/WebContent/fileTemplate/楣忕洓鐗╀笟绉熼噾鏀粯閫氱煡涔�-绗叚鏈�-2.18鏃� (1).docx
new file mode 100644
index 000000000..0dc4122c5
Binary files /dev/null and b/WebContent/fileTemplate/楣忕洓鐗╀笟绉熼噾鏀粯閫氱煡涔�-绗叚鏈�-2.18鏃� (1).docx differ
diff --git a/WebContent/fileTemplate/楣忕洓鐗╀笟绉熼噾鏀粯閫氱煡涔�-绗叚鏈�-2.18鏃�.docx b/WebContent/fileTemplate/楣忕洓鐗╀笟绉熼噾鏀粯閫氱煡涔�-绗叚鏈�-2.18鏃�.docx
new file mode 100644
index 000000000..49a21b590
Binary files /dev/null and b/WebContent/fileTemplate/楣忕洓鐗╀笟绉熼噾鏀粯閫氱煡涔�-绗叚鏈�-2.18鏃�.docx differ
diff --git a/config/quartz.properties b/config/quartz.properties
index cdb386fd8..821d96aea 100644
--- a/config/quartz.properties
+++ b/config/quartz.properties
@@ -1,4 +1,4 @@
-org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true
+org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://119.3.11.192:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true
 #tel6
 #org.quartz.dataSource.zhulhDS.user=2sHTLrRv8sRxxaX7RrjfKQ==
 #tel6_123
diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
deleted file mode 100644
index f40426d5b..000000000
--- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
+++ /dev/null
@@ -1,396 +0,0 @@
-package jbo.app;
-
-import java.lang.String;
-
-/**
-* 汽车租赁物临时表 - JBO命名常量类<br><br>
-* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
-
-*/
-public interface LB_EQUIPMENT_CAR_TEMP{
-	/**
-	* 汽车租赁物临时表<br><br>
-	* 代表本类映射的BizObjectClass
-	*/
-	public static final String CLASS_NAME = "jbo.app.LB_EQUIPMENT_CAR_TEMP";
-	/**
-	* 标识 STRING(32)<br>
-	*/
-	public static final String ID = "ID";
-	/**
-	* 项目编号 STRING(32)<br>
-	*/
-	public static final String PROJECT_ID = "PROJECT_ID";
-	/**
-	* 合同编号 STRING(32)<br>
-	*/
-	public static final String CONTRACT_ID = "CONTRACT_ID";
-	/**
-	* 车辆类型 STRING(30)<br>
-	*/
-	public static final String DEVICE_TYPE = "DEVICE_TYPE";
-	/**
-	* 设备名称 STRING(200)<br>
-	*/
-	public static final String EQUIP_NAME = "EQUIP_NAME";
-	/**
-	* 车辆品牌 STRING(30)<br>
-	*/
-	public static final String BRAND = "BRAND";
-	/**
-	* 型号 STRING(30)<br>
-	*/
-	public static final String MODEL = "MODEL";
-	/**
-	* 数量 STRING(30)<br>
-	*/
-	public static final String EQUIP_NUM = "EQUIP_NUM";
-	/**
-	* 单价 STRING(30)<br>
-	*/
-	public static final String PRICE = "PRICE";
-	/**
-	* 单位 STRING(30)<br>
-	*/
-	public static final String UNIT = "UNIT";
-	/**
-	* 交易价格 STRING(30)<br>
-	*/
-	public static final String EQUIP_PRICE = "EQUIP_PRICE";
-	/**
-	* 设备原值 STRING(30)<br>
-	*/
-	public static final String TOTAL = "TOTAL";
-	/**
-	* 车辆指导价 STRING(30)<br>
-	*/
-	public static final String NOW_TOTAL = "NOW_TOTAL";
-	/**
-	* 供应商id STRING(32)<br>
-	*/
-	public static final String VNDR = "VNDR";
-	/**
-	* 供应商 STRING(200)<br>
-	*/
-	public static final String VNDR_NAME = "VNDR_NAME";
-	/**
-	* 制造商id STRING(32)<br>
-	*/
-	public static final String MANUFACTURER = "MANUFACTURER";
-	/**
-	* 生产商 STRING(200)<br>
-	*/
-	public static final String MANUFACTURER_NAME = "MANUFACTURER_NAME";
-	/**
-	* 设备序列号 STRING(30)<br>
-	*/
-	public static final String EQUIP_NUMBER = "EQUIP_NUMBER";
-	/**
-	* 交付地点 STRING(100)<br>
-	*/
-	public static final String EQUIP_DELIVERY_PLACE = "EQUIP_DELIVERY_PLACE";
-	/**
-	* 交付时间 STRING(30)<br>
-	*/
-	public static final String EQUIP_DELIVERY_DATE = "EQUIP_DELIVERY_DATE";
-	/**
-	* 设备设置地址 STRING(100)<br>
-	*/
-	public static final String EQUIP_PLACE = "EQUIP_PLACE";
-	/**
-	* 其他配置说明 STRING(1000)<br>
-	*/
-	public static final String MEMO = "MEMO";
-	/**
-	* 数据状态 STRING(32)<br>
-	*/
-	public static final String DATA_STATE = "DATA_STATE";
-	/**
-	* 是否在流程中 STRING(1000)<br>
-	*/
-	public static final String IS_FLOW = "IS_FLOW";
-	/**
-	* 状态 STRING(1000)<br>
-	*/
-	public static final String STATUS = "STATUS";
-	/**
-	* 流程编号 STRING(32)<br>
-	*/
-	public static final String FLOWUNID = "FLOWUNID";
-	/**
-	* 登记人 STRING(32)<br>
-	*/
-	public static final String INPUTUSERID = "INPUTUSERID";
-	/**
-	* 登记部门 STRING(32)<br>
-	*/
-	public static final String INPUTORGID = "INPUTORGID";
-	/**
-	* 登记时间 STRING(32)<br>
-	*/
-	public static final String INPUTTIME = "INPUTTIME";
-	/**
-	* 更新人 STRING(32)<br>
-	*/
-	public static final String UPDATEUSERID = "UPDATEUSERID";
-	/**
-	* 更新部门 STRING(32)<br>
-	*/
-	public static final String UPDATEORGID = "UPDATEORGID";
-	/**
-	* 更新时间 STRING(32)<br>
-	*/
-	public static final String UPDATETIME = "UPDATETIME";
-	/**
-	* 车架号 STRING(100)<br>
-	*/
-	public static final String FRAME_NUMBER = "FRAME_NUMBER";
-	/**
-	* 发动机号 STRING(100)<br>
-	*/
-	public static final String ENGINE_NUMBER = "ENGINE_NUMBER";
-	/**
-	* 车牌号 STRING(100)<br>
-	*/
-	public static final String PLATE_NUMBER = "PLATE_NUMBER";
-	/**
-	* 租赁物类型 STRING(32)<br>
-	*/
-	public static final String EQUIP_TYPE = "EQUIP_TYPE";
-	/**
-	* 收货人 STRING(30)<br>
-	*/
-	public static final String CONSIGNEE = "CONSIGNEE";
-	/**
-	* 收货人联系电话 STRING(30)<br>
-	*/
-	public static final String CONSIGNEE_TEL = "CONSIGNEE_TEL";
-	/**
-	* 设备交付情况 STRING(30)<br>
-	*/
-	public static final String IS_DELIVERY = "IS_DELIVERY";
-	/**
-	* 交付说明 STRING(1000)<br>
-	*/
-	public static final String REMARK = "REMARK";
-	/**
-	* 驱动形式 STRING(100)<br>
-	*/
-	public static final String DRIVE_TYPE = "DRIVE_TYPE";
-	/**
-	* 车辆颜色 STRING(32)<br>
-	*/
-	public static final String CAR_COLOUR = "CAR_COLOUR";
-	/**
-	* 排量 STRING(32)<br>
-	*/
-	public static final String DISPLACEMENT = "DISPLACEMENT";
-	/**
-	* 车牌号码 STRING(32)<br>
-	*/
-	public static final String LICENSE_PLATE_NUMBER = "LICENSE_PLATE_NUMBER";
-	/**
-	* 年检有效期 STRING(32)<br>
-	*/
-	public static final String EXPIRYDATE = "EXPIRYDATE";
-	/**
-	* 驾驶人姓名 STRING(32)<br>
-	*/
-	public static final String D_NAME = "D_NAME";
-	/**
-	* 驾驶人性别 STRING(32)<br>
-	*/
-	public static final String D_SEX = "D_SEX";
-	/**
-	* 驾驶人身份证号 STRING(32)<br>
-	*/
-	public static final String D_CERTID = "D_CERTID";
-	/**
-	* 驾驶人身份证地址 STRING(200)<br>
-	*/
-	public static final String D_CERT_ADDR = "D_CERT_ADDR";
-	/**
-	* 驾驶人身份证有效期 STRING(32)<br>
-	*/
-	public static final String D_CERT_VALID = "D_CERT_VALID";
-	/**
-	* 驾驶证 STRING(32)<br>
-	*/
-	public static final String D_DRIVE = "D_DRIVE";
-	/**
-	* 驾驶人手机号码 STRING(32)<br>
-	*/
-	public static final String D_TEL = "D_TEL";
-	/**
-	* 驾驶人常住地址 STRING(200)<br>
-	*/
-	public static final String D_ADDR = "D_ADDR";
-	/**
-	* 驾驶人学历 STRING(32)<br>
-	*/
-	public static final String D_EDU_LEVEL = "D_EDU_LEVEL";
-	/**
-	* 驾驶人公司名称 STRING(100)<br>
-	*/
-	public static final String D_WORK_NAME = "D_WORK_NAME";
-	/**
-	* 驾驶人公司地址 STRING(200)<br>
-	*/
-	public static final String D_WORK_ADDR = "D_WORK_ADDR";
-	/**
-	* 驾驶人当前工作工作年限 STRING(32)<br>
-	*/
-	public static final String D_WORK_YEAR = "D_WORK_YEAR";
-	/**
-	* 驾驶人月薪 DOUBLE(22)<br>
-	*/
-	public static final String D_SALARY = "D_SALARY";
-	/**
-	* 驾驶人ID STRING(32)<br>
-	*/
-	public static final String D_ID = "D_ID";
-	/**
-	* 车系 STRING(80)<br>
-	*/
-	public static final String car_series = "car_series";
-	/**
-	* 档位 STRING(80)<br>
-	*/
-	public static final String gears = "gears";
-	/**
-	* 评估价格 STRING(32)<br>
-	*/
-	public static final String evaluated_price = "evaluated_price";
-	/**
-	* 优秀最低车商收购价 STRING(32)<br>
-	*/
-	public static final String excellent_dealer_low_buy_price = "excellent_dealer_low_buy_price";
-	/**
-	*  优秀车商收车价 STRING(32)<br>
-	*/
-	public static final String excellent_dealer_buy_price = "excellent_dealer_buy_price";
-	/**
-	* 优秀最低个人交易价 STRING(32)<br>
-	*/
-	public static final String excellent_individual_low_sold_price = "excellent_individual_low_sold_price";
-	/**
-	* 优秀个人交易价 STRING(32)<br>
-	*/
-	public static final String excellent_individual_price = "excellent_individual_price";
-	/**
-	* 优秀最低车商零售价 STRING(32)<br>
-	*/
-	public static final String excellent_dealer_low_sold_price = "excellent_dealer_low_sold_price";
-	/**
-	* 优秀车商零售价 STRING(32)<br>
-	*/
-	public static final String excellent_dealer_price = "excellent_dealer_price";
-	/**
-	* 优秀最高车商零售价 STRING(32)<br>
-	*/
-	public static final String excellent_dealer_high_sold_price = "excellent_dealer_high_sold_price";
-	/**
-	* 良好最低车商收购 STRING(32)<br>
-	*/
-	public static final String good_dealer_low_buy_price = "good_dealer_low_buy_price";
-	/**
-	*  良好车商收车价 STRING(32)<br>
-	*/
-	public static final String good_dealer_buy_price = "good_dealer_buy_price";
-	/**
-	* 良好最低个人交易价 STRING(32)<br>
-	*/
-	public static final String good_individual_low_sold_price = "good_individual_low_sold_price";
-	/**
-	*  良好个人交易价 STRING(32)<br>
-	*/
-	public static final String good_individual_price = "good_individual_price";
-	/**
-	* 良好最低车商零售价 STRING(32)<br>
-	*/
-	public static final String good_dealer_low_sold_price = "good_dealer_low_sold_price";
-	/**
-	* 良好车商零售价 STRING(32)<br>
-	*/
-	public static final String good_dealer_price = "good_dealer_price";
-	/**
-	* 良好最高车商零售价 STRING(32)<br>
-	*/
-	public static final String good_dealer_high_sold_price = "good_dealer_high_sold_price";
-	/**
-	* 普通最低车商收购 STRING(32)<br>
-	*/
-	public static final String normal_dealer_low_buy_price = "normal_dealer_low_buy_price";
-	/**
-	*  普通车商收车价 STRING(32)<br>
-	*/
-	public static final String normal_dealer_buy_price = "normal_dealer_buy_price";
-	/**
-	* 普通最低个人交易价 STRING(32)<br>
-	*/
-	public static final String normal_individual_low_sold_price = "normal_individual_low_sold_price";
-	/**
-	*  普通个人交易价 STRING(32)<br>
-	*/
-	public static final String normal_individual_price = "normal_individual_price";
-	/**
-	* 普通最低车商零售价 STRING(32)<br>
-	*/
-	public static final String normal_dealer_low_sold_price = "normal_dealer_low_sold_price";
-	/**
-	* 普通车商零售价 STRING(32)<br>
-	*/
-	public static final String normal_dealer_price = "normal_dealer_price";
-	/**
-	* 普通最高车商零售价 STRING(32)<br>
-	*/
-	public static final String normal_dealer_high_sold_price = "normal_dealer_high_sold_price";
-	/**
-	* 排放标准 STRING(32)<br>
-	*/
-	public static final String discharge_standard = "discharge_standard";
-	/**
-	* 详细估值结果报告页面地址 STRING(100)<br>
-	*/
-	public static final String detail_report_url = "detail_report_url";
-	/**
-	* 查询编号 STRING(32)<br>
-	*/
-	public static final String taken = "taken";
-	/**
-	* 车型ID STRING(32)<br>
-	*/
-	public static final String modelId = "modelId";
-	/**
-	* 城市标识 STRING(32)<br>
-	*/
-	public static final String zone = "zone";
-	/**
-	* 车牌上牌日期 STRING(32)<br>
-	*/
-	public static final String regDate = "regDate";
-	/**
-	* 车辆行驶里程 STRING(32)<br>
-	*/
-	public static final String mile = "mile";
-	/**
-	* CITYID STRING(32)<br>
-	*/
-	public static final String CITYID = "CITYID";
-	/**
-	* CITYNAME STRING(100)<br>
-	*/
-	public static final String CITYNAME = "CITYNAME";
-	/**
-	* 保留字段1 STRING(100)<br>
-	*/
-	public static final String retainfield1 = "retainfield1";
-	/**
-	* 保留字段2 STRING(100)<br>
-	*/
-	public static final String retainfield2 = "retainfield2";
-	/**
-	* 保留字段3 STRING(100)<br>
-	*/
-	public static final String retainfield3 = "retainfield3";
-}
\ No newline at end of file
diff --git a/work/org/apache/jsp/money/sourceOfFunds_jsp.class b/work/org/apache/jsp/money/sourceOfFunds_jsp.class
index 075667972..46488583d 100644
Binary files a/work/org/apache/jsp/money/sourceOfFunds_jsp.class and b/work/org/apache/jsp/money/sourceOfFunds_jsp.class differ
diff --git a/work/org/apache/jsp/money/sourceOfFunds_jsp.java b/work/org/apache/jsp/money/sourceOfFunds_jsp.java
index 8201361f8..62f485ffb 100644
--- a/work/org/apache/jsp/money/sourceOfFunds_jsp.java
+++ b/work/org/apache/jsp/money/sourceOfFunds_jsp.java
@@ -1,133 +1,112 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/7.0.85
- * Generated at: 2018-05-29 03:54:01 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp.money;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import java.io.*;
-import java.sql.*;
-import java.text.*;
-import java.util.*;
-import com.amarsoft.are.ARE;
-import com.amarsoft.are.lang.*;
-import com.amarsoft.are.jbo.*;
-import com.amarsoft.are.jbo.ql.*;
-import com.amarsoft.are.security.*;
-import com.amarsoft.are.util.*;
-import com.amarsoft.amarscript.*;
-import com.amarsoft.context.*;
-import com.amarsoft.awe.*;
-import com.amarsoft.awe.Configure;
-import com.amarsoft.awe.RuntimeContext;
-import com.amarsoft.awe.control.model.*;
-import com.amarsoft.awe.util.*;
-import com.amarsoft.web.ui.*;
-import com.amarsoft.awe.ui.model.*;
-import com.amarsoft.awe.ui.widget.*;
-import com.amarsoft.awe.res.*;
-import com.amarsoft.awe.res.model.*;
-import com.amarsoft.dict.als.manage.*;
-import com.amarsoft.awe.dw.*;
-import com.amarsoft.awe.res.LanguageManager;
-import com.amarsoft.awe.res.JspfText;
-import com.amarsoft.awe.res.JspfText;
-import com.amarsoft.awe.control.model.Parameter;
-
-public final class sourceOfFunds_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  static {
-    _jspx_dependants = new java.util.HashMap<java.lang.String,java.lang.Long>(17);
-    _jspx_dependants.put("/Frame/page/jspf/include/jsp_sqlca_tail.jspf", Long.valueOf(1526962689151L));
-    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/list.jspf", Long.valueOf(1526962753833L));
-    _jspx_dependants.put("/Frame/page/jspf/include/jsp_head_res.jspf", Long.valueOf(1526962729861L));
-    _jspx_dependants.put("/AppMain/resources/include/app_tail.jspf", Long.valueOf(1526962738841L));
-    _jspx_dependants.put("/Frame/resources/include/ui/include_buttonset_dw.jspf", Long.valueOf(1526962685797L));
-    _jspx_dependants.put("/Frame/resources/include/include_end.jspf", Long.valueOf(1526962726941L));
-    _jspx_dependants.put("/Frame/resources/include/include_begin_list.jspf", Long.valueOf(1526962753201L));
-    _jspx_dependants.put("/Frame/page/jspf/include/jsp_debug.jspf", Long.valueOf(1526962687626L));
-    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/overdiv.jspf", Long.valueOf(1526962692238L));
-    _jspx_dependants.put("/Frame/page/jspf/ui/widget/buttonset_dw.jspf", Long.valueOf(1526962734737L));
-    _jspx_dependants.put("/Frame/page/jspf/include/jsp_sqlca_head.jspf", Long.valueOf(1526962740677L));
-    _jspx_dependants.put("/Frame/page/jspf/include/jsp_head_res_dw.jspf", Long.valueOf(1526962743650L));
-    _jspx_dependants.put("/Frame/resources/include/ui/include_list.jspf", Long.valueOf(1526962694938L));
-    _jspx_dependants.put("/Frame/page/jspf/include/jsp_runtime_context.jspf", Long.valueOf(1526962715951L));
-    _jspx_dependants.put("/AppMain/resources/include/app_head.jspf", Long.valueOf(1526962753987L));
-    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/full_filter.jspf", Long.valueOf(1526962722739L));
-    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/list_context_menu.jspf", Long.valueOf(1526962689213L));
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-        throws java.io.IOException, javax.servlet.ServletException {
-
-    final javax.servlet.jsp.PageContext pageContext;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html; charset=GBK");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			"/Frame/page/control/ErrorPage.jsp", false, 65536, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write('\r');
-      out.write('\n');
+/*
+ * Generated by the Jasper component of Apache Tomcat
+ * Version: Apache Tomcat/7.0.56
+ * Generated at: 2018-06-04 10:19:22 UTC
+ * Note: The last modified time of this file was set to
+ *       the last modified time of the source file after
+ *       generation to assist with modification tracking.
+ */
+package org.apache.jsp.money;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.servlet.jsp.*;
+import java.io.*;
+import java.sql.*;
+import java.text.*;
+import java.util.*;
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.lang.*;
+import com.amarsoft.are.jbo.*;
+import com.amarsoft.are.jbo.ql.*;
+import com.amarsoft.are.security.*;
+import com.amarsoft.are.util.*;
+import com.amarsoft.amarscript.*;
+import com.amarsoft.context.*;
+import com.amarsoft.awe.*;
+import com.amarsoft.awe.Configure;
+import com.amarsoft.awe.RuntimeContext;
+import com.amarsoft.awe.control.model.*;
+import com.amarsoft.awe.util.*;
+import com.amarsoft.web.ui.*;
+import com.amarsoft.awe.ui.model.*;
+import com.amarsoft.awe.ui.widget.*;
+import com.amarsoft.awe.res.*;
+import com.amarsoft.awe.res.model.*;
+import com.amarsoft.dict.als.manage.*;
+import com.amarsoft.awe.dw.*;
+import com.amarsoft.awe.res.LanguageManager;
+import com.amarsoft.awe.res.JspfText;
+import com.amarsoft.awe.res.JspfText;
+import com.amarsoft.awe.control.model.Parameter;
+
+public final class sourceOfFunds_jsp extends org.apache.jasper.runtime.HttpJspBase
+    implements org.apache.jasper.runtime.JspSourceDependent {
+
+  private static final javax.servlet.jsp.JspFactory _jspxFactory =
+          javax.servlet.jsp.JspFactory.getDefaultFactory();
+
+  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
+
+  static {
+    _jspx_dependants = new java.util.HashMap<java.lang.String,java.lang.Long>(17);
+    _jspx_dependants.put("/Frame/page/jspf/include/jsp_sqlca_tail.jspf", Long.valueOf(1528075721151L));
+    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/list.jspf", Long.valueOf(1528075740525L));
+    _jspx_dependants.put("/Frame/page/jspf/include/jsp_head_res.jspf", Long.valueOf(1528075733681L));
+    _jspx_dependants.put("/AppMain/resources/include/app_tail.jspf", Long.valueOf(1528075735041L));
+    _jspx_dependants.put("/Frame/resources/include/ui/include_buttonset_dw.jspf", Long.valueOf(1528075720521L));
+    _jspx_dependants.put("/Frame/resources/include/include_end.jspf", Long.valueOf(1528075733311L));
+    _jspx_dependants.put("/Frame/resources/include/include_begin_list.jspf", Long.valueOf(1528075740415L));
+    _jspx_dependants.put("/Frame/page/jspf/include/jsp_debug.jspf", Long.valueOf(1528075720881L));
+    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/overdiv.jspf", Long.valueOf(1528075721968L));
+    _jspx_dependants.put("/Frame/page/jspf/ui/widget/buttonset_dw.jspf", Long.valueOf(1528075734591L));
+    _jspx_dependants.put("/Frame/page/jspf/include/jsp_sqlca_head.jspf", Long.valueOf(1528075737825L));
+    _jspx_dependants.put("/Frame/page/jspf/include/jsp_head_res_dw.jspf", Long.valueOf(1528075738825L));
+    _jspx_dependants.put("/Frame/resources/include/ui/include_list.jspf", Long.valueOf(1528075722458L));
+    _jspx_dependants.put("/Frame/page/jspf/include/jsp_runtime_context.jspf", Long.valueOf(1528075728280L));
+    _jspx_dependants.put("/AppMain/resources/include/app_head.jspf", Long.valueOf(1528075740625L));
+    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/full_filter.jspf", Long.valueOf(1528075731601L));
+    _jspx_dependants.put("/Frame/page/jspf/ui/widget/ow/list_context_menu.jspf", Long.valueOf(1528075721171L));
+  }
+
+  private javax.el.ExpressionFactory _el_expressionfactory;
+  private org.apache.tomcat.InstanceManager _jsp_instancemanager;
+
+  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
+    return _jspx_dependants;
+  }
+
+  public void _jspInit() {
+    _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
+    _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
+  }
+
+  public void _jspDestroy() {
+  }
+
+  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
+        throws java.io.IOException, javax.servlet.ServletException {
+
+    final javax.servlet.jsp.PageContext pageContext;
+    final javax.servlet.ServletContext application;
+    final javax.servlet.ServletConfig config;
+    javax.servlet.jsp.JspWriter out = null;
+    final java.lang.Object page = this;
+    javax.servlet.jsp.JspWriter _jspx_out = null;
+    javax.servlet.jsp.PageContext _jspx_page_context = null;
+
+
+    try {
+      response.setContentType("text/html; charset=GBK");
+      pageContext = _jspxFactory.getPageContext(this, request, response,
+      			"/Frame/page/control/ErrorPage.jsp", false, 65536, true);
+      _jspx_page_context = pageContext;
+      application = pageContext.getServletContext();
+      config = pageContext.getServletConfig();
+      out = pageContext.getOut();
+      _jspx_out = out;
+
+      out.write('\n');
 
 	response.setHeader("Cache-Control","no-store");
 	response.setHeader("Pragma","no-cache");
@@ -159,7 +138,7 @@ public final class sourceOfFunds_jsp extends org.apache.jasper.runtime.HttpJspBa
 	for(int i=0;i<functions.length;i++){
 		Parser.registerFunction(functions[i]);
 	}
-
+
   
 Transaction Sqlca = null;
 Transaction SqlcaRepository = null;
@@ -174,133 +153,133 @@ try{
     CurPage.setUser(CurUser);
     CurPage.setRequestAttribute((HttpServletRequest)request);
     SqlcaRepository.commit();
-
-      out.write("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n");
-      out.write("<head>\n");
-      out.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=GBK\">\n");
-      out.write("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\">\n");
-      out.write("<link rel=\"shortcut icon\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/favicon.ico\">\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/resources/css/widget.css\">\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.print(sSkinPath);
-      out.write("/css/widget.css\">\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/resources/css/button.css\">\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.print(sSkinPath);
-      out.write("/css/button.css\">\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/resources/css/button_types.css\">\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/resources/fontawesome/css/font-awesome.min.css\">\n");
-      out.write("<script type=\"text/javascript\">window.history.forward(1);var sCompClientID=\"");
-      out.print(sCompClientID);
-      out.write("\";var sWebRootPath=\"");
-      out.print(sWebRootPath);
-      out.write("\";var sSkinPath=\"");
-      out.print(sSkinPath);
-      out.write("\";</script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/resources/js/jquery/jquery.min.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/jspf/js_var_global.jspf\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/as_common.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/as_control.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/as_widget.js\"></script>");
-/* 椤圭洰搴旂敤鎵╁睍鍐呭*/
-      out.write("\n");
-      out.write(" <script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Tenwa/Core/FlowManager/js/as_project.js\"></script>");
-      out.write("\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/resources/js/checkdatavalidity.js\"> </script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/common.js\"> </script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/message.js\"> </script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/resources/js/chart/json2.js\"></script>\n");
-      out.write("<!-- <script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/AppMain/resources/js/as_credit.js\"> </script> -->");
-      out.write("\n");
-      out.write("</head>\n");
-      out.write("<script>var G_FromFormatDoc = false;var G_SearchArea_Selection=\"\";var sButtonPosition=\"north\";</script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/resources/js/jquery/plugins/jquery.validate.min-1.8.1.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/resources/js/jquery/plugins/jquery.validate.extend.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/resources/js/as_stringbuffer.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/resources/js/as_autoScan.js\"> </script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/as_contextmenu.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/as_webcalendar.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/ow/as_dw_common.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/ow/as_dw_list_table.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/ow/as_dw_list_drag.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/ow/as_dw_list_page.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/ow/as_dw_list.js\"></script>\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/ow/color.js\"></script>\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/resources/css/date.css\"></link>\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/resources/css/ow/color.css\"></link>\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.print(sSkinPath);
-      out.write("/css/ow/color.css\"></link>\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/resources/css/ow/list.css\"></link>\n");
-      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
-      out.print(sWebRootPath);
-      out.print(sSkinPath);
-      out.write("/css/ow/list.css\"></link>\n");
+
+      out.write("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n");
+      out.write("<head>\n");
+      out.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=GBK\">\n");
+      out.write("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\">\n");
+      out.write("<link rel=\"shortcut icon\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/favicon.ico\">\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/resources/css/widget.css\">\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.print(sSkinPath);
+      out.write("/css/widget.css\">\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/resources/css/button.css\">\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.print(sSkinPath);
+      out.write("/css/button.css\">\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/resources/css/button_types.css\">\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/resources/fontawesome/css/font-awesome.min.css\">\n");
+      out.write("<script type=\"text/javascript\">window.history.forward(1);var sCompClientID=\"");
+      out.print(sCompClientID);
+      out.write("\";var sWebRootPath=\"");
+      out.print(sWebRootPath);
+      out.write("\";var sSkinPath=\"");
+      out.print(sSkinPath);
+      out.write("\";</script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/resources/js/jquery/jquery.min.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/jspf/js_var_global.jspf\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/as_common.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/as_control.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/as_widget.js\"></script>");
+/* 椤圭洰搴旂敤鎵╁睍鍐呭*/
+      out.write("\n");
+      out.write(" <script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Tenwa/Core/FlowManager/js/as_project.js\"></script>");
+      out.write("\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/resources/js/checkdatavalidity.js\"> </script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/common.js\"> </script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/message.js\"> </script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/resources/js/chart/json2.js\"></script>\n");
+      out.write("<!-- <script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/AppMain/resources/js/as_credit.js\"> </script> -->");
+      out.write("\n");
+      out.write("</head>\n");
+      out.write("<script>var G_FromFormatDoc = false;var G_SearchArea_Selection=\"\";var sButtonPosition=\"north\";</script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/resources/js/jquery/plugins/jquery.validate.min-1.8.1.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/resources/js/jquery/plugins/jquery.validate.extend.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/resources/js/as_stringbuffer.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/resources/js/as_autoScan.js\"> </script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/as_contextmenu.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/as_webcalendar.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/ow/as_dw_common.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/ow/as_dw_list_table.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/ow/as_dw_list_drag.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/ow/as_dw_list_page.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/ow/as_dw_list.js\"></script>\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/ow/color.js\"></script>\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/resources/css/date.css\"></link>\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/resources/css/ow/color.css\"></link>\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.print(sSkinPath);
+      out.write("/css/ow/color.css\"></link>\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/resources/css/ow/list.css\"></link>\n");
+      out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"");
+      out.print(sWebRootPath);
+      out.print(sSkinPath);
+      out.write("/css/ow/list.css\"></link>\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<script>G_SearchArea_Selection=\"");
-      out.print(CurConfig.getConfigure("ListQuerySelection").toString());
-      out.write("\";</script>\n");
-}
+
+      out.write("\n");
+      out.write("\t<script>G_SearchArea_Selection=\"");
+      out.print(CurConfig.getConfigure("ListQuerySelection").toString());
+      out.write("\";</script>\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("<body class=\"list_page\" onresize=\"javascript:change_height()\">\n");
-for(String outString : CurPage.getObjectWindowOutput()) out.print(outString);
-      out.write("\n");
-      out.write("<script type=\"text/javascript\">addSpecialCharacterValidate(getIdNames(0));</script>\n");
-      out.write("<div id=\"messageBox\" class=\"info_error_edoc\" style=\"display:none;\">\n");
-      out.write("    <div class=\"ow_righttop_close\" onclick=\"$(this).parent().hide();\" ></div>\n");
-      out.write("    <div class=\"info_error_rt\" onmousedown=\"AsLink.moveBoxOnDown(event, this.parentNode)\"></div>\n");
-      out.write("    <div class=\"info_error_eline\"></div>\n");
-      out.write("    <div class=\"info_error_txt\">\n");
-      out.write("       \t<ul class=\"info_error_ulstyle\" id=\"ul_error_0\">\n");
-      out.write("\t\t</ul>\n");
-      out.write("\t</div>\n");
-      out.write("\t<div class=\"info_error_txt\" id=\"showpart\">\n");
-      out.write("\t\t<ul class=\"info_error_ulstyle\" id=\"ul_error_1\">\n");
-      out.write("\t\t</ul>\n");
-      out.write("\t</div>\n");
-      out.write("\t<button class=\"info_error_mobtn\" id=\"mobtn\" name=\"btn\">");
-      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Show_more));
-      out.write("</button>\n");
-      out.write("    <button class=\"info_error_mobtn\" id=\"hidbtn\" name=\"btn\">");
-      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Collapse));
-      out.write("</button>\n");
-      out.write("</div>\n");
-      out.write("<table class=\"list_data_tablecommon\" id=\"ListTable\">\n");
-if(!com.amarsoft.are.lang.StringX.isSpace(sASNavigatorHtml)){
-      out.write("<tr height=1>\n");
-      out.write("\t<td valign=top>\n");
-      out.write("\t\t");
-      out.print(sASNavigatorHtml);
-      out.write("\n");
-      out.write("    </td>\n");
-      out.write("</tr>");
-}
-      out.write('\n');
-if(!com.amarsoft.are.lang.StringX.isSpace(sASWizardHtml)){
-      out.write("<tr height=1>\n");
-      out.write("\t<td valign=top>\n");
-      out.write("\t\t");
-      out.print(sASWizardHtml);
-      out.write("\n");
-      out.write("    </td>\n");
-      out.write("</tr>");
-}
-      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("<tr height=1 id=\"ButtonTR\">\n");
-      out.write("\t<td id=\"ListButtonArea\" class=\"listdw_out_buttonarea\" valign=top>\n");
-      out.write("\t\t");
-      out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
-      out.write("\n");
-      out.write("    </td>\n");
-      out.write("</tr>\n");
-}
-      out.write("\n");
-      out.write("<tr id=\"DWTR\">\n");
-      out.write("\t    <td class=\"listdw_out_data\" id=\"DWTD\" style=\"position:relative;\">\n");
-      out.write("\t    \t<div onmousedown=\"AsLink.moveBoxOnDown(event,this)\" onmouseover=\"AsLink.opacityBoxOnOver(this);\" onclick=\"AsLink.stopEvent(event);\" class=\"list_search list_search_nohover\" style=\"display:none;\">\n");
-      out.write("\t    \t\t<div id=\"TableFilter_AREA\" style=\"width:100%;\"></div><div onclick=\"FilterAreaHide()\" class=\"ow_righttop_close\"></div>\n");
-      out.write("\t    \t</div>\n");
-      out.write("\t\t\t<form name=\"listvalid0\" id=\"listvalid0\"><hidden name=\"element_listvalid0\" id=\"element_listvalid0\"></form>\n");
-      out.write("\t\t\t");
+
+      out.write('\n');
+      out.write("\n");
+      out.write("<body class=\"list_page\" onresize=\"javascript:change_height()\">\n");
+for(String outString : CurPage.getObjectWindowOutput()) out.print(outString);
+      out.write("\n");
+      out.write("<script type=\"text/javascript\">addSpecialCharacterValidate(getIdNames(0));</script>\n");
+      out.write("<div id=\"messageBox\" class=\"info_error_edoc\" style=\"display:none;\">\n");
+      out.write("    <div class=\"ow_righttop_close\" onclick=\"$(this).parent().hide();\" ></div>\n");
+      out.write("    <div class=\"info_error_rt\" onmousedown=\"AsLink.moveBoxOnDown(event, this.parentNode)\"></div>\n");
+      out.write("    <div class=\"info_error_eline\"></div>\n");
+      out.write("    <div class=\"info_error_txt\">\n");
+      out.write("       \t<ul class=\"info_error_ulstyle\" id=\"ul_error_0\">\n");
+      out.write("\t\t</ul>\n");
+      out.write("\t</div>\n");
+      out.write("\t<div class=\"info_error_txt\" id=\"showpart\">\n");
+      out.write("\t\t<ul class=\"info_error_ulstyle\" id=\"ul_error_1\">\n");
+      out.write("\t\t</ul>\n");
+      out.write("\t</div>\n");
+      out.write("\t<button class=\"info_error_mobtn\" id=\"mobtn\" name=\"btn\">");
+      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Show_more));
+      out.write("</button>\n");
+      out.write("    <button class=\"info_error_mobtn\" id=\"hidbtn\" name=\"btn\">");
+      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Collapse));
+      out.write("</button>\n");
+      out.write("</div>\n");
+      out.write("<table class=\"list_data_tablecommon\" id=\"ListTable\">\n");
+if(!com.amarsoft.are.lang.StringX.isSpace(sASNavigatorHtml)){
+      out.write("<tr height=1>\n");
+      out.write("\t<td valign=top>\n");
+      out.write("\t\t");
+      out.print(sASNavigatorHtml);
+      out.write("\n");
+      out.write("    </td>\n");
+      out.write("</tr>");
+}
+      out.write('\n');
+if(!com.amarsoft.are.lang.StringX.isSpace(sASWizardHtml)){
+      out.write("<tr height=1>\n");
+      out.write("\t<td valign=top>\n");
+      out.write("\t\t");
+      out.print(sASWizardHtml);
+      out.write("\n");
+      out.write("    </td>\n");
+      out.write("</tr>");
+}
+      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("<tr height=1 id=\"ButtonTR\">\n");
+      out.write("\t<td id=\"ListButtonArea\" class=\"listdw_out_buttonarea\" valign=top>\n");
+      out.write("\t\t");
+      out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
+      out.write("\n");
+      out.write("    </td>\n");
+      out.write("</tr>\n");
+}
+      out.write("\n");
+      out.write("<tr id=\"DWTR\">\n");
+      out.write("\t    <td class=\"listdw_out_data\" id=\"DWTD\" style=\"position:relative;\">\n");
+      out.write("\t    \t<div onmousedown=\"AsLink.moveBoxOnDown(event,this)\" onmouseover=\"AsLink.opacityBoxOnOver(this);\" onclick=\"AsLink.stopEvent(event);\" class=\"list_search list_search_nohover\" style=\"display:none;\">\n");
+      out.write("\t    \t\t<div id=\"TableFilter_AREA\" style=\"width:100%;\"></div><div onclick=\"FilterAreaHide()\" class=\"ow_righttop_close\"></div>\n");
+      out.write("\t    \t</div>\n");
+      out.write("\t\t\t<form name=\"listvalid0\" id=\"listvalid0\"><hidden name=\"element_listvalid0\" id=\"element_listvalid0\"></form>\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<div id=\"TableFilter_DIV_PARENT\">\n");
-      out.write("\t\t\t\t<!-- <div id=\"TableFilter_AREA\" style=\"display:none\"></div> -->\n");
-      out.write("\t\t\t</div>\n");
-      out.write("\t\t\t<div id=\"Table_Content_0\"></div>\n");
-      out.write("\t\t\t\n");
-      out.write("\t\t\t");
-      out.write('\n');
+			
+      out.write("\n");
+      out.write("\t\t\t<div id=\"TableFilter_DIV_PARENT\">\n");
+      out.write("\t\t\t\t<!-- <div id=\"TableFilter_AREA\" style=\"display:none\"></div> -->\n");
+      out.write("\t\t\t</div>\n");
+      out.write("\t\t\t<div id=\"Table_Content_0\"></div>\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("<div id=\"TableFilter\" class=\"list_filter_div\"><input type=\"text\" name=\"Input_Filter\" id=\"Input_Filter\" value=\"\" onkeypress=\"if(event.keyCode==13){filterValues[this.parentNode.getAttribute('tableId')][this.parentNode.colIndex]=this.value;tableSearchFromInput(document.getElementsByName('search')[0]);}\" onChange=\"filterValues[this.parentNode.getAttribute('tableId')][this.parentNode.colIndex]=this.value\"><div id=\"CheckBox_Filter\"></div>\n");
-      out.write("\t<table><tr>\n");
-      out.write("\t<td>\n");
-      out.write("\t");
-      out.print(new Button(btFIlter1).getHtmlText());
-      out.write("\n");
-      out.write("\t</td>\n");
-      out.write("\t<td>\n");
-      out.write("\t");
-      out.print(new Button(btFIlter2).getHtmlText());
-      out.write("\n");
-      out.write("\t</td>\n");
-      out.write("\t<td>\n");
-      out.write("\t");
-      out.print(new Button(btFIlter20).getHtmlText());
-      out.write("\n");
-      out.write("\t</td>\n");
-      out.write("\t<td>\n");
-      out.write("\t");
-      out.print(new Button(btFIlter21).getHtmlText());
-      out.write("\n");
-      out.write("\t</td>\n");
-      out.write("\t</tr></table>\n");
-      out.write("</div>\n");
-      out.write("<div id=\"TableFullFilter_myiframe0\" class=\"list_filter_div list_fulllfilter_div\" style=\"display:none;overflow-x:hiden;overflow-y:auto;\">\n");
-      out.write("\t\n");
-      out.write("</div>\n");
-      out.write("<script>");
+
+      out.write("<div id=\"TableFilter\" class=\"list_filter_div\"><input type=\"text\" name=\"Input_Filter\" id=\"Input_Filter\" value=\"\" onkeypress=\"if(event.keyCode==13){filterValues[this.parentNode.getAttribute('tableId')][this.parentNode.colIndex]=this.value;tableSearchFromInput(document.getElementsByName('search')[0]);}\" onChange=\"filterValues[this.parentNode.getAttribute('tableId')][this.parentNode.colIndex]=this.value\"><div id=\"CheckBox_Filter\"></div>\n");
+      out.write("\t<table><tr>\n");
+      out.write("\t<td>\n");
+      out.write("\t");
+      out.print(new Button(btFIlter1).getHtmlText());
+      out.write("\n");
+      out.write("\t</td>\n");
+      out.write("\t<td>\n");
+      out.write("\t");
+      out.print(new Button(btFIlter2).getHtmlText());
+      out.write("\n");
+      out.write("\t</td>\n");
+      out.write("\t<td>\n");
+      out.write("\t");
+      out.print(new Button(btFIlter20).getHtmlText());
+      out.write("\n");
+      out.write("\t</td>\n");
+      out.write("\t<td>\n");
+      out.write("\t");
+      out.print(new Button(btFIlter21).getHtmlText());
+      out.write("\n");
+      out.write("\t</td>\n");
+      out.write("\t</tr></table>\n");
+      out.write("</div>\n");
+      out.write("<div id=\"TableFullFilter_myiframe0\" class=\"list_filter_div list_fulllfilter_div\" style=\"display:none;overflow-x:hiden;overflow-y:auto;\">\n");
+      out.write("\t\n");
+      out.write("</div>\n");
+      out.write("<script>");
 
 ButtonItem btFIlter3 = new ButtonItem("纭畾","纭畾","if(tableSearchFromInput()){openFilterArea('TableFilter_AREA',0,event);closeFullFilter(0,event);}");
 ButtonItem btFIlter4 = new ButtonItem("娓呯┖","娓呯┖","TableFactory.clearFilter(0);openFullFilter(0,event);openFilterArea('TableFilter_AREA',0,event);tableSearchFromInput();");
 ButtonItem btFIlter5 = new ButtonItem("杩斿洖","杩斿洖","closeFullFilter(0,event,true)");
 ButtonItem btFIlter6 = new ButtonItem("鍏抽棴","鍏抽棴","closeFullFilter(0,event)");
-
-      out.write("var sbDWFullFiterButtons = new StringBuffer();\n");
-      out.write("sbDWFullFiterButtons.append('<table><tr>');\n");
-      out.write("sbDWFullFiterButtons.append('<td> ");
-      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter3).getHtmlText()));
-      out.write("</td>');\n");
-      out.write("sbDWFullFiterButtons.append('<td>");
-      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter4).getHtmlText()));
-      out.write("</td>');\n");
-      out.write("sbDWFullFiterButtons.append('<td>");
-      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter5).getHtmlText()));
-      out.write("</td>');\n");
-      out.write("sbDWFullFiterButtons.append('<td>");
-      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter6).getHtmlText()));
-      out.write("</td>');\n");
-      out.write("sbDWFullFiterButtons.append('</tr></table>');\n");
-      out.write("DWFullFiterButtons = sbDWFullFiterButtons.toString();\n");
-      out.write("sbDWFullFiterButtons = new StringBuffer();\n");
-      out.write("sbDWFullFiterButtons.append('<table width=\"100%\"><tr><td align=center class=\"list_search_buttons\">');\n");
-      out.write("sbDWFullFiterButtons.append('<input type=\"button\" style=\"color:black;\" onclick=\"TablePage.pageCheckedData={};TablePage.pageUncheckedData={};submitFilterArea();FilterAreaHide();\" value=\"");
-      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Sure));
-      out.write("\" />');\n");
-      out.write("sbDWFullFiterButtons.append('<input type=\"button\" style=\"color:black;\" onclick=\"FilterAreaHide();\" value=\"");
-      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Cancel));
-      out.write("\" />');\n");
-      out.write("sbDWFullFiterButtons.append('<input type=\"button\" style=\"color:black;\" onclick=\"TableFactory.clearFilter(0);FilterAreaHide();FilterAreaShow(this, event);\" value=\"");
-      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Clear));
-      out.write("\" />');\n");
-      out.write("sbDWFullFiterButtons.append('</td></tr></table>');\n");
-      out.write("DWFullFiterButtons2 = sbDWFullFiterButtons.toString();\n");
-      out.write("</script>");
-      out.write("\n");
-      out.write("\t\t\t<!-- 鐢ㄤ簬瀵煎嚭鏁版嵁鏃堕渶瑕� form鎻愪氦 -->\n");
-      out.write("\t\t\t<div id=\"TABLE_SUBMIT_0\"></div>\n");
-      out.write("\t\t\t<!-- 鐢ㄤ簬鏁版嵁淇濆瓨鏃堕渶瑕� form鎻愪氦 -->\n");
-      out.write("\t\t\t<div id=\"TABLE_AS_SAVE_0\"></div>\n");
-      out.write("\t\t</td>\n");
-      out.write("\t</tr>\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<script>sButtonPosition=\"south\";</script>\n");
-      out.write("<tr height=1 id=\"ButtonTR\">\n");
-      out.write("\t<td id=\"ListButtonArea\" class=\"listdw_out_buttonarea\" valign=top>\n");
-      out.write("\t\t");
-      out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
-      out.write("\n");
-      out.write("    </td>\n");
-      out.write("</tr>\n");
-}
-      out.write("\n");
-      out.write("</table>\n");
+
+      out.write("var sbDWFullFiterButtons = new StringBuffer();\n");
+      out.write("sbDWFullFiterButtons.append('<table><tr>');\n");
+      out.write("sbDWFullFiterButtons.append('<td> ");
+      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter3).getHtmlText()));
+      out.write("</td>');\n");
+      out.write("sbDWFullFiterButtons.append('<td>");
+      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter4).getHtmlText()));
+      out.write("</td>');\n");
+      out.write("sbDWFullFiterButtons.append('<td>");
+      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter5).getHtmlText()));
+      out.write("</td>');\n");
+      out.write("sbDWFullFiterButtons.append('<td>");
+      out.print(com.amarsoft.awe.dw.ui.util.WordConvertor.convertJava2Js(new Button(btFIlter6).getHtmlText()));
+      out.write("</td>');\n");
+      out.write("sbDWFullFiterButtons.append('</tr></table>');\n");
+      out.write("DWFullFiterButtons = sbDWFullFiterButtons.toString();\n");
+      out.write("sbDWFullFiterButtons = new StringBuffer();\n");
+      out.write("sbDWFullFiterButtons.append('<table width=\"100%\"><tr><td align=center class=\"list_search_buttons\">');\n");
+      out.write("sbDWFullFiterButtons.append('<input type=\"button\" style=\"color:black;\" onclick=\"TablePage.pageCheckedData={};TablePage.pageUncheckedData={};submitFilterArea();FilterAreaHide();\" value=\"");
+      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Sure));
+      out.write("\" />');\n");
+      out.write("sbDWFullFiterButtons.append('<input type=\"button\" style=\"color:black;\" onclick=\"FilterAreaHide();\" value=\"");
+      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Cancel));
+      out.write("\" />');\n");
+      out.write("sbDWFullFiterButtons.append('<input type=\"button\" style=\"color:black;\" onclick=\"TableFactory.clearFilter(0);FilterAreaHide();FilterAreaShow(this, event);\" value=\"");
+      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Clear));
+      out.write("\" />');\n");
+      out.write("sbDWFullFiterButtons.append('</td></tr></table>');\n");
+      out.write("DWFullFiterButtons2 = sbDWFullFiterButtons.toString();\n");
+      out.write("</script>");
+      out.write("\n");
+      out.write("\t\t\t<!-- 鐢ㄤ簬瀵煎嚭鏁版嵁鏃堕渶瑕� form鎻愪氦 -->\n");
+      out.write("\t\t\t<div id=\"TABLE_SUBMIT_0\"></div>\n");
+      out.write("\t\t\t<!-- 鐢ㄤ簬鏁版嵁淇濆瓨鏃堕渶瑕� form鎻愪氦 -->\n");
+      out.write("\t\t\t<div id=\"TABLE_AS_SAVE_0\"></div>\n");
+      out.write("\t\t</td>\n");
+      out.write("\t</tr>\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<script>sButtonPosition=\"south\";</script>\n");
+      out.write("<tr height=1 id=\"ButtonTR\">\n");
+      out.write("\t<td id=\"ListButtonArea\" class=\"listdw_out_buttonarea\" valign=top>\n");
+      out.write("\t\t");
+      out.print(Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
+      out.write("\n");
+      out.write("    </td>\n");
+      out.write("</tr>\n");
+}
+      out.write("\n");
+      out.write("</table>\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("<div id=\"mm\" class=\"menu\" style=\"display:none;width:150px;\">\n");
-      out.write("\t<div onclick='javascript:window.location.reload();'>鍒锋柊</div>\n");
-      out.write("\t<div id=div_select_all_sep_1 style=\"display:none\" class=\"menu-sep\"></div>\n");
-      out.write("\t<div id=div_select_all_ok  style=\"display:none\"  onclick='javascript:selectAllRows(0,true)'>鍏ㄩ儴閫変腑</div>\n");
-      out.write("\t<div id=div_select_cancel  style=\"display:none\"  onclick='javascript:selectAllRows(0,false)'>鍏ㄩ儴鍙栨秷</div>\n");
-      out.write("\t");
+
+      out.write("\n");
+      out.write("<div id=\"mm\" class=\"menu\" style=\"display:none;width:150px;\">\n");
+      out.write("\t<div onclick='javascript:window.location.reload();'>鍒锋柊</div>\n");
+      out.write("\t<div id=div_select_all_sep_1 style=\"display:none\" class=\"menu-sep\"></div>\n");
+      out.write("\t<div id=div_select_all_ok  style=\"display:none\"  onclick='javascript:selectAllRows(0,true)'>鍏ㄩ儴閫変腑</div>\n");
+      out.write("\t<div id=div_select_cancel  style=\"display:none\"  onclick='javascript:selectAllRows(0,false)'>鍏ㄩ儴鍙栨秷</div>\n");
+      out.write("\t");
 
 	if(biButtonArray!=null){
 		out.println("<div class=\"menu-sep\"></div>");
@@ -550,81 +529,81 @@ ButtonItem [] biButtonArray = ItemHelp.getButtonItemArray(CurUser,sButtons,CurCo
 				//System.out.println("<div "+iconCls+" onclick=\""+ biButtonArray[i].getAction() +"\">"+biButtonArray[i].getText()+"</div>");
 			}
 		}
-	}
-      out.write("\n");
-      out.write("</div>");
-      out.write("\n");
-      out.write("<script type=\"text/javascript\">\n");
-      out.write("\t");
-if("true".equalsIgnoreCase(CurConfig.getConfigure("ListFuzzyQuery"))){
-      out.write("bListFuzzyQuery = true;");
-}
-      out.write("\n");
-      out.write("\t//浠ヤ笅浠ｇ爜涓嶈兘鏀惧埌as_dw_list.js涓紝鍚﹀垯鎵ц搴忓垪鍑洪敊浼氭姤鑴氭湰閿欒\n");
-      out.write("\tif(typeof(sumCol)!=\"undefined\"){\n");
-      out.write("\t\tfor(var col in sumCol){\n");
-      out.write("\t\t\tif(DZ[0][1][sumCol[col]]){\n");
-      out.write("\t\t\t\tDZ[0][1][sumCol[col]][14]=\"2\";\n");
-      out.write("\t\t\t\tDZ[0][1][sumCol[col]][12]=\"2\";\n");
-      out.write("\t\t\t}\n");
-      out.write("\t\t}\n");
-      out.write("\t}\n");
-      out.write("\tdocument.getElementById(\"Table_Content_0\").innerHTML = TableFactory.createTableHTML(0);\n");
-      out.write("\t\n");
-      out.write("\t//瀹氫箟鏄剧ず瑙勫垯\n");
-      out.write("\tif(DZ[0][6]){\n");
-      out.write("\t\tTableBuilder.setDisplayRule(\"myiframe0\",DZ[0][6]);\n");
-      out.write("\t}\n");
-      out.write("\t");
-if("true".equalsIgnoreCase(CurPage.getAttribute("HideScroll"))){/*鏉′欢鏄細涓�椤佃兘澶熷皢鏁版嵁灞曠ず瀹屽叏(涓嶉渶瑕佺炕椤�)銆佹暟鎹睍绀哄畬鍏ㄤ笉瓒呰繃椤甸潰鐨勮竟鐣�*/
-      out.write("\n");
-      out.write("\tif(s_p_c[0]==1)\n");
-      out.write("\t$(\"#myiframe0_static >div,#myiframe0_float >div,#myiframe0_cells\").css({\n");
-      out.write("\t\t\"overflow-x\":\"hidden\",\n");
-      out.write("\t\t\"overflow-y\":\"hidden\"\n");
-      out.write("\t});\n");
-      out.write("\t");
-}
-      out.write("\n");
-      out.write("\t//if(window.afterSearch)afterSearch();\n");
-      out.write("\tif(typeof(rowSpan)!=\"string\")\n");
-      out.write("\tlightRow(0,0);//楂樹寒绗竴琛孿n");
-      out.write("\tvar oldLeftTD = 0;\n");
-      out.write("</script>\n");
-      out.write("</body>\n");
-      out.write("<script type=\"text/javascript\">\n");
+	}
+      out.write("\n");
+      out.write("</div>");
+      out.write("\n");
+      out.write("<script type=\"text/javascript\">\n");
+      out.write("\t");
+if("true".equalsIgnoreCase(CurConfig.getConfigure("ListFuzzyQuery"))){
+      out.write("bListFuzzyQuery = true;");
+}
+      out.write("\n");
+      out.write("\t//浠ヤ笅浠ｇ爜涓嶈兘鏀惧埌as_dw_list.js涓紝鍚﹀垯鎵ц搴忓垪鍑洪敊浼氭姤鑴氭湰閿欒\n");
+      out.write("\tif(typeof(sumCol)!=\"undefined\"){\n");
+      out.write("\t\tfor(var col in sumCol){\n");
+      out.write("\t\t\tif(DZ[0][1][sumCol[col]]){\n");
+      out.write("\t\t\t\tDZ[0][1][sumCol[col]][14]=\"2\";\n");
+      out.write("\t\t\t\tDZ[0][1][sumCol[col]][12]=\"2\";\n");
+      out.write("\t\t\t}\n");
+      out.write("\t\t}\n");
+      out.write("\t}\n");
+      out.write("\tdocument.getElementById(\"Table_Content_0\").innerHTML = TableFactory.createTableHTML(0);\n");
+      out.write("\t\n");
+      out.write("\t//瀹氫箟鏄剧ず瑙勫垯\n");
+      out.write("\tif(DZ[0][6]){\n");
+      out.write("\t\tTableBuilder.setDisplayRule(\"myiframe0\",DZ[0][6]);\n");
+      out.write("\t}\n");
+      out.write("\t");
+if("true".equalsIgnoreCase(CurPage.getAttribute("HideScroll"))){/*鏉′欢鏄細涓�椤佃兘澶熷皢鏁版嵁灞曠ず瀹屽叏(涓嶉渶瑕佺炕椤�)銆佹暟鎹睍绀哄畬鍏ㄤ笉瓒呰繃椤甸潰鐨勮竟鐣�*/
+      out.write("\n");
+      out.write("\tif(s_p_c[0]==1)\n");
+      out.write("\t$(\"#myiframe0_static >div,#myiframe0_float >div,#myiframe0_cells\").css({\n");
+      out.write("\t\t\"overflow-x\":\"hidden\",\n");
+      out.write("\t\t\"overflow-y\":\"hidden\"\n");
+      out.write("\t});\n");
+      out.write("\t");
+}
+      out.write("\n");
+      out.write("\t//if(window.afterSearch)afterSearch();\n");
+      out.write("\tif(typeof(rowSpan)!=\"string\")\n");
+      out.write("\tlightRow(0,0);//楂樹寒绗竴琛孿n");
+      out.write("\tvar oldLeftTD = 0;\n");
+      out.write("</script>\n");
+      out.write("</body>\n");
+      out.write("<script type=\"text/javascript\">\n");
 
 ASDataObject asoFRequest = (ASDataObject)request.getAttribute("ASDataObject");
 if(asoFRequest!=null){
 	out.println(asoFRequest.getScriptFunctions());
 	request.removeAttribute("ASDataObject");
 }
-
-      out.write("\n");
-      out.write("function as_defaultExport(reson){\n");
-      out.write("\texportPage('");
-      out.print(sWebRootPath);
-      out.write("',0,'excel','");
-      out.print(dwTemp.getArgsValue());
-      out.write("',\"Reason=\"+reson);\n");
-      out.write("}\n");
-      out.write("</script>\n");
-      out.write("\n");
-      out.write("<div class=\"datawindow_overdiv_top\" id=\"DWOverLayoutDiv\">\n");
-      out.write("\t<iframe  style=\"position:absolute;z-index:-1;width:100%;height:100%;top:0;left:0\" frameborder=\"0\" src=\"");
-      out.print(com.amarsoft.awe.util.Escape.getBlankHtml(sWebRootPath));
-      out.write("\"></iframe>\n");
-      out.write("</div>\t\n");
-      out.write("<div class=\"datawindow_overdiv_subdiv\" id=\"DWOverLayoutSubDiv\" style=\"overflow:visible\">\n");
-      out.write("\t<div class=\"datawindow_overdiv_title\">&nbsp;<span id=\"sp_datawindow_overdiv_top\" style=\"cursor:pointer;\" title=\"");
-      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Sure) );
-      out.write("\" onclick=\"autoCloseDWDialog()\">&nbsp;[");
-      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Sure) );
-      out.write("]&nbsp;</span></div>\n");
-      out.write("\t<div class=\"datawindow_overdiv_info\"></div>\n");
-      out.write("</div>");
-      out.write('\n');
-      out.write('\n');
+
+      out.write("\n");
+      out.write("function as_defaultExport(reson){\n");
+      out.write("\texportPage('");
+      out.print(sWebRootPath);
+      out.write("',0,'excel','");
+      out.print(dwTemp.getArgsValue());
+      out.write("',\"Reason=\"+reson);\n");
+      out.write("}\n");
+      out.write("</script>\n");
+      out.write("\n");
+      out.write("<div class=\"datawindow_overdiv_top\" id=\"DWOverLayoutDiv\">\n");
+      out.write("\t<iframe  style=\"position:absolute;z-index:-1;width:100%;height:100%;top:0;left:0\" frameborder=\"0\" src=\"");
+      out.print(com.amarsoft.awe.util.Escape.getBlankHtml(sWebRootPath));
+      out.write("\"></iframe>\n");
+      out.write("</div>\t\n");
+      out.write("<div class=\"datawindow_overdiv_subdiv\" id=\"DWOverLayoutSubDiv\" style=\"overflow:visible\">\n");
+      out.write("\t<div class=\"datawindow_overdiv_title\">&nbsp;<span id=\"sp_datawindow_overdiv_top\" style=\"cursor:pointer;\" title=\"");
+      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Sure) );
+      out.write("\" onclick=\"autoCloseDWDialog()\">&nbsp;[");
+      out.print(LanguageManager.getOWSystemLanguage(CurUser.getLanguage(), JspfText.Sure) );
+      out.write("]&nbsp;</span></div>\n");
+      out.write("\t<div class=\"datawindow_overdiv_info\"></div>\n");
+      out.write("</div>");
+      out.write('\n');
+      out.write('\n');
 
 Vector<Parameter> param=CurComp.getParameterList();
 String newParam="";
@@ -638,70 +617,70 @@ for(int i=0;i<param.size();i++){
 } 
 String sourceUrl=CurComp.getAttribute("ComponentURL");
 String newtarget=CurComp.getAttribute("TargetWindow");
-
-      out.write("\n");
-      out.write("<script language=\"javascript\">\n");
-      out.write("function pagereload(pagesize){\n");
-      out.write("\tvar purl=\"");
-      out.print(sourceUrl);
-      out.write("\";\n");
-      out.write("\tvar param=\"");
-      out.print(newParam);
-      out.write("\";\n");
-      out.write("\tparam=param+\"&PageSize=\"+pagesize;\n");
-      out.write("\tvar starget=\"");
-      out.print(newtarget);
-      out.write("\";\n");
-      out.write("\tparent.AsControl.OpenView(purl,param,starget);\n");
-      out.write("}\n");
-      out.write("function pageSizeChange(){\n");
-      out.write("\tvar checkText=$(\"#mySelectPageSize\").find(\"option:selected\").text(); \n");
-      out.write("\tpagereload(checkText);\n");
-      out.write("}\n");
-      out.write("$(function(){\n");
-      out.write("\tvar pagesize=[10,20,50,100,200,500,1000];\n");
-      out.write("\tvar options=\"\";\n");
-      out.write("\tvar curpage=\"");
-      out.print(pagesize);
-      out.write("\";\n");
-      out.write("\tvar selected=\"\";\n");
-      out.write("\tfor(var i=0;i<pagesize.length;i++){\n");
-      out.write("\t\tif(curpage==pagesize[i]){selected=\"selected='selected'\"}else{selected=\"\";}\n");
-      out.write("\t\toptions+=\"<option value='\"+pagesize[i]+\"'\"+selected+\"  >\"+pagesize[i]+\"</option>\";\n");
-      out.write("}\n");
-      out.write("$(\"#Page_myiframe0\").append(\"<div class='list_page_subdiv'><select  style='margin-top:10px;' id='mySelectPageSize' onchange='pageSizeChange()'>\"+options+\"</div>\");});\n");
-      out.write("</script>");
-      out.write("\r\n");
-      out.write("<script type=\"text/javascript\">\r\n");
-      out.write("\tfunction newRecord(){\r\n");
-      out.write("\t\t var sUrl = \"/money/sourceOfFundsInfo.jsp\";\r\n");
-      out.write("\t\t AsControl.OpenView(sUrl,'','_self','');\r\n");
-      out.write("\t}\r\n");
-      out.write("\tfunction viewAndEdit(){\r\n");
-      out.write("\t\t var sUrl = \"/money/sourceOfFundsInfo.jsp\";\r\n");
-      out.write("\t\t var sPara = getItemValue(0,getRow(0),'ID');\r\n");
-      out.write("\t\t if(typeof(sPara)==\"undefined\" || sPara.length==0 ){\r\n");
-      out.write("\t\t\talert(\"鍙傛暟涓嶈兘涓虹┖锛乗");\r\n");
-      out.write("\t\t\treturn ;\r\n");
-      out.write("\t\t }\r\n");
-      out.write("\t\tAsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');\r\n");
-      out.write("\t}\r\n");
-      out.write("</script>\r\n");
+
+      out.write("\n");
+      out.write("<script language=\"javascript\">\n");
+      out.write("function pagereload(pagesize){\n");
+      out.write("\tvar purl=\"");
+      out.print(sourceUrl);
+      out.write("\";\n");
+      out.write("\tvar param=\"");
+      out.print(newParam);
+      out.write("\";\n");
+      out.write("\tparam=param+\"&PageSize=\"+pagesize;\n");
+      out.write("\tvar starget=\"");
+      out.print(newtarget);
+      out.write("\";\n");
+      out.write("\tparent.AsControl.OpenView(purl,param,starget);\n");
+      out.write("}\n");
+      out.write("function pageSizeChange(){\n");
+      out.write("\tvar checkText=$(\"#mySelectPageSize\").find(\"option:selected\").text(); \n");
+      out.write("\tpagereload(checkText);\n");
+      out.write("}\n");
+      out.write("$(function(){\n");
+      out.write("\tvar pagesize=[10,20,50,100,200,500,1000];\n");
+      out.write("\tvar options=\"\";\n");
+      out.write("\tvar curpage=\"");
+      out.print(pagesize);
+      out.write("\";\n");
+      out.write("\tvar selected=\"\";\n");
+      out.write("\tfor(var i=0;i<pagesize.length;i++){\n");
+      out.write("\t\tif(curpage==pagesize[i]){selected=\"selected='selected'\"}else{selected=\"\";}\n");
+      out.write("\t\toptions+=\"<option value='\"+pagesize[i]+\"'\"+selected+\"  >\"+pagesize[i]+\"</option>\";\n");
+      out.write("}\n");
+      out.write("$(\"#Page_myiframe0\").append(\"<div class='list_page_subdiv'><select  style='margin-top:10px;' id='mySelectPageSize' onchange='pageSizeChange()'>\"+options+\"</div>\");});\n");
+      out.write("</script>");
+      out.write("\n");
+      out.write("<script type=\"text/javascript\">\n");
+      out.write("\tfunction newRecord(){\n");
+      out.write("\t\t var sUrl = \"/money/sourceOfFundsInfo.jsp\";\n");
+      out.write("\t\t AsControl.OpenView(sUrl,'','_self','');\n");
+      out.write("\t}\n");
+      out.write("\tfunction viewAndEdit(){\n");
+      out.write("\t\t var sUrl = \"/money/sourceOfFundsInfo.jsp\";\n");
+      out.write("\t\t var sPara = getItemValue(0,getRow(0),'ID');\n");
+      out.write("\t\t if(typeof(sPara)==\"undefined\" || sPara.length==0 ){\n");
+      out.write("\t\t\talert(\"鍙傛暟涓嶈兘涓虹┖锛乗");\n");
+      out.write("\t\t\treturn ;\n");
+      out.write("\t\t }\n");
+      out.write("\t\tAsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');\n");
+      out.write("\t}\n");
+      out.write("</script>\n");
 
 if(sCurRunMode!=null && sCurRunMode.equals("Development")){
-
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/as_debug.js\"></script>\n");
-      out.write("<script type=\"text/javascript\">AsDebug.URL=\"");
-      out.print(request.getRequestURL());
-      out.write("\";</script>\n");
-}else{
-      out.write("\n");
-      out.write("<script type=\"text/javascript\" src=\"");
-      out.print(sWebRootPath);
-      out.write("/Frame/page/js/as_cache.js\"></script>\n");
-}
+
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/as_debug.js\"></script>\n");
+      out.write("<script type=\"text/javascript\">AsDebug.URL=\"");
+      out.print(request.getRequestURL());
+      out.write("\";</script>\n");
+}else{
+      out.write("\n");
+      out.write("<script type=\"text/javascript\" src=\"");
+      out.print(sWebRootPath);
+      out.write("/Frame/page/js/as_cache.js\"></script>\n");
+}
 
 }catch(Exception e){
    	if(Sqlca!=null) Sqlca.rollback();
@@ -715,26 +694,26 @@ if(sCurRunMode!=null && sCurRunMode.equals("Development")){
         Sqlca = null;
     }
 }
-
-/* 椤圭洰搴旂敤鎵╁睍鍐呭 */
-      out.write("\n");
-      out.write("</html>");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
+
+/* 椤圭洰搴旂敤鎵╁睍鍐呭 */
+      out.write("\n");
+      out.write("</html>");
+    } catch (java.lang.Throwable t) {
+      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
+        out = _jspx_out;
+        if (out != null && out.getBufferSize() != 0)
+          try {
+            if (response.isCommitted()) {
+              out.flush();
+            } else {
+              out.clearBuffer();
+            }
+          } catch (java.io.IOException e) {}
+        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
+        else throw new ServletException(t);
+      }
+    } finally {
+      _jspxFactory.releasePageContext(_jspx_page_context);
+    }
+  }
+}