anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhangjun

Browse Source
This commit is contained in:
liuz 2018-07-19 20:47:19 +08:00
commit c249111337
8 changed files with 103 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp
View File

@ -32,6 +32,7 @@
String sFlowUnid = CurPage.getParameter("FlowUnid");//Á÷³Ì±àºÅ
String PhaseNo = CurPage.getParameter("PhaseNo");
if(sFlowUnid == null) sFlowUnid = "";
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
@ -53,7 +54,7 @@
CurPage.getCurComp().setAttribute("RightType", null);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
if((null!=RightType&&RightType.equals("ReadOnly")&&(!PhaseNo.equals("0010")))||(null!=ishistory&&ishistory.equals("true"))){
dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ
isShowButton=false;
}else{

5
WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
View File

@ -41,13 +41,14 @@
if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
RightType="ReadOnly";
sButtons=new String[][] {
{"false","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""}
{"false","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""},
{"true","","Button","ɾ³ý","ɾ³ý","deletecontract()","","","","btn_icon_delete",""},
};
}else{
sButtons=new String[][]{
{"false","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
{"false","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""},
{"true","","Button","ɾ³ý","ɾ³ý","deletecontract()","","","","btn_icon_delete",""},
{"false","","Button","ɾ³ý","ɾ³ý","deletecontract()","","","","btn_icon_delete",""},
//{"true","","Button","生成合同","删除","createContractByTemplate()","","","","btn_icon_up",""},
//{"true","","Button","上传","新增文档信息","uploadContract()","","","","btn_icon_up",""}
};

4
WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
View File

@ -86,10 +86,10 @@
$(document).ready(function(){
var RightType="<%=RightType%>";
var phaseno="<%=phaseno%>"
if(RightType=="ReadOnly"){
/* if(RightType=="ReadOnly"){
$('#A_Group_0010').css('display','none');
$('#A_Group_0020').css('display','none');
}
} */
if(phaseno=="0015"){
$('#ButtonTR').css('display','block');
$('#A_Group_0010').css('display','none');

5
WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
View File

@ -10,7 +10,6 @@
//alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡
return;
}
debugger;
sReturn = sReturn.split("@");
var contract_id=sReturn[0];
var project_id=sReturn[1];
@ -18,8 +17,10 @@
var contract_number = sReturn[3];
var project_name = sReturn[4];
var project_no = sReturn[4].split("-")[0];
var customertype = sReturn[6];
var leasform = sReturn[7];
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams =sParams+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
sParams =sParams+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");

24
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -3953,6 +3953,30 @@
</managerProperties>
</manager>
</class>
<class name="CONFIGURATE" label="" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="64"/>
<attribute name="ATTR_ID" label="属性ID" type="STRING" length="64"/>
<attribute name="ATTR_VALUE" label="属性值" type="STRING" length="64"/>
<attribute name="FIELD1" label="属性1" type="STRING" length="64"/>
<attribute name="FIELD2" label="属性2" type="STRING" length="64"/>
<attribute name="FIELD3" label="属性3" type="STRING" length="64"/>
<attribute name="FIELD4" label="属性4" type="STRING" length="64"/>
<attribute name="FIELD5" label="属性5" type="STRING" length="64"/>
<attribute name="INPUTUSERID" label="创建人" type="STRING" length="64"/>
<attribute name="INPUTORGID" label="创建所属部门" type="STRING" length="64"/>
<attribute name="INPUTTIME" label="创建时间" type="STRING" length="64"/>
<attribute name="UPDATEUSERID" label="修改人" type="STRING" length="64"/>
<attribute name="UPDATEORGID" label="修改人所属部门" type="STRING" length="64"/>
<attribute name="UPDATETIME" label="修改时间" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="configurate" />
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
</package>
<package name="jbo.com.tenwa.lease.carbrand" >
<class name="LB_CLAIMS_BOOK_DETAIL" label="索赔申请书详情表" keyAttributes="ID">

30
WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp Normal file
View File

@ -0,0 +1,30 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
/*
Author: undefined 2018-07-19
Content: 示例详情页面
History Log:
*/
String sPrevUrl = CurPage.getParameter("PrevUrl");
if(sPrevUrl == null) sPrevUrl = "/com/tenwa/apzl/configurate/ConfigurateList.jsp";
String sTempletNo = "ConfigurateInfo";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
//doTemp.setColTips("", "测试");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//只读模式
dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
String sButtons[][] = {
{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
};
sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function returnList(){
AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

37
WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp Normal file
View File

@ -0,0 +1,37 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
/*
Author: undefined 2018-07-19
Content:
History Log:
*/
ASObjectModel doTemp = new ASObjectModel("ConfigurateList");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow("");
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
function newRecord(){
var sUrl = "/com/tenwa/apzl/configurate/ConfigurateInfo.jsp";
AsControl.OpenView(sUrl,'','_self','');
}
function viewAndEdit(){
var sUrl = "/com/tenwa/apzl/configurate/ConfigurateInfo.jsp";
var sPara = getItemValue(0,getRow(0),'ID');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空！");
return ;
}
AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

4
src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
View File

@ -108,12 +108,12 @@ public class FileTemplateUtil {
if("01".equals(leasform)){
/*return "[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端直租','value':'24aba365e2794a018814ae81341486bf'},"
+ "{'text':'直租个人授权协议书','value':'3334eed6051248b88cd4f2a22e93ac96'},]"+"\"}]";*/
return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏͬ','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]";
return "[{'fileTemplate':\""+"[{'text':'ºÏͬ£¨Ö±×⣩','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]";
}else{
/*return "[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端回租','value':'641c55a1168f4a488a5028ee68870156'},"
+ "{'text':'回租个人授权协议书','value':'e980635a77124d5598be1717c062b877'},"
+ "{'text':'抵押合同','value':'ec90c114914d4725b57729107888511c'}]"+"\"}]";*/
return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏͬ£¨ÊÛºó»Ø×⣩','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]";
return "[{'fileTemplate':\""+"[{'text':'ºÏͬ£¨ÊÛºó»Ø×⣩','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]";
}
}