diff --git a/.classpath b/.classpath
deleted file mode 100644
index 1e93645e3..000000000
--- a/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.tomcatplugin b/.tomcatplugin
deleted file mode 100644
index 546ecaf04..000000000
--- a/.tomcatplugin
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- /WebContent
- false
- true
- false
- true
-
-
- /apzl
-
diff --git a/WebContent/404.html b/WebContent/404.html
new file mode 100644
index 000000000..04f59e365
--- /dev/null
+++ b/WebContent/404.html
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+App应用下载
+
+
+
+
+
+
+
+
404
+
+ 下载文件不存在!
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/406.html b/WebContent/406.html
new file mode 100644
index 000000000..e8a5ec03e
--- /dev/null
+++ b/WebContent/406.html
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+南方租赁
+
+
+
+
+
+
+
+
406
+
+ 当前为APP服务,WEB无效访问权限!
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
index ecd2accee..5b55cc478 100644
--- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
@@ -11,7 +11,7 @@
String sTempletNo = "DDepositReturn_TempInfo";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
- doTemp.setColTips("", "测试");
+ /* doTemp.setColTips("", "测试"); */
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//只读模式
diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index 88a2ebe31..ec24fe9bd 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -11,7 +11,7 @@
String sTempletNo = "DMarginChargeInfo_Temp";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
- doTemp.setColTips("", "测试");
+/* doTemp.setColTips("", "测试"); */
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//只读模式
diff --git a/WebContent/Flow/DealerDepositChargeApplyList.jsp b/WebContent/Flow/DealerDepositChargeApplyList.jsp
index 6afed6e95..da6a2c25a 100644
--- a/WebContent/Flow/DealerDepositChargeApplyList.jsp
+++ b/WebContent/Flow/DealerDepositChargeApplyList.jsp
@@ -4,7 +4,7 @@
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorCar.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorCar.jsp
new file mode 100644
index 000000000..5d875ed66
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorCar.jsp
@@ -0,0 +1,20 @@
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+/*
+ 页面说明: 示例上下联动框架页面
+ */
+ String distributorId = CurPage.getParameter("distributorId");
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorInfo.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorInfo.jsp
new file mode 100644
index 000000000..4ba45a7b3
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorInfo.jsp
@@ -0,0 +1,29 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-08
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "";
+
+ String sTempletNo = "LmDistributorInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("distributorId"));
+
+ String sButtons[][] = {
+ //{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+ //{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorList.jsp
new file mode 100644
index 000000000..473a591b9
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorList.jsp
@@ -0,0 +1,40 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-06
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_LIST");
+ 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[][] = {
+ {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ {"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToCarList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToCarList.jsp
new file mode 100644
index 000000000..5ef5c7cfb
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToCarList.jsp
@@ -0,0 +1,63 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-06
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_TO_CAR");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ String distributorId = CurPage.getParameter("DISTRIBUTOR_ID");
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow(distributorId);
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ {"true","","Button","删除","删除","asDelete()","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmORGPortalList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmORGPortalList.jsp
new file mode 100644
index 000000000..5b5e76b01
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmORGPortalList.jsp
@@ -0,0 +1,70 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-06
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("LM_ORG_LIST");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+// String type = CurPage.getParameter("type");
+// if(type == null) type = "";
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+// if("portal".equals(type)){
+// doTemp.setVisible("EDIT",false);
+// }
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ {"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmOrgInfo.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmOrgInfo.jsp
new file mode 100644
index 000000000..456948514
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmOrgInfo.jsp
@@ -0,0 +1,29 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-08
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "";
+
+ String sTempletNo = "LmOrgInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ORGID"));
+
+ String sButtons[][] = {
+ {"false","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+ {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp b/WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp
new file mode 100644
index 000000000..446437983
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp
@@ -0,0 +1,66 @@
+<%@page import="org.apache.poi.poifs.property.Parent"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-07
+ Content:
+ History Log:
+ */
+ String TYPENO= CurPage.getParameter("TYPENO");
+ ASObjectModel doTemp = new ASObjectModel("LmProductAndCarList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow(TYPENO);
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ {"true","","Button","删除","删除","asDelete()","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCar/LmProductCarInfo.jsp b/WebContent/Tenwa/Apzl/productCar/LmProductCarInfo.jsp
new file mode 100644
index 000000000..8ae5bfcb0
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCar/LmProductCarInfo.jsp
@@ -0,0 +1,32 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-06
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "";
+
+ String sTempletNo = "LmProductCarInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("TYPENO"));
+
+ String sButtons[][] = {
+ //{"true","All","Button","保存","保存所有修改","save()","","","",""},
+ //{"true","All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCar/LmProductCarList.jsp b/WebContent/Tenwa/Apzl/productCar/LmProductCarList.jsp
new file mode 100644
index 000000000..64e7c5471
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCar/LmProductCarList.jsp
@@ -0,0 +1,59 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-06
+ Content:
+ History Log:
+ */
+ String PG_TITLE ="汽车产品列表";
+ String TYPENO= CurPage.getParameter("TYPENO");
+ ASObjectModel doTemp = new ASObjectModel("LmProductCarList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow(TYPENO);
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCar/LmProductUpAndDown.jsp b/WebContent/Tenwa/Apzl/productCar/LmProductUpAndDown.jsp
new file mode 100644
index 000000000..b576213b9
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCar/LmProductUpAndDown.jsp
@@ -0,0 +1,20 @@
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+/*
+ 页面说明: 示例上下联动框架页面
+ */
+ String TYPENO = CurPage.getParameter("TYPENO");
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp
index 04ffe6df5..a5ea16301 100644
--- a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp
+++ b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp
@@ -142,6 +142,9 @@ $(function(){
paramJson["CustomerNature"]="<%=startMap.get("CustomerNature")%>";
paramJson["CUSTOMERID"]="<%=startMap.get("CUSTOMERID")%>";
paramJson["ContractId"]="<%=startMap.get("ContractId")%>";
+ paramJson["carAttributes"]="<%=startMap.get("carAttributes")%>";
+ paramJson["leasehold"]="<%=startMap.get("leasehold")%>";
+ paramJson["modelid"]="<%=startMap.get("modelid")%>";
//paramJson["CurFlowUser"]="<%=FlowFixedParam.get("CurFlowUser")%>";
//paramJson["AgentFlowUser"]="<%=FlowFixedParam.get("AgentFlowUser")%>";
diff --git a/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarInfo.jsp b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarInfo.jsp
new file mode 100644
index 000000000..f27ca858d
--- /dev/null
+++ b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarInfo.jsp
@@ -0,0 +1,76 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-07
+ Content: 示例详情页面
+ History Log:
+ */
+ String id = CurPage.getParameter("id");
+ String product_id = CurPage.getParameter("product_id");
+ String name = CurUser.getUserName();
+ String orgName = CurUser.getOrgName();
+ /* Date d = new Date();
+ System.out.print(d); */
+ /* if(sPrevUrl == null) sPrevUrl = ""; */
+ String sTempletNo = "LB_PRODUCT_CAR_INFO";//--模板号--
+ 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("product_id"));
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("id"));
+
+ String sButtons[][] = {
+ {"true","All","Button","保存","保存所有修改","save()","","","",""},
+ {"true","All","Button","返回","返回列表","returnList()","","","",""}
+ };
+/* sButtonPosition = "south"; */
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarList.jsp b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarList.jsp
new file mode 100644
index 000000000..301c5774d
--- /dev/null
+++ b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarList.jsp
@@ -0,0 +1,50 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-05
+ Content:
+ History Log:
+ */
+ String product_id = CurPage.getParameter("product_id");
+ ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_CAR_LIST");
+ if (""!=product_id || null==product_id){
+ doTemp.appendJboWhere("lpi.product_id='"+product_id+"'");
+ }
+ 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",""},
+ {"true","","Button","返回","返回","returnList()","","","","btn_icon_return",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductInfoList.jsp b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductInfoList.jsp
new file mode 100644
index 000000000..57be3d5b8
--- /dev/null
+++ b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductInfoList.jsp
@@ -0,0 +1,39 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-06
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_INFO_LIST");
+ 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","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvage.jsp b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvage.jsp
new file mode 100644
index 000000000..154388a05
--- /dev/null
+++ b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvage.jsp
@@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-06-09
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_SALVAGE");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvageInfo.jsp b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvageInfo.jsp
new file mode 100644
index 000000000..0eb1d9340
--- /dev/null
+++ b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvageInfo.jsp
@@ -0,0 +1,45 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-09
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("id");
+ /* if(sPrevUrl == null) sPrevUrl = ""; */
+
+ String sTempletNo = "LB_PRODUCT_SALVAGE_INFO";//--模板号--
+ 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","保存","保存所有修改","save()","","","",""},
+ {"true","All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ /* sButtonPosition = "south"; */
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp b/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp
index 652daf38f..82634a139 100644
--- a/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp
@@ -18,78 +18,84 @@
{"true","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_set",""},
{"true","","Button","删除","删除","doDelete()","","","","btn_icon_delete",""},
- {"true","","Button","立即发送","立即发送","sendMessage()","","","","btn_icon_message",""}
+ {"true","","Button","立即发送","立即发送","sendMessage()","","","","btn_icon_message",""},
+ {"true","","Button","余额查询","余额查询","doSelect()","","","","btn_icon_information",""}
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp b/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp
index c0debe5a4..1c993c7f7 100644
--- a/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp
@@ -34,6 +34,7 @@
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp b/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp
index 61d90793e..6891c9f56 100644
--- a/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp
+++ b/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp
@@ -24,6 +24,50 @@
sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/ClearRecord/LbClearFileRecordList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/ClearRecord/LbClearFileRecordList.jsp
new file mode 100644
index 000000000..c4401ecd8
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/ClearRecord/LbClearFileRecordList.jsp
@@ -0,0 +1,56 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-10-30
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("LbClearFileRecordList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""},
+ {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcAuditRentFileList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcAuditRentFileList.jsp
new file mode 100644
index 000000000..cf6bdffd7
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcAuditRentFileList.jsp
@@ -0,0 +1,79 @@
+<%@page import="com.tenwa.comm.util.date.DateAssistant"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-09-20
+ Content:
+ History Log:
+ */
+ String plan_date = DateAssistant.getToday();
+ ASObjectModel doTemp = new ASObjectModel("ViLcFirstAuditRentFileList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"false","All","Button","审核","确认审核通过","if(confirm('确定要提交审核吗?')){auditRecord()}","","","","btn_icon_add",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyInfo.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyInfo.jsp
new file mode 100644
index 000000000..804bdb519
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyInfo.jsp
@@ -0,0 +1,30 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-06-11
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "";
+
+ String sTempletNo = "CustomerBankVertifyInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.setColTips("", "测试");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ //dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo"));
+
+ String sButtons[][] = {
+ {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+ {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp
new file mode 100644
index 000000000..82dbf9f46
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp
@@ -0,0 +1,93 @@
+<%@page import="com.tenwa.comm.util.date.DateAssistant"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-09-20
+ Content:
+ History Log:
+ */
+ String plan_date = DateAssistant.getToday();
+ ASObjectModel doTemp = new ASObjectModel("CustomerBankVertifyList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ 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","验证银行卡信息","验证银行卡信息","verifyBankInfo()","","","","btn_icon_add",""},
+ {"true","All","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_add",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcFirstAuditRentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcFirstAuditRentPlanList.jsp
index 6c17e713a..a41b3a8a5 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcFirstAuditRentPlanList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcFirstAuditRentPlanList.jsp
@@ -1,71 +1,71 @@
-<%@page import="com.tenwa.comm.util.date.DateAssistant"%>
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
- /*
- Author: undefined 2017-09-20
- Content:
- History Log:
- */
- String plan_date = DateAssistant.getToday();
- ASObjectModel doTemp = new ASObjectModel("ViLcFirstAuditRentPlanList");
- //默认预查询
- doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE = '"+plan_date+"' ");
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
- dwTemp.Style="1"; //--设置为Grid风格--
- dwTemp.MultiSelect = true; //多选
- 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","审核","确认审核通过","if(confirm('确定要提交审核吗?')){auditRecord()}","","","","btn_icon_add",""},
- };
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
-
+<%@page import="com.tenwa.comm.util.date.DateAssistant"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-09-20
+ Content:
+ History Log:
+ */
+ String plan_date = DateAssistant.getToday();
+ ASObjectModel doTemp = new ASObjectModel("ViLcFirstAuditRentPlanList");
+ //默认预查询
+ doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE = '"+plan_date+"' ");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ 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","审核","确认审核通过","if(confirm('确定要提交审核吗?')){auditRecord()}","","","","btn_icon_add",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
index 58de2e2e1..dec53b87a 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
@@ -1,126 +1,198 @@
-<%@page import="com.tenwa.comm.util.date.DateAssistant"%>
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
- /*
- Author: undefined 2017-09-20
- Content:
- History Log:
- */
-
- String plan_date = DateAssistant.getToday();
- ASObjectModel doTemp = new ASObjectModel("ViLcReviewAuditRentPlanList");
- doTemp.setJboWhere(" O.AUDIT_STATE = 'Y'");
- //默认预查询
- doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE = '"+plan_date+"' and O.COLLECT_STATUS in ('1','2','4','5') ");
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
- dwTemp.Style="1"; //--设置为Grid风格--
- dwTemp.MultiSelect = true; //多选
- dwTemp.ReadOnly = "1"; //只读模式
- dwTemp.setPageSize(10);
- dwTemp.ShowSummary = "1"; //显示小计
- dwTemp.genHTMLObjectWindow("");
-
- //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
- String sButtons[][] = {
- {"true","All","Button","扣款","扣款","batchCollect()","","","","btn_icon_add",""},
- {"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""},
- };
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
-
+<%@page import="com.tenwa.comm.util.date.DateAssistant"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-09-20
+ Content:
+ History Log:
+ */
+
+ String plan_date = DateAssistant.getToday();
+ ASObjectModel doTemp = new ASObjectModel("ViLcReviewAuditRentPlanList");
+ doTemp.setJboWhere(" O.AUDIT_STATE = 'Y'");
+ //默认预查询
+ doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE = '"+plan_date+"' and O.COLLECT_STATUS in ('未收款','部分收款') ");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.ShowSummary = "1"; //显示小计
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","批量扣款","批量扣款","batchCollect()","","","","btn_icon_add",""},
+ {"true","All","Button","实时扣款","实时扣款","timelyCollect()","","","","btn_icon_add",""},
+ {"true","All","Button","手工扣款","手工扣款","afterCollectManage()","","","","btn_icon_add",""},
+ {"false","All","Button","查询批量扣款","查询批量扣款","queryBatchCollect()","","","","btn_icon_add",""},
+ {"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
new file mode 100644
index 000000000..0d7f2142a
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
@@ -0,0 +1,328 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-09-28
+ Content:
+ History Log:
+ */
+ String custtype = CurPage.getParameter("CustomerType");
+ String projectId = CurPage.getParameter("ProjectId");
+// String signStatus = CurPage.getParameter("SignStatus");
+ String contractNumber = CurPage.getParameter("ContractNumber");
+ String productId = CurPage.getParameter("ProductId");
+ String flowunid = CurPage.getParameter("FlowUnid");
+ String action = CurPage.getParameter("action");
+ ASObjectModel doTemp = new ASObjectModel("LBContractPrintList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(20);
+ String id=projectId;
+ dwTemp.genHTMLObjectWindow(id+","+flowunid);
+ String btnflag = "true";
+ String btnflagcom = "false";
+ if("01".equals(custtype)){
+ btnflagcom = "true";
+ }
+ if("queryContract".equals(action)){
+ btnflag = "false";
+ btnflagcom = "false";
+ }
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {btnflag,"","Button","发起电子签约","电子签章合同","signOnLine()","","","","btn_icon_sign",""},
+ {btnflag,"","Button","查询签约结果","查询签约结果","getStatus()","","","","btn_icon_obtain",""},
+ {btnflag,"","Button","重新发送短信","重新发送短信","sendMessageAgain()","","","","btn_icon_refresh",""},
+ {btnflagcom,"","Button","下载纸质合同","下载纸质合同","downFile()","","","","btn_icon_down",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
index c3b7722c4..36a8837ad 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@@ -198,7 +198,6 @@
alert("请勾选合同模板!");
return;
}
-alert(tempids);
var param={};
var tempParam={};
var sparam="";
@@ -225,6 +224,7 @@ alert(tempids);
if(sReturn0.length>2){
alert(sReturn0);
}else{
+ RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdf","FlowUnid=<%=flowunid%>,flagType=word");
alert("生成成功");
}
reloadSelf();
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp
index 5a0b0077a..345381ca2 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp
@@ -51,6 +51,7 @@
String taskno=CurPage.getParameter("TaskNo");
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
+ String CustomerType=CurPage.getParameter("CustomerType");
%>
<%/*~END~*/%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index 60a6f4bd5..0640c2d25 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -49,6 +49,8 @@
String nodeNo=CurPage.getParameter("NodeNo");
String taskno=CurPage.getParameter("TaskNo");
String RightType= CurPage.getParameter("RightType");
+ String CarAttributes=CurPage.getParameter("CarAttributes");
+ String Leasehold=CurPage.getParameter("Leasehold");
%>
<%/*~END~*/%>
@@ -139,70 +141,53 @@
}
function getselectCarBrand(){
- var cityid = getItemValue(0,getRow(0),"cityid");
- if(typeof(cityid) == "undefined" || cityid.length == 0 ){
- AsDebug.showMessage("提示","请选择区域!","","",true);
- return;
- }
- var params = "cityid=" + cityid + "&carType=<%=carType%>";
- AsDialog.PopView("/Tenwa/Lease/App/Interface/CarInterface/CarBrand.jsp",params,
- "dialogWidth=800px;dialogHeight=600px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(myBrand){
- if(myBrand=="NO"){
- setItemReadOnly(0,0,"BRAND",false);
- setItemReadOnly(0,0,"VEHICLES",false);
- setItemReadOnly(0,0,"MODEL",false);
- setItemValue(0,0,"EVAL_PRICE","0");
- $('#GUIDEDPRICE').attr('disabled',false);
- setItemReadOnly(0,0,"DISPLACEMENT",false);
- }else{
- setItemReadOnly(0,0,"BRAND",true);
- setItemReadOnly(0,0,"VEHICLES",true);
- setItemReadOnly(0,0,"MODEL",true);
- $('#GUIDEDPRICE').attr('disabled',true);
- setItemReadOnly(0,0,"DISPLACEMENT",true);
- for (var key in myBrand){
- if(key=="guidedprice" || key=="eval_price" || key=="m_eval_price" || key=="purchaseprice"){
- setItemValue(0,0,key,myBrand[key]=="0"?"0":myBrand[key]*10000);
- }else{
- setItemValue(0,0,key,myBrand[key]);
- }
- }
- }
- },"车品牌选择");
+ <%/*~[Describe=选择车品牌;]~*/%>
+ var MyOjbect={};
+ 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_")
+ {
+ //alert(getHtmlMessage('1'));//请选择一条信息!
+ return;
+ }
+ sReturn = sReturn.split("@");
+ MyOjbect.brandid=sReturn[0];
+ MyOjbect.brandname=sReturn[1];
+ setItemValue(0,0,"BRAND",sReturn[1]);
+ },"请选择车品牌",'');
+
+// var cityid = getItemValue(0,getRow(0),"cityid");
+// if(typeof(cityid) == "undefined" || cityid.length == 0 ){
+// AsDebug.showMessage("提示","请选择区域!","","",true);
+// return;
+// }
+<%-- var params = "cityid=" + cityid + "&carType=<%=carType%>"; --%>
+// AsDialog.PopView("/Tenwa/Lease/App/Interface/CarInterface/CarBrand.jsp",params,
+// "dialogWidth=800px;dialogHeight=600px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(myBrand){
+// if(myBrand=="NO"){
+// setItemReadOnly(0,0,"BRAND",false);
+// setItemReadOnly(0,0,"VEHICLES",false);
+// setItemReadOnly(0,0,"MODEL",false);
+// setItemValue(0,0,"EVAL_PRICE","0");
+// $('#GUIDEDPRICE').attr('disabled',false);
+// setItemReadOnly(0,0,"DISPLACEMENT",false);
+// }else{
+// setItemReadOnly(0,0,"BRAND",true);
+// setItemReadOnly(0,0,"VEHICLES",true);
+// setItemReadOnly(0,0,"MODEL",true);
+// $('#GUIDEDPRICE').attr('disabled',true);
+// setItemReadOnly(0,0,"DISPLACEMENT",true);
+// for (var key in myBrand){
+// if(key=="guidedprice" || key=="eval_price" || key=="m_eval_price" || key=="purchaseprice"){
+// setItemValue(0,0,key,myBrand[key]=="0"?"0":myBrand[key]*10000);
+// }else{
+// setItemValue(0,0,key,myBrand[key]);
+// }
+// }
+// }
+// },"车品牌选择");
}
- function getselectProvinceAndCity(){
- AsDialog.PopView("/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp","",
- "dialogWidth=600px;dialogHeight=450px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sReturnInfo){
- if(sReturnInfo.length==0){
- return;
- }
- var brand = getItemValue(0,0,"BRAND");
- if (!(typeof(brand)=="undefined" || ""==brand || null==brand)){
- alert("城市已重新选择,需要重新选择车辆信息!");
- setItemValue(0,0,"BRAND","");
- setItemValue(0,0,"VEHICLES","");
- setItemValue(0,0,"MODEL","");
- setItemValue(0,0,"GUIDEDPRICE","");
- setItemValue(0,0,"INVOICEDPRICE","");
- setItemValue(0,0,"CARCOLOR","");
- setItemValue(0,0,"DISPLACEMENT","");
- setItemValue(0,0,"INVOICEDPRICE","");
- setItemValue(0,0,"FRAME_NUMBER","");
- }
- var cityid= sReturnInfo.split("@")[2];
- var cityname= sReturnInfo.split("@")[1]+sReturnInfo.split("@")[3];
- setItemValue(0,0,"cityid",cityid);
- setItemValue(0,0,"cityname",cityname);
- if(getItemValue(0,0,"ID")){
- setItemValue(0,0,"GUIDEDPRICE","0");
- setItemValue(0,0,"M_EVAL_PRICE","0");
- setItemValue(0,0,"EVAL_PRICE","0");
- setItemValue(0,0,"PURCHASEPRICE","0");
- setItemValue(0,0,"INVOICEDPRICE","0");
- }
- },"省份城市");
- }
<%/*~END~*/%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
index 7ef3e4279..010b437fe 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
@@ -43,6 +43,12 @@
String taskno=CurPage.getParameter("TaskNo");
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
+
+ String carAttributes=CurPage.getParameter("carAttributes");
+ String leasehold=CurPage.getParameter("leasehold");
+ String carSystem=CurPage.getParameter("carSystem");
+ System.out.print("+++++++++++++++++++++++++"+carSystem+"------------------");
+
%>
<%/*~END~*/%>
@@ -111,6 +117,11 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.
<%/*~END~*/%>
@@ -279,7 +303,7 @@
showItem(0,"product_id");//字段显示
}
}
- initRow();
+ //initRow();
<%/*~END~*/%>
diff --git a/WebContent/WEB-INF/etc/a3web.xml b/WebContent/WEB-INF/etc/a3web.xml
index cfbb717f9..c44c01b79 100644
--- a/WebContent/WEB-INF/etc/a3web.xml
+++ b/WebContent/WEB-INF/etc/a3web.xml
@@ -7,14 +7,14 @@
als
als_rpt
-
+
1
1
2
-
+
1
1000000
20
@@ -26,7 +26,7 @@
Development
Disk
-
+
d:/tmp/als/Upload
@@ -36,7 +36,8 @@
Disk
- /tmp/als/offlineworkdoc
+ /tmp/als/offlineworkdoc
+
/tmp/DownLoad
@@ -48,10 +49,10 @@
SRC
true
-
+
/home/amarsoft/als/Download
-
+
true
@@ -68,35 +69,46 @@
Leasing Cloud
安硕
-
+
true
-
+
BusinessDueBill
http://localhost:8080/report
http://localhost:8080/report
-
+
true
WZ5jwvsdAFzo+sDY7wrZgA==
com.tenwa.sinopharmEleasing
rfL+5IFP/fHrsIiCZlJu5Q==
-
-
+
+
ee450692cbd24e8bacb27b6f46b4d752
- http://api.che300.com/service/getCarBrandList
- http://api.che300.com/service/getCarSeriesList
- http://api.che300.com/service/getCarModelList
- http://api.che300.com/service/getNewCarPrice
- http://api.che300.com/service/getUsedCarPrice
-
-
-
- http://111.205.51.131:27203/clms_proxy/remoting/api
-
+ http://api.che300.com/service/getCarBrandList
+ http://api.che300.com/service/getCarSeriesList
+
+ http://api.che300.com/service/getCarModelList
+
+ http://api.che300.com/service/getNewCarPrice
+
+ http://api.che300.com/service/getUsedCarPrice
+
+
+
+
+ http://111.205.51.131:27203/clms_proxy/remoting/api
+
+
+
+
+
+
+
+ /etc/app_config.properties
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index afc64ed12..84758aeb1 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1,435 +1,434 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index e9b530c78..68b86e474 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -156,7 +156,7 @@
-
+
@@ -167,7 +167,7 @@
-
+
@@ -178,13 +178,13 @@
-
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
index 7a968f719..1e1ebdc06 100644
--- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/WebContent/WEB-INF/etc/app_config.properties b/WebContent/WEB-INF/etc/app_config.properties
new file mode 100644
index 000000000..6d952ba65
--- /dev/null
+++ b/WebContent/WEB-INF/etc/app_config.properties
@@ -0,0 +1,69 @@
+###############################################################################
+# APP_CONFIG properties
+###############################################################################
+
+###############################################################################
+# APP_BASE_CONFIG
+###############################################################################
+# base.data.
+base.data.source=als
+base.data.encoding=UTF-8
+base.data.fource.encoding=true
+
+# base.param.key.
+base.param.key.hold.time=TokenHoldTime
+base.param.key.encoding=encoding
+base.param.key.no.check.uri=NoCheckURI
+
+# session check.
+base.session.check.token=token
+base.session.check.user.id=userid
+base.session.check.dev.id=devid
+base.session.check.dev.os=devos
+base.session.check.expire=expire
+
+# session.
+base.session.web.api.page=WebApiPage
+base.session.req.uri=ReqURI
+
+# base.return.
+base.return.code.500=500
+base.return.msg.500=\u540E\u53F0\u670D\u52A1\u51FA\u73B0\u5F02\u5E38!
+base.return.code.404=404
+base.return.code.406=406
+base.return.msg.406=\u8BBF\u95EE\u670D\u52A1\u540E\u53F0\u6743\u9650\u65E0\u6548!
+base.return.result.success.code=SUCCESS
+base.return.result.fail.code=FAIL
+base.return.msg.save.fail=\u4FDD\u5B58\u5931\u8D25
+base.return.msg.save.success=\u4FDD\u5B58\u6210\u529F
+base.return.msg.edit.fail=\u7F16\u8F91\u5931\u8D25
+base.return.msg.edit.success=\u7F16\u8F91\u6210\u529F
+base.return.msg.del.fail=\u5220\u9664\u5931\u8D25
+base.return.msg.del.success=\u5220\u9664\u6210\u529F
+base.return.msg.init.display.fail=\u521D\u59CB\u5316\u9875\u9762\u5931\u8D25
+base.return.msg.init.display.success=\u521D\u59CB\u5316\u9875\u9762\u6210\u529F
+
+base.return.type.void=void
+base.return.type.app.att=AppAtt
+
+# base pwd encryption des.
+base.pwd.encryption.des.one=0123456789abc
+base.pwd.encryption.des.two=1234567890abc
+base.pwd.encryption.des.three=1234567890!@#
+
+# customer type
+base.customer.type.company=01
+base.customer.type.person=03
+
+
+###############################################################################
+# APP_PUSH_MESSAGE_CONFIG
+###############################################################################
+push.message.switch=true
+push.message.secret.key.android=xpStkADS2IUJk10PejtJvQ==
+push.message.secret.key.ios=WZ5jwvsdAFzo+sDY7wrZgA==
+push.message.package.name=com.tenwa.test
+
+
+#base.filter.user.role.id='800090001R00000004','800090001R00000005','099','299','399','800090001R00000010','800090002R00000001','800090002R00000003','800090002R00000045','800090001R00000006','800090001R00000007','800090001R00000008','800090001R00000009','800090001R00000013','800090001R00000014','800090001R00000022','800090001R00000019','800090001R00000020','800090001R00000015','800090001R00000025'
+base.filter.user.role.id=none
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/are.xml b/WebContent/WEB-INF/etc/are.xml
index 8f2221d23..40423d160 100644
--- a/WebContent/WEB-INF/etc/are.xml
+++ b/WebContent/WEB-INF/etc/are.xml
@@ -76,6 +76,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index 9d5b40ac3..98359939a 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -4441,6 +4441,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml
new file mode 100644
index 000000000..5f3f39b17
--- /dev/null
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml
@@ -0,0 +1,418 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index c5794849c..02caedf42 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -546,7 +546,8 @@
-
+
+
@@ -582,15 +583,18 @@
-
+
+
+
-
+
+
@@ -1365,9 +1369,10 @@
-
+
+
-
+
@@ -1377,7 +1382,6 @@
-
@@ -1398,18 +1402,22 @@
+
-
+
+
+
-
+
+
@@ -2309,9 +2317,10 @@
+
-
+
@@ -2345,15 +2354,18 @@
-
+
+
+
-
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 5b8d4bedf..6ef06ae79 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -1189,6 +1189,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1213,6 +1277,8 @@
+
+
@@ -1445,7 +1511,7 @@
-
+
@@ -1453,9 +1519,9 @@
-
+
-
+
@@ -1628,6 +1694,8 @@
+
+
@@ -2197,5 +2265,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
index 1a600ed19..98f6c3a7b 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
@@ -120,7 +120,48 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index d2dfd2150..2c7182932 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -300,6 +300,9 @@
+
+
+
@@ -665,6 +668,8 @@
+
+
@@ -720,6 +725,8 @@
+
+
@@ -985,6 +992,8 @@
+
+
@@ -1017,6 +1026,7 @@
+
@@ -2331,43 +2341,41 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -2980,6 +2988,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3273,9 +3328,10 @@
-
-
-
+
+
+
+
@@ -3295,29 +3351,81 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3450,47 +3558,120 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/lib/aspose-words-18.1-jdk16.jar b/WebContent/WEB-INF/lib/aspose-words-18.1-jdk16.jar
new file mode 100644
index 000000000..25610609d
Binary files /dev/null and b/WebContent/WEB-INF/lib/aspose-words-18.1-jdk16.jar differ
diff --git a/WebContent/WEB-INF/lib/gnete-bc-139.jar b/WebContent/WEB-INF/lib/gnete-bc-139.jar
new file mode 100644
index 000000000..ac7bf8ef8
Binary files /dev/null and b/WebContent/WEB-INF/lib/gnete-bc-139.jar differ
diff --git a/WebContent/WEB-INF/lib/gnete-security-1.1.jar b/WebContent/WEB-INF/lib/gnete-security-1.1.jar
new file mode 100644
index 000000000..f2d9a6db2
Binary files /dev/null and b/WebContent/WEB-INF/lib/gnete-security-1.1.jar differ
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 2e4229f4e..b123a2ed0 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,475 +1,455 @@
-
- A3Web
-
-
- JSPConfiguration
- *.jsp
- GBK
-
-
- JSPConfiguration
- *.jspf
- GBK
-
-
-
- RunFilter
- com.amarsoft.awe.control.RunFilter
-
- RunTimeDebug
- true
-
-
- ShowFramePage
- true
-
-
- DbLog
- false
-
-
- encoding
- GBK
-
-
- DataSource
- als
-
-
- ExcludedURLs
- ^/.*Logon.jsp,^/.*SaveGraphAjax.jsp
-
-
-
- RunFilter
- *.jsp
- REQUEST
- FORWARD
-
-
- RunFilter
- /servlet/view/*
-
-
- InitAREServlet
- com.amarsoft.are.InitAREServlet
-
- ConfigFile
- /WEB-INF/etc/are.xml
-
-
- AppHome
- /WEB-INF
-
- 1
-
-
- InitAWEServlet
- com.amarsoft.awe.control.InitAWEServlet
-
- ConfigFile
- /WEB-INF/etc/a3web.xml
-
-
- CacheFile
- /WEB-INF/etc/cache.xml
-
-
- SkinConfig
- /WEB-INF/etc/skin.xml
-
-
- ButtonConfig
- /WEB-INF/etc/button.xml
-
-
- DataSource
- als
-
- 2
-
-
- RedirectorServlet
- com.amarsoft.awe.control.RedirectorServlet
-
- encoding
- GBK
-
-
-
-
- RewriteRunJavaMethodServlet
- com.tenwa.workflow.RewriteRunJavaMethodServlet
-
- DataSource
- als
-
-
-
-
- RedirectorDialogServlet
- com.amarsoft.awe.control.RedirectorDialogServlet
-
- encoding
- GBK
-
-
-
- ForwardServlet
- com.amarsoft.awe.control.ForwardServlet
-
- encoding
- GBK
-
-
-
- RunJavaMethodServlet
- com.amarsoft.awe.control.RunJavaMethodServlet
-
- DataSource
- als
-
-
-
- DisplayChart
- org.jfree.chart.servlet.DisplayChart
-
-
- MessageServlet
- com.amarsoft.awe.message.MessageServlet
-
-
- WorkDocFileServlet
- com.amarsoft.awe.common.attachment.WorkDocFileServlet
-
-
- AttachmentViewServlet
- com.amarsoft.awe.common.attachment.AttachmentViewServlet
-
-
- EditOfficeServlet
- com.tenwa.onlineoperation.servlet.EditOfficeServlet
-
-
- FileTemplateViewServlet
- com.amarsoft.filetemplate.servlet.FileTemplateViewServlet
-
-
- DocDownloadServlet
- com.tenwa.doc.servlet.DocDownloadServlet
-
-
- DocDownloadZipServlet
- com.tenwa.doc.servlet.DocDownloadZipServlet
-
-
- DocFlowDownloadZipServlet
- com.tenwa.doc.servlet.DocFlowDownloadZipServlet
-
-
- DownloadZipServlet
- com.tenwa.officetempalte.controller.DownloadZipServlet
-
-
- FileViewServlet
- com.amarsoft.awe.common.attachment.FileViewServlet
-
-
- ShowImageServlet
- com.tenwa.doc.servlet.ShowImageServlet
-
-
- ShowPDFServlet
- com.tenwa.doc.servlet.ShowPDFServlet
-
-
- StreamViewServlet
- com.amarsoft.awe.common.attachment.StreamViewServlet
-
-
- CheckCodeServlet
- com.amarsoft.awe.control.CheckCodeServlet
-
- CodeLength
- 5
-
-
-
- MonitorSOAPServlet
- com.amarsoft.awe.common.monitor.MonitorSOAPServlet
-
-
- RedirectorServlet
- /Redirector
-
-
- RedirectorDialogServlet
- /RedirectorDialog
-
-
- RunJavaMethodServlet
- /servlet/run
-
-
- ForwardServlet
- /ao
-
-
- DisplayChart
- /chartview
-
-
- MessageServlet
- /servlet/message
-
-
- WorkDocFileServlet
- /servlet/workdocfile/*
-
-
- AttachmentViewServlet
- /servlet/view/attachment
-
-
- EditOfficeServlet
- /servlet/view/editOffice
-
-
- FileTemplateViewServlet
- /servlet/view/fileTemplateView
-
-
- DocDownloadServlet
- /servlet/view/docDownloadServlet
-
-
-
- RewriteRunJavaMethodServlet
- /servlet/runflow
-
-
-
- DocDownloadZipServlet
- /servlet/view/docDownloadZipServlet
-
-
- DocFlowDownloadZipServlet
- /servlet/view/docFlowDownloadZipServlet
-
-
- DownloadZipServlet
- /servlet/view/DownloadZipServlet
-
-
- AttachmentViewServlet
- /servlet/pdf/*
-
-
- FileViewServlet
- /servlet/view/file
-
-
- ShowImageServlet
- /servlet/view/image
-
-
- ShowPDFServlet
- /servlet/view/pdf
-
-
- FileViewServlet
- /servlet/viewpic
-
-
- StreamViewServlet
- /servlet/view/stream
-
-
- CheckCodeServlet
- /servlet/checkcode
-
-
- MonitorSOAPServlet
- /servlet/monitor
-
-
- QueryResultServlet
- com.amarsoft.asquery.servlet.QueryResultServlet
-
- threadCount
- 5
-
-
-
- QueryResultServlet
- /SynchResultQuery
-
-
- InfoPageExportServlet
- com.amarsoft.awe.dw.export.servlet.InfoExportServlet
-
-
- ListPageExportServlet
- com.amarsoft.awe.dw.export.servlet.ListExportServlet
-
-
- InfoPageExportServlet
- /EAS/PageExport/info
-
-
- ListPageExportServlet
- /EAS/PageExport/list
-
-
- workflow_GetProcess
-
- com.amarsoft.biz.workflow.graph.web.GetProcess
-
-
-
- workflow_UpdateProcess
-
- com.amarsoft.biz.workflow.graph.web.UpdateProcess
-
-
-
- workflow_AddProcess
-
- com.amarsoft.biz.workflow.graph.web.AddProcess
-
-
-
- workflow_DeleteProcess
-
- com.amarsoft.biz.workflow.graph.web.DeleteProcess
-
-
-
- workflow_ListProcess
-
- com.amarsoft.biz.workflow.graph.web.ListProcess
-
-
-
- workflow_GetProcess
- /getprocess.wf
-
-
- workflow_UpdateProcess
- /updateprocess.wf
-
-
- workflow_AddProcess
- /addprocess.wf
-
-
- workflow_DeleteProcess
- /deleteprocess.wf
-
-
- workflow_ListProcess
- /listprocess.wf
-
-
- index.html
-
-
- 404
- /Frame/page/sys/NoPageInfo.jsp
-
-
- jdbc/als
- javax.sql.DataSource
- Application
- Shareable
-
-
- jdbc/report
- javax.sql.DataSource
- Application
- Shareable
-
-
- 240
-
-
- InitDBType
- com.amarsoft.app.awe.config.InitDBType
-
- shutdown-on-unload
- true
-
- 1
-
-
- QuartzInitializer
- com.tenwa.quartz.MyQuartzInitializerServlet
-
- config-file
- quartz.properties
-
-
- shutdown-on-unload
- true
-
- 5
-
-
- webAppRootKey
- webapp.port
-
-
- javax.servlet.jsp.jstl.fmt.localizationContext
- ApplicationResources
-
-
- log4jConfigLocation
- /WEB-INF/classes/log4j.xml
-
-
- 閰嶇疆鏂囦欢浣嶇疆
- contextConfigLocation
- classpath:applicationContext*.xml
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
-
-
-
-
- 閽堝ObjectWindow鐨勭晫闈㈡弿杩拌瑷
- XWRenderServlet
- XWRenderServlet
- cn.coyoteam.aweresf.web.servlet.XWRenderServlet
+
+ A3Web
+
+
+ JSPConfiguration
+ *.jsp
+ GBK
+
+
+ JSPConfiguration
+ *.jspf
+ GBK
+
+
+
+ RunFilter
+ com.amarsoft.awe.control.RunFilter
- XWInterceptConfig
- classpath:/com/amarsoft/aims/xwrender-intercept.properties
+ RunTimeDebug
+ true
+
+
+ ShowFramePage
+ true
+
+
+ DbLog
+ false
+
+
+ encoding
+ GBK
+
+
+ DataSource
+ als
+
+
+ ExcludedURLs
+ ^/.*Logon.jsp,^/.*SaveGraphAjax.jsp
+
+
+
+ RunFilter
+ *.jsp
+ REQUEST
+ FORWARD
+
+
+ RunFilter
+ /servlet/view/*
+
+
+ InitAREServlet
+ com.amarsoft.are.InitAREServlet
+
+ ConfigFile
+ /WEB-INF/etc/are.xml
+
+
+ AppHome
+ /WEB-INF
1
-
- XWRenderServlet
- /xwrender/*
-
- 閽堝澶栭儴鎻愪緵鎺ュ彛鐨剋ebapi
- XWTransformServlet
- XWTransformServlet
- cn.coyoteam.aweresf.web.servlet.XWTransformServlet
+ InitAWEServlet
+ com.amarsoft.awe.control.InitAWEServlet
+
+ ConfigFile
+ /WEB-INF/etc/a3web.xml
+
+
+ CacheFile
+ /WEB-INF/etc/cache.xml
+
+
+ SkinConfig
+ /WEB-INF/etc/skin.xml
+
+
+ ButtonConfig
+ /WEB-INF/etc/button.xml
+
+
+ DataSource
+ als
+
+ 2
+
+
+ RedirectorServlet
+ com.amarsoft.awe.control.RedirectorServlet
+
+ encoding
+ GBK
+
+
+
+
+ InitCollectConfig
+ com.amarsoft.app.awe.config.InitCollectConfig
+
+ shutdown-on-unload
+ true
+
+ 1
+
+
+
+ RewriteRunJavaMethodServlet
+ com.tenwa.workflow.RewriteRunJavaMethodServlet
+
+ DataSource
+ als
+
+
+
+
+ RedirectorDialogServlet
+ com.amarsoft.awe.control.RedirectorDialogServlet
+
+ encoding
+ GBK
+
+
+
+ ForwardServlet
+ com.amarsoft.awe.control.ForwardServlet
+
+ encoding
+ GBK
+
+
+
+ RunJavaMethodServlet
+ com.amarsoft.awe.control.RunJavaMethodServlet
+
+ DataSource
+ als
+
+
+
+ DisplayChart
+ org.jfree.chart.servlet.DisplayChart
+
+
+ MessageServlet
+ com.amarsoft.awe.message.MessageServlet
+
+
+ WorkDocFileServlet
+ com.amarsoft.awe.common.attachment.WorkDocFileServlet
+
+
+ AttachmentViewServlet
+ com.amarsoft.awe.common.attachment.AttachmentViewServlet
+
+
+ EditOfficeServlet
+ com.tenwa.onlineoperation.servlet.EditOfficeServlet
+
+
+ FileTemplateViewServlet
+ com.amarsoft.filetemplate.servlet.FileTemplateViewServlet
+
+
+ DocDownloadServlet
+ com.tenwa.doc.servlet.DocDownloadServlet
+
+
+ DocDownloadZipServlet
+ com.tenwa.doc.servlet.DocDownloadZipServlet
+
+
+ DocFlowDownloadZipServlet
+ com.tenwa.doc.servlet.DocFlowDownloadZipServlet
+
+
+ DownloadZipServlet
+ com.tenwa.officetempalte.controller.DownloadZipServlet
+
+
+ FileViewServlet
+ com.amarsoft.awe.common.attachment.FileViewServlet
+
+
+ ShowImageServlet
+ com.tenwa.doc.servlet.ShowImageServlet
+
+
+ ShowPDFServlet
+ com.tenwa.doc.servlet.ShowPDFServlet
+
+
+ StreamViewServlet
+ com.amarsoft.awe.common.attachment.StreamViewServlet
+
+
+ CheckCodeServlet
+ com.amarsoft.awe.control.CheckCodeServlet
+
+ CodeLength
+ 5
+
+
+
+ MonitorSOAPServlet
+ com.amarsoft.awe.common.monitor.MonitorSOAPServlet
- XWTransformServlet
- /webapi/xw/*
+ RedirectorServlet
+ /Redirector
+
+ RedirectorDialogServlet
+ /RedirectorDialog
+
+
+ RunJavaMethodServlet
+ /servlet/run
+
+
+ ForwardServlet
+ /ao
+
+
+ DisplayChart
+ /chartview
+
+
+ MessageServlet
+ /servlet/message
+
+
+ WorkDocFileServlet
+ /servlet/workdocfile/*
+
+
+ AttachmentViewServlet
+ /servlet/view/attachment
+
+
+ EditOfficeServlet
+ /servlet/view/editOffice
+
+
+ FileTemplateViewServlet
+ /servlet/view/fileTemplateView
+
+
+ DocDownloadServlet
+ /servlet/view/docDownloadServlet
+
+
+
+ RewriteRunJavaMethodServlet
+ /servlet/runflow
+
+
+
+ DocDownloadZipServlet
+ /servlet/view/docDownloadZipServlet
+
+
+ DocFlowDownloadZipServlet
+ /servlet/view/docFlowDownloadZipServlet
+
+
+ DownloadZipServlet
+ /servlet/view/DownloadZipServlet
+
+
+ AttachmentViewServlet
+ /servlet/pdf/*
+
+
+ FileViewServlet
+ /servlet/view/file
+
+
+ ShowImageServlet
+ /servlet/view/image
+
+
+ ShowPDFServlet
+ /servlet/view/pdf
+
+
+ FileViewServlet
+ /servlet/viewpic
+
+
+ StreamViewServlet
+ /servlet/view/stream
+
+
+ CheckCodeServlet
+ /servlet/checkcode
+
+
+ MonitorSOAPServlet
+ /servlet/monitor
+
+
+ QueryResultServlet
+ com.amarsoft.asquery.servlet.QueryResultServlet
+
+ threadCount
+ 5
+
+
+
+ QueryResultServlet
+ /SynchResultQuery
+
+
+ InfoPageExportServlet
+ com.amarsoft.awe.dw.export.servlet.InfoExportServlet
+
+
+ ListPageExportServlet
+ com.amarsoft.awe.dw.export.servlet.ListExportServlet
+
+
+ InfoPageExportServlet
+ /EAS/PageExport/info
+
+
+ ListPageExportServlet
+ /EAS/PageExport/list
+
+
+ workflow_GetProcess
+ com.amarsoft.biz.workflow.graph.web.GetProcess
+
+
+ workflow_UpdateProcess
+ com.amarsoft.biz.workflow.graph.web.UpdateProcess
+
+
+ workflow_AddProcess
+ com.amarsoft.biz.workflow.graph.web.AddProcess
+
+
+ workflow_DeleteProcess
+ com.amarsoft.biz.workflow.graph.web.DeleteProcess
+
+
+ workflow_ListProcess
+ com.amarsoft.biz.workflow.graph.web.ListProcess
+
+
+ workflow_GetProcess
+ /getprocess.wf
+
+
+ workflow_UpdateProcess
+ /updateprocess.wf
+
+
+ workflow_AddProcess
+ /addprocess.wf
+
+
+ workflow_DeleteProcess
+ /deleteprocess.wf
+
+
+ workflow_ListProcess
+ /listprocess.wf
+
+
+ index.html
+
+
+ 404
+ /Frame/page/sys/NoPageInfo.jsp
+
+
+ jdbc/als
+ javax.sql.DataSource
+ Application
+ Shareable
+
+
+ jdbc/report
+ javax.sql.DataSource
+ Application
+ Shareable
+
+
+ 240
+
+
+ InitDBType
+ com.amarsoft.app.awe.config.InitDBType
+
+ shutdown-on-unload
+ true
+
+ 1
+
+
+ QuartzInitializer
+ com.tenwa.quartz.MyQuartzInitializerServlet
+
+ config-file
+ quartz.properties
+
+
+ shutdown-on-unload
+ true
+
+ 5
+
+
+ webAppRootKey
+ webapp.port
+
+
+ javax.servlet.jsp.jstl.fmt.localizationContext
+ ApplicationResources
+
+
+ log4jConfigLocation
+ /WEB-INF/classes/log4j.xml
+
+
+ 閰嶇疆鏂囦欢浣嶇疆
+ contextConfigLocation
+ classpath:applicationContext*.xml
+
+
+ org.springframework.web.context.ContextLoaderListener
+
+
+
+
+
Restfull澶勭悊Servlet
RestfullServlet
RestfullServlet
- cn.coyoteam.aweresf.web.servlet.RestfullServiceServlet
+
+ cn.servlet.RestfullServiceServlet
+
1
@@ -480,44 +460,64 @@
restfull鑷姩鎵弿璺緞璁剧疆
RestfullScanPackage
- cn.coyoteam.aweresf.web.restfull.impl,
- apx.com.amarsoft.apx.web.resf,
- apx.com.amarsoft.aims.flow.bzsrv,
- apx.com.amarsoft.als.chksce.bzsrv,
- apx.com.amarsoft.aims.planteam.bzsrv,
- apx.com.amarsoft.apx.web.als.user.resf,
- apx.com.amarsoft.als.temp.bzsrv,
- apx.com.amarsoft.als.customer.bzsrv,
- apx.com.amarsoft.als.work.flow.bzsrv,
- apx.com.amarsoft.als.user.center.bzsrv,
- apx.com.amarsoft.als.user.logon.bzsrv
+ apx.com.amarsoft.als.user.logon.controller,
+ apx.com.amarsoft.als.user.pwd.controller,
+ apx.com.amarsoft.als.user.sys.controller,
+ apx.com.amarsoft.als.doc.controller,
+ apx.com.amarsoft.als.currency.select.controller,
+ apx.com.amarsoft.als.currency.select.contract.controller,
+
+
+ apx.com.amarsoft.als.apzl.apply.business.query.controller,
+
+ apx.com.amarsoft.als.apzl.apply.business.start.controller,
+
+ apx.com.amarsoft.als.currency.select.apzl.car.controller,
+
+ apx.com.amarsoft.als.currency.select.apzl.product.controller,
+
+
+
+ apx.com.amarsoft.als.business.opinion.sign.controller,
+
+ apx.com.amarsoft.als.business.opinion.history.controller,
+
+
+ apx.com.amarsoft.als.business.attachment.controller,
+
+
+ apx.com.amarsoft.als.business.action.ready.controller,
+ apx.com.amarsoft.als.business.action.submit.controller,
+ apx.com.amarsoft.als.business.action.back.controller,
+ apx.com.amarsoft.als.business.comm.action.controller,
+
+
+
+ apx.com.amarsoft.als.base.awe.controller,
SessionAndContextFilter
SessionAndContextFilter
- cn.coyoteam.aweresf.web.filter.SessionAndContextFilter
+
+ cn.filter.SessionAndContextFilter
NoCheckURI
- /api-doc-index,
- /resf/LoginProc/Login,
- /resf/LoginProc/Logout,
- /resf/logon/manager/logon,
- /resf/logon/manager/logout,
- /resf/user/center/manager/detection/version,
- /resf/user/center/manager/close/gesture,
- /resf/user/center/manager/acquisition/gesture,
- /resf/flow/work/manager/attachments/down/att,
- /resf/flow/work/manager/attachments/down/att/6,
-
- /resf/flow/files/down/docById,
- /resf/files/downloadApp,
- /resf/files/downloadPlist,
- /resf/files/down/flow/image,
- /resf/files/show/image,
- /resf/files/downloadAppById,
+
+ /resf/logon/manager/logon,
+ /resf/logon/manager/logout,
+
+ /resf/user/center/manager/acquisition/gesture,
+ /resf/user/center/manager/close/gesture,
+
+ /resf/user/center/manager/detection/version,
+
+ /resf/files/down/docById,
+ /resf/files/downloadPlist,
+ /resf/files/downloadApp,
+ /resf/files/downloadAppById,
diff --git a/WebContent/WEB-INF/web_app.xml b/WebContent/WEB-INF/web_app.xml
new file mode 100644
index 000000000..1e851bb4b
--- /dev/null
+++ b/WebContent/WEB-INF/web_app.xml
@@ -0,0 +1,533 @@
+
+
+ A3Web
+
+
+ JSPConfiguration
+ *.jsp
+ GBK
+
+
+ JSPConfiguration
+ *.jspf
+ GBK
+
+
+
+ RunFilter
+ com.amarsoft.awe.control.RunFilter
+
+ RunTimeDebug
+ true
+
+
+ ShowFramePage
+ true
+
+
+ DbLog
+ false
+
+
+ encoding
+ GBK
+
+
+ DataSource
+ als
+
+
+ ExcludedURLs
+ ^/.*Logon.jsp,^/.*SaveGraphAjax.jsp
+
+
+
+ RunFilter
+ *.jsp
+ REQUEST
+ FORWARD
+
+
+ RunFilter
+ /servlet/view/*
+
+
+ InitAREServlet
+ com.amarsoft.are.InitAREServlet
+
+ ConfigFile
+ /WEB-INF/etc/are.xml
+
+
+ AppHome
+ /WEB-INF
+
+ 1
+
+
+ InitAWEServlet
+ com.amarsoft.awe.control.InitAWEServlet
+
+ ConfigFile
+ /WEB-INF/etc/a3web.xml
+
+
+ CacheFile
+ /WEB-INF/etc/cache.xml
+
+
+ SkinConfig
+ /WEB-INF/etc/skin.xml
+
+
+ ButtonConfig
+ /WEB-INF/etc/button.xml
+
+
+ DataSource
+ als
+
+ 2
+
+
+ RedirectorServlet
+ com.amarsoft.awe.control.RedirectorServlet
+
+ encoding
+ GBK
+
+
+
+
+ RewriteRunJavaMethodServlet
+ com.tenwa.workflow.RewriteRunJavaMethodServlet
+
+ DataSource
+ als
+
+
+
+
+ RedirectorDialogServlet
+ com.amarsoft.awe.control.RedirectorDialogServlet
+
+ encoding
+ GBK
+
+
+
+ ForwardServlet
+ com.amarsoft.awe.control.ForwardServlet
+
+ encoding
+ GBK
+
+
+
+ RunJavaMethodServlet
+ com.amarsoft.awe.control.RunJavaMethodServlet
+
+ DataSource
+ als
+
+
+
+ DisplayChart
+ org.jfree.chart.servlet.DisplayChart
+
+
+ MessageServlet
+ com.amarsoft.awe.message.MessageServlet
+
+
+ WorkDocFileServlet
+ com.amarsoft.awe.common.attachment.WorkDocFileServlet
+
+
+ AttachmentViewServlet
+ com.amarsoft.awe.common.attachment.AttachmentViewServlet
+
+
+ EditOfficeServlet
+ com.tenwa.onlineoperation.servlet.EditOfficeServlet
+
+
+ FileTemplateViewServlet
+ com.amarsoft.filetemplate.servlet.FileTemplateViewServlet
+
+
+ DocDownloadServlet
+ com.tenwa.doc.servlet.DocDownloadServlet
+
+
+ DocDownloadZipServlet
+ com.tenwa.doc.servlet.DocDownloadZipServlet
+
+
+ DocFlowDownloadZipServlet
+ com.tenwa.doc.servlet.DocFlowDownloadZipServlet
+
+
+ DownloadZipServlet
+ com.tenwa.officetempalte.controller.DownloadZipServlet
+
+
+ FileViewServlet
+ com.amarsoft.awe.common.attachment.FileViewServlet
+
+
+ ShowImageServlet
+ com.tenwa.doc.servlet.ShowImageServlet
+
+
+ ShowPDFServlet
+ com.tenwa.doc.servlet.ShowPDFServlet
+
+
+ StreamViewServlet
+ com.amarsoft.awe.common.attachment.StreamViewServlet
+
+
+ CheckCodeServlet
+ com.amarsoft.awe.control.CheckCodeServlet
+
+ CodeLength
+ 5
+
+
+
+ MonitorSOAPServlet
+ com.amarsoft.awe.common.monitor.MonitorSOAPServlet
+
+
+ RedirectorServlet
+ /Redirector
+
+
+ RedirectorDialogServlet
+ /RedirectorDialog
+
+
+ RunJavaMethodServlet
+ /servlet/run
+
+
+ ForwardServlet
+ /ao
+
+
+ DisplayChart
+ /chartview
+
+
+ MessageServlet
+ /servlet/message
+
+
+ WorkDocFileServlet
+ /servlet/workdocfile/*
+
+
+ AttachmentViewServlet
+ /servlet/view/attachment
+
+
+ EditOfficeServlet
+ /servlet/view/editOffice
+
+
+ FileTemplateViewServlet
+ /servlet/view/fileTemplateView
+
+
+ DocDownloadServlet
+ /servlet/view/docDownloadServlet
+
+
+
+ RewriteRunJavaMethodServlet
+ /servlet/runflow
+
+
+
+ DocDownloadZipServlet
+ /servlet/view/docDownloadZipServlet
+
+
+ DocFlowDownloadZipServlet
+ /servlet/view/docFlowDownloadZipServlet
+
+
+ DownloadZipServlet
+ /servlet/view/DownloadZipServlet
+
+
+ AttachmentViewServlet
+ /servlet/pdf/*
+
+
+ FileViewServlet
+ /servlet/view/file
+
+
+ ShowImageServlet
+ /servlet/view/image
+
+
+ ShowPDFServlet
+ /servlet/view/pdf
+
+
+ FileViewServlet
+ /servlet/viewpic
+
+
+ StreamViewServlet
+ /servlet/view/stream
+
+
+ CheckCodeServlet
+ /servlet/checkcode
+
+
+ MonitorSOAPServlet
+ /servlet/monitor
+
+
+ QueryResultServlet
+ com.amarsoft.asquery.servlet.QueryResultServlet
+
+ threadCount
+ 5
+
+
+
+ QueryResultServlet
+ /SynchResultQuery
+
+
+ InfoPageExportServlet
+ com.amarsoft.awe.dw.export.servlet.InfoExportServlet
+
+
+ ListPageExportServlet
+ com.amarsoft.awe.dw.export.servlet.ListExportServlet
+
+
+ InfoPageExportServlet
+ /EAS/PageExport/info
+
+
+ ListPageExportServlet
+ /EAS/PageExport/list
+
+
+ workflow_GetProcess
+ com.amarsoft.biz.workflow.graph.web.GetProcess
+
+
+ workflow_UpdateProcess
+ com.amarsoft.biz.workflow.graph.web.UpdateProcess
+
+
+ workflow_AddProcess
+ com.amarsoft.biz.workflow.graph.web.AddProcess
+
+
+ workflow_DeleteProcess
+ com.amarsoft.biz.workflow.graph.web.DeleteProcess
+
+
+ workflow_ListProcess
+ com.amarsoft.biz.workflow.graph.web.ListProcess
+
+
+ workflow_GetProcess
+ /getprocess.wf
+
+
+ workflow_UpdateProcess
+ /updateprocess.wf
+
+
+ workflow_AddProcess
+ /addprocess.wf
+
+
+ workflow_DeleteProcess
+ /deleteprocess.wf
+
+
+ workflow_ListProcess
+ /listprocess.wf
+
+
+ index.html
+
+
+ 404
+ /Frame/page/sys/NoPageInfo.jsp
+
+
+ jdbc/als
+ javax.sql.DataSource
+ Application
+ Shareable
+
+
+ jdbc/report
+ javax.sql.DataSource
+ Application
+ Shareable
+
+
+ 240
+
+
+ InitDBType
+ com.amarsoft.app.awe.config.InitDBType
+
+ shutdown-on-unload
+ true
+
+ 1
+
+
+ QuartzInitializer
+ com.tenwa.quartz.MyQuartzInitializerServlet
+
+ config-file
+ quartz.properties
+
+
+ shutdown-on-unload
+ true
+
+ 5
+
+
+ webAppRootKey
+ webapp.port
+
+
+ javax.servlet.jsp.jstl.fmt.localizationContext
+ ApplicationResources
+
+
+ log4jConfigLocation
+ /WEB-INF/classes/log4j.xml
+
+
+ 閰嶇疆鏂囦欢浣嶇疆
+ contextConfigLocation
+ classpath:applicationContext*.xml
+
+
+ org.springframework.web.context.ContextLoaderListener
+
+
+
+
+
+
+
+ Restfull澶勭悊Servlet
+ RestfullServlet
+ RestfullServlet
+
+ cn.servlet.RestfullServiceServlet
+
+ 1
+
+
+ RestfullServlet
+ /webapi/resf/*
+
+
+ restfull鑷姩鎵弿璺緞璁剧疆
+ RestfullScanPackage
+
+ apx.com.amarsoft.als.user.logon.controller,
+ apx.com.amarsoft.als.user.pwd.controller,
+ apx.com.amarsoft.als.user.sys.controller,
+ apx.com.amarsoft.als.doc.controller,
+ apx.com.amarsoft.als.currency.select.controller,
+ apx.com.amarsoft.als.currency.select.contract.controller,
+
+
+ apx.com.amarsoft.als.business.work.to.controller,
+
+ apx.com.amarsoft.als.business.work.has.controller,
+
+ apx.com.amarsoft.als.business.work.circulate.pass.controller,
+
+ apx.com.amarsoft.als.business.work.circulate.close.controller,
+
+
+
+ apx.com.amarsoft.als.business.opinion.sign.controller,
+
+ apx.com.amarsoft.als.business.opinion.history.controller,
+
+
+ apx.com.amarsoft.als.business.attachment.controller,
+
+
+ apx.com.amarsoft.als.business.action.ready.controller,
+ apx.com.amarsoft.als.business.action.submit.controller,
+ apx.com.amarsoft.als.business.action.back.controller,
+ apx.com.amarsoft.als.business.comm.action.controller,
+
+
+
+ apx.com.amarsoft.als.base.awe.controller,
+
+
+
+
+ SessionAndContextFilter
+ SessionAndContextFilter
+
+ cn.filter.SessionAndContextFilter
+
+ NoCheckURI
+
+
+ /resf/logon/manager/logon,
+ /resf/logon/manager/logout,
+
+ /resf/user/center/manager/acquisition/gesture,
+ /resf/user/center/manager/close/gesture,
+
+ /resf/user/center/manager/detection/version,
+
+ /resf/files/down/docById,
+ /resf/files/downloadPlist,
+ /resf/files/downloadApp,
+ /resf/files/downloadAppById,
+
+
+
+ TokenHoldTime
+ 31536000
+
+
+ dataSource
+ als
+
+
+ encoding
+ GBK
+
+
+
+ SessionAndContextFilter
+ /webapi/*
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/appDownload.jsp b/WebContent/appDownload.jsp
index b87512534..90e234215 100644
--- a/WebContent/appDownload.jsp
+++ b/WebContent/appDownload.jsp
@@ -1,81 +1,84 @@
-<%@ page contentType="text/html; charset=GBK" pageEncoding="GBK"%>
-
-
-
-
-
-
-
-App应用下载
-
-
-
-
-
-<%
- String devType="android";
- String userAgent = request.getHeader("user-agent");
- if(userAgent.toLowerCase().indexOf("iphone")>=0){
- devType="ios";
- }
-%>
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-
+
+
+<%
+ String devType="android";
+ String userAgent = request.getHeader("user-agent");
+ if(userAgent.toLowerCase().indexOf("iphone")>=0){
+ devType="ios";
+ }
+%>
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+