diff --git a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp
new file mode 100644
index 000000000..ad877fe8f
--- /dev/null
+++ b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp
@@ -0,0 +1,192 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%
+ /*
+ 带出业务申请时附件的专用页面
+ Author: undefined 2016-09-01
+ Content:
+ History Log:
+ */
+
+ String flowunid=CurPage.getParameter("FlowUnid");
+ String ProjectId=CurPage.getParameter("ProjectId");
+ String carAttributes=CurPage.getParameter("carAttributes");//获取车类型
+ if(flowunid==""||flowunid==null){
+ flowunid="flowunid";
+ }
+
+ String sObjectType = CurPage.getParameter("FlowNo");//流程类型
+ String ishistory=CurPage.getParameter("IsHistory");
+ String nodeNo=CurPage.getParameter("NodeNo");
+ String RightType= CurPage.getParameter("RightType");
+ String username=CurUser.getUserName();
+ String sTempletNo=CurPage.getParameter("TempletNo");
+ if(sTempletNo==null){
+ sTempletNo="FlowPayDocList";
+ }
+
+ String compClientID = request.getParameter("CompClientID");
+
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.appendJboWhere(" and rela.proj_id='"+ProjectId+"' and rela.objecttype='BusinessApplyFlow'");
+
+ doTemp.setLockCount(2);
+ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+ doTemp.setVisible("operation", false);
+ }
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "0";
+ dwTemp.setPageSize(50);
+ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+ dwTemp.ReadOnly = "1";//只读模式
+ RightType="ReadOnly";
+ isShowButton=false;
+ }else{
+ isShowButton=true;
+ }
+ dwTemp.genHTMLObjectWindow(flowunid);
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] =null;
+
+ sButtons=new String[][]{
+ {"true","","Button","保存","保存所有修改","saveRecord()","","","",""},
+ };
+
+%>
+
+<%@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/Comm/DocList/DocListMain.jsp b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp
index a24a8fe8b..0dd20db6f 100644
--- a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp
+++ b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp
@@ -40,7 +40,11 @@
var docList="<%=docList%>";
myleft.width=1;
if("SingleRow"=="<%=type%>"){
- AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
+ if("BusinessCancelFlow"=="<%=sFlowNo%>"){
+ AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right","");
+ }else{
+ AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
+ }
}else{
AsControl.OpenView("/Tenwa/Comm/DocList/CustomerDocTab.jsp","docList="+docList,"right","");
}
diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
index d03643405..e5e75d59f 100644
--- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
+++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
@@ -10,6 +10,7 @@
*/
String flowunid=CurPage.getParameter("FlowUnid");
+ String CustomerType=CurPage.getParameter("CustomerType");
String carAttributes=CurPage.getParameter("carAttributes");//获取车类型
if(flowunid==""||flowunid==null){
flowunid="flowunid";
@@ -44,6 +45,7 @@
Map docParam=new HashMap();
Map other=new HashMap();
other.put("carAttributes", carAttributes);
+ other.put("CustomerType", CustomerType);
docParam.put("ObjectType",sObjectType);
docParam.put("proj_id", flow.getAttribute("proj_id").getString());
docParam.put("contract_id", flow.getAttribute("contract_id").getString());
diff --git a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
index 325b87fcf..87bfee1be 100644
--- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
@@ -26,6 +26,9 @@
{"false","","Button","废弃","废弃","abandon()","","","","btn_icon_delete",""},
{"true","","Button","导入Excel","导入Excel","importExcel()","","","","btn_icon_import",""},
{"true","","Button","网银模版下载","网银模版下载","ebankDownload()","","","","btn_icon_down",""},
+ {"true","","Button","确认收入","确认收入","confirmIncome()","","","","btn_icon_valid",""},
+ {"true","","Button","确认退回","确认退回","confirmpayback()","","","","btn_icon_valid",""},
+
/* {"true","","Button","导入Excel-平安","导入Excel-平安","importPAExcel()","","","","btn_icon_import",""},
{"true","","Button","导入Excel-光大","导入Excel-光大","importCEBExcel()","","","","btn_icon_import",""},
{"true","","Button","光大网银模版下载","光大网银模版下载","ebankCEBDownload()","","","","btn_icon_down",""}, */
@@ -84,8 +87,11 @@
importCondition["inputorgid"]="<%=department%>";
var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据
AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam,
- {width:"320px",height:"40px",title:"上传网银Excel"},function(){reloadSelf();});
+ {width:"320px",height:"40px",title:"上传网银Excel"},function(){
+ importExcelNew();
+ reloadSelf();});
+
}
function importPAExcel(){
var importCondition={};//导入配置
@@ -142,5 +148,22 @@
}
AsControl.OpenView(sUrl,'id=' +sPara ,'_self','');
}
+ function importExcelNew(){
+
+ var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher","");
+
+ }
+ function confirmIncome(){
+ var sPara = getItemValue(0,getRow(0),'id');
+ if(typeof(sPara)=="undefined" || sPara.length==0 ){
+ alert("参数不能为空!");
+ return ;
+ }
+ var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+ebdataid);
+
+ }
+ function confirmpayback(){
+
+ }
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
index 23f3e7497..9d132388e 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
@@ -7,7 +7,9 @@
Content:
History Log:
*/
+ String username=CurUser.getUserName();
ASObjectModel doTemp = new ASObjectModel("OverdueDunningList");
+ doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'");
//String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//doTemp.appendJboWhere(sCondtion);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
index a4e43094d..7538609ab 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
@@ -10,7 +10,7 @@
*/
String userid=CurUser.getUserID();
ASObjectModel doTemp = new ASObjectModel("RentCollectionList");
- String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
+ //String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//doTemp.appendJboWhere(sCondtion);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java
index 1df6b6d08..3a2ca6fa7 100644
--- a/src_core/com/tenwa/doc/action/DocListInitAction.java
+++ b/src_core/com/tenwa/doc/action/DocListInitAction.java
@@ -36,9 +36,15 @@ public class DocListInitAction {
*/
@SuppressWarnings("unchecked")
public static void initDocList(Map param,Map other,String docno,Configure curConfig) throws Exception{
+ String CustomerType = other.get("CustomerType");
String[] itemnos=docno.split(",");
String s="";
for(int i=0;i0){
@@ -48,9 +54,11 @@ public class DocListInitAction {
BizObjectManager relaBm=JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME);
BizObjectManager libBm=JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
BizObjectManager configBm=JBOFactory.getBizObjectManager(LB_DOCCONFIG.CLASS_NAME);
-
+ if("".equals(docno)){
+ return;
+ }
String sql=getDocSQL(param,docno);
- BizObject rela=relaBm.createQuery(sql).getSingleResult(false);
+ BizObject rela=relaBm.createQuery(sql).getSingleResult(true);
String relativeid="";
String libid="";
if(rela==null){
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
index 4ced8986f..9c5445301 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
@@ -30,9 +30,9 @@ public class IncomeVoucher extends BaseBussiness {
cvci.CreateVoucher(FlowUnid, "PZ2018080400000103", "feetype27");//确认贴息收入--直租
- CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
- cvri.CreateVoucher(FlowUnid,"PZ2018081600000120");//网银收款转预收--回租
- cvri.CreateVoucher(FlowUnid,"PZ2018081600000121");//网银收款转预收--直租
+ //CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
+ //cvri.CreateVoucher(FlowUnid,"PZ2018081600000120");//网银收款转预收--回租
+ //cvri.CreateVoucher(FlowUnid,"PZ2018081600000121");//网银收款转预收--直租
return "true";
}
diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
index 639190ad9..63ff983d6 100644
--- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
@@ -58,6 +58,7 @@ public class VoucherToV8Impl implements VoucherService {
*/
private static final String Receive_Dealer_Margin="回款-收到经销商保证金";
private static final String Return_Dealer_Margin="放款-退回经销商保证金";
+ private static final String ebank_income="回款-银行存款转预收";
public String saveMessage(List