diff --git a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
index 0efd54c37..682dc38a7 100644
--- a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
+++ b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
@@ -16,8 +16,9 @@
String ContractId = CurPage.getParameter("ContractId");
String ContractNumber = CurPage.getParameter("FlowKey");
- String framenumber = Sqlca.getString("select FRAME_NUMBER from lb_equipment_car where contract_id ='"+ContractId+"'");
- String license_plate_number = Sqlca.getString("select license_plate_number from lb_equipment_car where contract_id ='"+ContractId+"'");
+ //String framenumber = Sqlca.getString("select FRAME_NUMBER from lb_equipment_car where contract_id ='"+ContractId+"'");
+ String framenumber = CurPage.getParameter("frameNumber");
+ String license_plate_number = Sqlca.getString("select license_plate_number from lb_equipment_car where contract_id ='"+ContractId+"' and FRAME_NUMBER='"+framenumber+"'");
//System.out.print(framenumber);
String sTempletNo = "LbCarLicensePlateInfoTemp";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
@@ -30,7 +31,7 @@
/* if("0020".equals(CurPage.getParameter("PhaseNo"))){
dwTemp.ReadOnly = "-2";//只读模式
} */
- dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")+","+framenumber);
String sButtons[][]=null;
/* if("0020".equals(CurPage.getParameter("PhaseNo"))){
sButtons =new String[][] {
@@ -39,11 +40,11 @@
};
}else{ */
sButtons =new String[][] {
- {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
- {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+ {"true","All","Button","保存","保存所有修改","as_save(0,'returnList()')","","","",""},
+ {"true","","Button","返回","返回列表","returnList()","","","",""}
};
// }
- sButtonPosition = "south";
+ //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/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
index db03bcb10..d144d24cc 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
@@ -126,7 +126,7 @@
//自然人电子签约
var operationType = "<%=operationType%>";
var sReturn = "";
- if("LHZL"==operationType){
+ if("LHZL"==operationType || "SQSYC"==operationType ){
sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>");
}else{
sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>");
@@ -177,7 +177,7 @@
var sParams="ProjectId=<%=projectId%>,customerType=<%=custtype%>,FlowUnid=<%=flowunid%>,CurUserID=<%=CurUser.getUserID()%>,SubjectId=<%=SubjectId%>";
var operationType = "<%=operationType%>";
var sReturn = "";
- if("LHZL"==operationType){
+ if("LHZL"==operationType || "SQSYC"==operationType ){
sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","contractSignStatus",sParams);
}else{
sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","contractSignStatus",sParams);
@@ -330,7 +330,7 @@
}
var operationType = "<%=operationType%>";
var sReturn = "";
- if("LHZL"==operationType){
+ if("LHZL"==operationType || "SQSYC"==operationType ){
sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","sendMessageAgain","ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>");
}else{
sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","sendMessageAgain","ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>");
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
index 3e694bc9f..35d468bbe 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@@ -355,8 +355,8 @@
if(("01"=="<%=customertype%>"&&"Auto" == "<%=sealType%>" )||("Auto" == "<%=sealType%>" && "Hand" == "<%=signType%>" )){
var falg = "";
var operationType = "<%=CurPage.getParameter("operationType")%>";
- if("LHZL"==operationType){
- falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>");
+ if("LHZL"==operationType || "SQSYC"==operationType){
+ falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>,operationType="+operationType);
}else{
falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>");
}
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/PayLBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/PayLBEquipmentList.jsp
new file mode 100644
index 000000000..fe4bacb90
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/PayLBEquipmentList.jsp
@@ -0,0 +1,57 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2020-09-11
+ Content:
+ History Log:
+ */
+ String flowNo = CurPage.getParameter("FlowNo");
+ String FlowUnid = CurPage.getParameter("FlowUnid");
+ String ContractId = CurPage.getParameter("ContractId");
+ String ContractNumber = CurPage.getParameter("FlowKey");
+
+ ASObjectModel doTemp = new ASObjectModel("LbEquipmentCarList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow(ContractId);
+
+ String falg = "false";
+ if( flowNo!=null && "MortgageFileFlow".equals(flowNo)){
+ falg = "true";
+ doTemp.setVisible("VNDR_NAME",false);
+ }else{
+ doTemp.setVisible("plate_number",false);
+ doTemp.setVisible("platetime",false);
+ doTemp.setVisible("is_pledge",false);
+ doTemp.setVisible("pledge_date",false);
+ doTemp.setVisible("is_delay",false);
+ doTemp.setVisible("delay_date",false);
+ }
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"false","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {falg,"","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/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
index b952ad6e3..3e9c48771 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
@@ -29,7 +29,9 @@
dwTemp.replaceColumn("GUARANTEE_LIST", "", CurPage.getObjectWindowOutput());
//dwTemp.replaceColumn("INVOICEINFO", "", CurPage.getObjectWindowOutput());
dwTemp.replaceColumn("INVOICEINFO", "", CurPage.getObjectWindowOutput());
-
+ //租赁物列表信息页面
+ dwTemp.replaceColumn("EQUIPMENT_LIST", "", CurPage.getObjectWindowOutput());
+
String sButtons[][] = {
{"true","","Button","保存","保存所有修改","save()","","","","btn_icon_save"},
};
diff --git a/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓鍟嗙敤杞-鐙ˉ.docx b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓鍟嗙敤杞-鐙ˉ.docx
new file mode 100644
index 000000000..191c8cef8
Binary files /dev/null and b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓鍟嗙敤杞-鐙ˉ.docx differ
diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
index 35eb37322..37064429c 100644
--- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
+++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
@@ -171,6 +171,8 @@ public class FileTemplateUtil {
return "[{'fileTemplate':\""+"[{'text':'合同(融资租赁商用车)','value':'7acb675c671b4f92ab8b45d26e477055'}]"+"\"}]";
}else if("LHZL".equals(operationType)){
return "[{'fileTemplate':\""+"[{'text':'联合租赁','value':'7ae245ef8b644b62a4658069adab6c32'}]"+"\"}]";
+ }else if("SQSYC".equals(operationType)){
+ return "[{'fileTemplate':\""+"[{'text':'狮桥商用车合同模板','value':'93e4194efb604c71b394d902b2060da8'}]"+"\"}]";
}else{
if("01".equals(leasform)){
return "[{'fileTemplate':\""+"[{'text':'合同(直租)','value':'333cd5b36cd846938e618516ba9c8cbb'}]"+"\"}]";
diff --git a/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java b/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java
index a860a314d..d1c0dc7f7 100644
--- a/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java
+++ b/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java
@@ -164,7 +164,7 @@ public class ContractSignActionTwoUtil {
public SdkResponse send(List