diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp
index 94f9c8a48..60f6a3b69 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp
@@ -27,8 +27,8 @@
String compClientID = request.getParameter("CompClientID");
- dwTemp.replaceColumn("loaned", "", CurPage.getObjectWindowOutput());
- dwTemp.replaceColumn("outstand", "", CurPage.getObjectWindowOutput());
+ dwTemp.replaceColumn("loaned", "", CurPage.getObjectWindowOutput());
+ dwTemp.replaceColumn("outstand", "", CurPage.getObjectWindowOutput());
String sButtons[][] = {
diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp
index 20f239a6a..6af9d6130 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp
@@ -4,13 +4,17 @@
<%
String certId = CurPage.getParameter("certId");
-
- ASObjectModel doTemp = new ASObjectModel("LoanedList");
- doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' and O.CONTRACT_STATUS <> '101' ");
+ String flowunId = CurPage.getParameter("flowunId");
+ CurPage.setAttribute("flowRowCount", "20");
+ CurPage.setAttribute("pageIdentify", "loan");
+ ASObjectModel doTemp = new ASObjectModel("LoanedListNew");
+ doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator");
+ doTemp.appendJboWhere(" and o.CONTRACT_STATUS in ('31','100','105')");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1";//--设置为Grid风格--
dwTemp.ReadOnly = "1";//只读模式
- dwTemp.setPageSize(10);
+ dwTemp.setPageSize(20);
+ doTemp.setVisible("PROJECT_ID,FLOWUNID,CERTID_WITH_ROLE,CONTRACT_STATUS,business_status",false);
dwTemp.genHTMLObjectWindow(certId);
String sButtons[][] = {
@@ -31,18 +35,16 @@
}
function viewHisTabLocal() {
- var param = FlowFunction.loadFlowParam();
- if (typeof(param.ObjectNo) == "undefined" || param.ObjectNo.length == 0) {
+ var flowunid = getItemValue(0,getRow(),"FLOWUNID");
+ var projectId = getItemValue(0,getRow(),"PROJECT_ID");
+ if (flowunid.length == 0 && projectId.length == 0) {
alert(getHtmlMessage('1'));//请选择一条信息!
return;
}
- let sTaskNo = param["TaskNo"]
- if(sTaskNo==""){
- sTaskNo = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getFlowEndRelativeTaskNo", "ObjectNo="+param["sObjectNo"]+",PhaseNo="+ param["sPhaseNo"]);
- if(typeof(sTaskNo)=="undefined" || sTaskNo.length==0) {
- alert("流程未结束,无法查看!");
- return;
- }
+ let sTaskNo = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getFlowEndRelativeTaskNo", "ObjectNo="+flowunid+",projectId="+projectId);
+ if(typeof(sTaskNo)=="undefined" || sTaskNo.length==0) {
+ alert("流程未结束,无法查看!");
+ return;
}
var param ="TaskNo="+sTaskNo+"&ViewID=001&RightType=ReadOnly&delTabs=扣款卡信息,客户历史信息查询";
AsControl.OpenNewWin("/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp",param)
diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp
index 50df292a2..8cd8c4a49 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp
@@ -6,18 +6,19 @@
String certId = CurPage.getParameter("certId");
String flowunId = CurPage.getParameter("flowunId");
-
- ASObjectModel doTemp = new ASObjectModel("LoanedList");
- doTemp.appendJboWhere(" and (O.CONTRACT_STATUS < 31 or O.CONTRACT_STATUS = '104' or O.CONTRACT_STATUS = '101') and O.FLOWUNID <> '"+flowunId+"'");
+ CurPage.setAttribute("flowRowCount", "20");
+ ASObjectModel doTemp = new ASObjectModel("LoanedListNew");
+ doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator");
+ doTemp.appendJboWhere(" and o.CONTRACT_STATUS not in ('100','105','31') and (flowunid not in ('"+flowunId+"') or v.isnull(flowunid))");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1";//--设置为Grid风格--
dwTemp.ReadOnly = "1";//只读模式
- dwTemp.setPageSize(10);
+ dwTemp.setPageSize(20);
+ doTemp.setVisible("PROJECT_ID,FLOWUNID,CERTID_WITH_ROLE,CONTRACT_STATUS,COUPUS_OVER,IS_OVERDUE",false);
dwTemp.genHTMLObjectWindow(certId);
- String sButtons[][] = {
-
- };
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+ String sButtons[][] = {};
+%>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>