diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal.jsp
new file mode 100644
index 000000000..12e2e24f4
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal.jsp
@@ -0,0 +1,171 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-06-06
+ Content:
+ History Log:
+ */
+ String phaseNo = CurPage.getParameter("PhaseNo");
+ String rightType = CurComp.getParameter("RightType");
+ String flowunid = CurPage.getParameter("FlowUnid");
+ String ishistory = CurPage.getParameter("IsHistory");
+ ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempListBySubtotal");
+ if(null!=ishistory&&ishistory.equals("true")){
+ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
+ }
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true;
+ dwTemp.ReadOnly = "0";
+ dwTemp.ShowSummary = "1";
+ if("0030".equals(phaseNo)){
+ rightType = "ReadOnly";
+ dwTemp.ReadOnly = "1";
+ }
+ if("ReadOnly".equals(rightType)){
+ dwTemp.MultiSelect = false;
+ }
+ dwTemp.setPageSize(10);
+ ASDataObject ado = dwTemp.getDataObject();
+ ado.setLockCount(4);
+ ado.setReadOnly("PAYMENT_NUMBER", true);
+ ado.setReadOnly("PROJECT_NAME", true);
+ ado.setReadOnly("PLAN_ID", true);
+ ado.setReadOnly("FEE_TYPE", true);
+ ado.setReadOnly("SETTLE_METHOD", true);
+ ado.setReadOnly("PLAN_DATE", true);
+ ado.setReadOnly("ACCOUNT", true);
+ ado.setReadOnly("ACC_NUMBER", true);
+ ado.setHtmlEvent("FACT_MONEY", "onchange", "checkEquipAmtMoney");
+ ado.setHtmlEvent("FEE_ADJUST", "onchange", "checkEquipAmtMoney");
+ ado.setHtmlEvent("MEMO", "onmouseover", "showMemo");
+ ado.setHtmlEvent("MEMO", "onmouseout", "hideMemo");
+ ado.setHtmlEvent("MEMO", "onkeyup", "synchMemo");
+ dwTemp.genHTMLObjectWindow(flowunid);
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
+ String[][] sButtons = null;
+ if("ReadOnly".equals(rightType)){
+ sButtons = new String[][]{
+ };
+ }else{
+ sButtons = new String[][]{
+ {"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""},
+ // {"true","","Button","批量修改","批量修改","batchModify()","","","","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/Fund/FundPayment/VILCFundEquipAMTList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp
index 86d8db8b6..d7bd64958 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp
@@ -31,7 +31,7 @@
};
}else{
sButtons = new String[][]{
- {"true","","Button","生成本次付款","生成本次付款","openFundPlanList()","","","","btn_icon_add",""}
+ {"true","","Button","申请放款","申请放款","openFundPlanList()","","","","btn_icon_add",""}
};
}
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 84758aeb1..57277da66 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -5,7 +5,7 @@
-
+
@@ -1069,7 +1069,7 @@
-
+
@@ -1079,7 +1079,7 @@
-
+
@@ -1101,4 +1101,4 @@
-
\ 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 68b86e474..8b5f8aecc 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -19,7 +19,7 @@
-
+
@@ -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 1e1ebdc06..f26963aa5 100644
--- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
@@ -1,62 +1,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
index 04d32d8ed..98c64d195 100644
--- a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
+++ b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
@@ -8,11 +8,12 @@ import jbo.app.tenwa.calc.LC_EBANK;
import jbo.app.tenwa.calc.LC_FUND_INCOME;
import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
import jbo.app.tenwa.calc.LC_FUND_PLAN;
+import jbo.app.tenwa.calc.LC_RENT_INCOME;
import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP;
import jbo.app.tenwa.calc.LC_RENT_PLAN;
import jbo.app.tenwa.calc.VI_LC_FUND_PLAN;
import jbo.app.tenwa.calc.VI_LC_RENT_PLAN;
-import jbo.app.tenwa.customer.CUSTOMER_INFO;
+import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
@@ -22,6 +23,35 @@ import com.amarsoft.are.jbo.JBOFactory;
public class ColRelativeInfo {
+ //根据合同ID获取经销商账号
+ public static String getAccNumberByContractID(String contractID) throws JBOException{
+ BizObject bo = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"id=:contractID")
+ .setParameter("contractID", contractID).getSingleResult(false);
+ String distributorID = bo.getAttribute("distributor_id").getString();
+ BizObject bo2 = JBOFactory.createBizObjectQuery(DISTRIBUTOR_ACCOUNT.CLASS_NAME,"distributor_id=:distributorID")
+ .setParameter("distributorID", distributorID).getSingleResult(false);
+ return bo2 != null?bo2.getAttribute("acc_number").getString():"";
+ }
+
+ //根据客户ID获取客户名称
+ public static String getCustNameByCUSTID(String custID) throws JBOException{
+ BizObject bo = JBOFactory.createBizObjectQuery(LB_UNION_LESSEE.CLASS_NAME,"CUSTOMER_ID=:CUST_ID")
+ .setParameter("CUST_ID", custID).getSingleResult(false);
+ return bo != null?bo.getAttribute("customer_name").getString():"";
+ }
+
+ //获取某个支付对象的合同数量
+ public static String getCountByFactObject(String factObject,String flowunid) throws Exception{
+ BizObject bo = JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME, "select count(contract_id) as v.countMoney from O where fact_object=:fact_object and flowunid=:flowunid group by fact_object")
+ .setParameter("fact_object", factObject).setParameter("flowunid", flowunid).getSingleResult(false);
+ return bo != null?bo.getAttribute("countMoney").getString():"0";
+ }
+ //获得某个支付对象的付款总额
+ public static String getTotalMoneyByFactObject(String factObject,String flowunid) throws Exception{
+ BizObject bo = JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME, "select sum(fact_money) as v.sumMoney from O where fact_object=:fact_object and flowunid=:flowunid group by fact_object")
+ .setParameter("fact_object", factObject).setParameter("flowunid", flowunid).getSingleResult(false);
+ return bo != null?bo.getAttribute("sumMoney").getString():"0.00";
+ }
public static String getFundPlanMoney(String planID) throws Exception{
BizObject bo = JBOFactory.createBizObjectQuery(LC_FUND_PLAN.CLASS_NAME, "ID=:PLANID")
.setParameter("PLANID", planID).getSingleResult(false);
@@ -207,19 +237,4 @@ public class ColRelativeInfo {
}
return money.setScale(2).toString();
}
-
- public static String getCustNameByCUSTID(String CUST_ID) throws Exception {
- String custname="";
- if(!"".equals(CUST_ID)&&CUST_ID!=null){
- BizObject bo = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME)
- .createQuery("customerid=:customerid").setParameter("customerid", CUST_ID).getSingleResult(false);
- custname=bo!=null?bo.getAttribute("customername").getString():"";
- }
- return custname;
- }
-
- public static String getAccNumberByContractID(String CONTRACT_ID)throws Exception {
- return "";
-
- }
}