diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index fd464ceff..b14fcfd9d 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -1,55 +1,84 @@
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
- /*
- Author: undefined 2018-05-27
- Content: 示例详情页面
- History Log:
- */
- String sFlowUnid = CurPage.getParameter("FlowUnid");
- String sPrevUrl = CurPage.getParameter("id");
- String sTempletNo = "DMarginChargeInfo_Temp";//--模板号--
- ASObjectModel doTemp = new ASObjectModel(sTempletNo);
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
- dwTemp.Style = "2";//freeform
- dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
- String sButtons[][] = {
- {"true","All","Button","保存","保存所有修改","save()","","","",""},
- {"true","All","Button","返回","返回列表","returnList()","","","",""}
- };
-%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
-
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2018-05-27
+ Content: 示例详情页面
+ History Log:
+ */
+ String sFlowUnid = CurPage.getParameter("FlowUnid");
+ String sPrevUrl = CurPage.getParameter("id");
+ String sTempletNo = "DMarginChargeInfo_Temp";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+ String sButtons[][] = {
+ {"true","All","Button","保存","保存所有修改","save()","","","",""},
+ {"true","All","Button","返回","返回列表","returnList()","","","",""}
+ };
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Frame/page/js/ow/as_dw_info.js b/WebContent/Frame/page/js/ow/as_dw_info.js
index 04081eb22..a4cea6e0b 100644
--- a/WebContent/Frame/page/js/ow/as_dw_info.js
+++ b/WebContent/Frame/page/js/ow/as_dw_info.js
@@ -413,7 +413,7 @@ function showItemRequired(dwname,sColName){
data: "DataObject=" + $("#SERIALIZED_ASD").val() + "&ColName="+ sColName + "&Required=1",
success: function(msg){
if(msg.substring(0,5)=="fail:"){
- alert('校验更新失败:' +msg.substring(5));
+ //alert('校验更新失败:' +msg.substring(5)); 2018/07/08 by zhulh 找不到校验文件没啥好大惊小怪的
return;
}
$("#SERIALIZED_ASD").val(msg);
diff --git a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
index f6c65f00e..19f55619f 100644
--- a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
+++ b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
@@ -25,7 +25,8 @@ try{
ObjectConverts.saveObject(new java.io.File(Component.getDWTmpPath(asObj.getSerializableName())), asObj);
out.print(sDataObject);
}catch(Exception e){
- e.printStackTrace();
+ //e.printStackTrace();2018/07/08 by zhulh 找不到校验文件没啥好大惊小怪的
+ ARE.getLog().error(e.getMessage());
out.print("fail:"+ e.toString());
}
%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
index 21de64ee4..8aad8aaec 100644
--- a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
@@ -27,7 +27,16 @@
//alert(getHtmlMessage('1'));//请选择一条信息!
return;
}
- Return =Return+sReturn;
+ var arr = sReturn.split("@~");
+ //定义一个新的数组
+ var sReturns = "";
+ //遍历数组
+ for(var i = 0;i
+<%@ page import="com.tenwa.comm.dataRightmanager.DataRightManager" %>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ String jboWhere = CurPage.getParameter("JboWhere");
+ if(jboWhere == null){
+ jboWhere = "";
+ }
+ String RightType=CurPage.getParameter("RightType");
+ if(RightType==null) RightType="";
+ String curUserId = CurUser.getUserID();
+ String curOrgId = CurUser.getOrgID();
+ ASObjectModel doTemp = new ASObjectModel("LBContractInfoForAccount");
+ String sCondtion=DataRightManager.getRightCondition(CurUser,"O");
+ doTemp.appendJboWhere(sCondtion);
+ doTemp.appendJboWhere(jboWhere);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1";
+ dwTemp.ReadOnly = "1";
+ dwTemp.setPageSize(pageSize == null ? 20 : Integer.parseInt(pageSize));
+
+ dwTemp.genHTMLObjectWindow("");
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][];
+ if(jboWhere.endsWith("'approve_status05'")){
+ sButtons = new String[][]{
+ {"true","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_detail",""},
+ {"true","","Button","取消","取消","del()","","","","btn_icon_delete",""}
+ };
+ }else{
+ sButtons = new String[][]{
+ {"true","","Button","详情","详情","view()","","","","btn_icon_detail",""}
+ };
+ }
+%><%@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/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeListMain.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeListMain.jsp
new file mode 100644
index 000000000..03f3c51f6
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeListMain.jsp
@@ -0,0 +1,60 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin.jspf"%>
+<%
+ /*
+ 页面说明:示例模块主页面
+ */
+ String PG_TITLE = "扣款卡信息变更申请"; // 浏览器窗口标题 PG_TITLE
+ String PG_CONTENT_TITLE = " 示例模块主页面 "; //默认的内容区标题
+ String PG_CONTNET_TEXT = "请点击左侧列表";//默认的内容区文字
+ String PG_LEFT_WIDTH = "200";//默认的treeview宽度
+
+ //获得参数,判断是否直接打开其中某个页面
+ String pageType = CurPage.getParameter("pageType");
+ if(pageType == null){
+ pageType = "我的草稿";
+ }
+
+ //定义Treeview
+ OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage, "示例模块主页面","right");
+
+ //定义树图结构
+ tviTemp.insertPage("root","我的草稿","",1);
+ tviTemp.insertPage("root","待审核的申请","",2);
+ tviTemp.insertPage("root","审核中的申请","",3);
+ tviTemp.insertPage("root","审核通过的申请","",4);
+ tviTemp.insertPage("root","审核不通过的申请","",5);
+
+ //另外两种定义树图结构的方法:SQL生成和代码生成 参见View的生成 ExampleView.jsp和ExampleView01.jsp
+%>
+<%@ include file="/Frame/resources/include/include_main.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp
new file mode 100644
index 000000000..f0ecb5a8c
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp
@@ -0,0 +1,92 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocumentListAction" %>
+<%
+ //获得组件参数
+ String sObjectType=CurPage.getParameter("ObjectType");//
+ String contractId=CurPage.getParameter("ContractId");
+
+ ASObjectModel doTemp = new ASObjectModel("LBAdjustDocumentInfo");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="2"; // 设置DW风格 1:Grid 2:Freeform
+ dwTemp.ReadOnly = "0"; // 设置是否只读 1:只读 0:可写
+ dwTemp.genHTMLObjectWindow("");
+ String[][] sButtons=null;
+ sButtons=new String[][]{
+ {"true","","Button","保存","保存所有修改","importRecord()","","","",""},
+ {"true","","Button","取消","取消","viewAndEdit_attachment()","","","","btn_icon_close"}};
+%><%@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/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp
new file mode 100644
index 000000000..c437635da
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp
@@ -0,0 +1,260 @@
+<%@page import="jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "法人现扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String ID = CurPage.getParameter("id");//租赁物ID
+ if(ID == null)ID = "";
+ String RightType=CurPage.getParameter("RightType");
+ String ContractId = CurPage.getParameter("ContractId");
+ String applyId = CurPage.getParameter("ApplyId");
+ if(ContractId == null) ContractId = "";
+ String customerid = CurPage.getParameter("CustomerId");
+ String sTempletNo ="LBDeductCardChangeCompany";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.setHtmlEvent("IS_CONSIGN_REPAY", "onchange", "checkIsConsignRepay");
+
+ //获取变更表里面的数据,根据process判断是否已经签约了,如果已经签约了,现扣款卡信息页面为只读
+ BizObject boAccount = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME).createQuery("flow_unid=:applyId and file_flag='yes'").setParameter("applyId", applyId).getSingleResult(false);
+ if(boAccount!=null){
+ String signType = boAccount.getAttribute("SIGN_TYPE").toString();
+ if(signType!="" ){
+ RightType= "ReadOnly";
+ }
+ }
+
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ if((null!=RightType&&RightType.equals("ReadOnly"))){
+ dwTemp.ReadOnly = "1";//只读模式
+ RightType="ReadOnly";
+ isShowButton=false;
+ }else{
+ isShowButton=true;
+ }
+ dwTemp.Style = "2";//freeform
+ dwTemp.genHTMLObjectWindow(applyId);
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ // {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ };
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp
new file mode 100644
index 000000000..87d53697e
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp
@@ -0,0 +1,330 @@
+<%@page import="jbo.com.tenwa.lease.comm.LB_UNION_LESSEE"%>
+<%@page import="jbo.app.tenwa.customer.CUSTOMER_TEL"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_DEDUCT_CARD_HIS"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "法人原扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String ID = CurPage.getParameter("id");//租赁物ID
+ if(ID == null)ID = "";
+ String RightType=CurPage.getParameter("RightType");
+ if(RightType==null)RightType="";
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId == null) ContractId = "";
+ String PROJECT_ID = CurPage.getParameter("ProjectId");
+ if(PROJECT_ID == null) PROJECT_ID = "";
+ String CustomerId = CurPage.getParameter("CustomerId");
+ if(CustomerId == null) CustomerId = "";
+ String customerType=CurPage.getParameter("CustomerType");
+ if(customerType == null) customerType = "";
+ String applyId = CurPage.getParameter("ApplyId");
+ if(applyId == null) applyId = "";
+
+ //获取电话号码,电子签章用
+ BizObjectManager bomTel = JBOFactory.getBizObjectManager(CUSTOMER_TEL.CLASS_NAME);
+ BizObject boTel = bomTel.createQuery("select * from o where customerid=:customerid").setParameter("customerid",CustomerId).getSingleResult(false);
+ String telephone = boTel.getAttribute("telephone").toString();
+
+ //获取姓名,电子签章用
+ BizObjectManager bomName = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME);
+ BizObject boName = bomName.createQuery("select * from o where CONTRACT_ID=:contract_id").setParameter("contract_id",ContractId).getSingleResult(false);
+ String customerName = boName.getAttribute("customer_name").toString();
+
+ String status = CurPage.getParameter("Status");
+ String sTempletNo ="LBDeductCardOld";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ if("approve_status02".equals(status)){
+ doTemp.setJboClass(LB_DEDUCT_CARD_HIS.CLASS_NAME);
+ doTemp.appendJboWhere("apply_id='"+CurPage.getParameter("ApplyId")+"'");
+ }
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ if(RightType!=null && "ReadOnly".equals(RightType)){
+ isShowButton=false;
+ }
+ dwTemp.genHTMLObjectWindow(ContractId);
+ String compClientID = request.getParameter("CompClientID");
+ dwTemp.replaceColumn("change", "", CurPage.getObjectWindowOutput());
+ dwTemp.replaceColumn("contractList", "", CurPage.getObjectWindowOutput());
+
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ {"true","","Button","生成变更材料","生成合同","generateQuotation()","","","","btn_icon_detail",""},
+ {"true","","Button","发起电子签约","电子签章合同","signOnLine()","","","","btn_icon_detail",""},
+ {"true","","Button","查询签约结果","查询签约结果","getStatus()","","","","btn_icon_detail",""},
+ {"true","All","Button","修改","修改","edit()","","","","btn_icon_edit"},
+ {"false","","Button","下载合同文件","下载合同","downloadDoc()","","","","btn_icon_down",""}
+ };
+ //sButtonPosition = "south";
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyMain.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyMain.jsp
new file mode 100644
index 000000000..f6ee03fa9
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyMain.jsp
@@ -0,0 +1,98 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin.jspf"%>
+<%
+ /*
+ 页面说明:示例模块主页面
+ */
+ String PG_TITLE = "示例模块主页面"; // 浏览器窗口标题 PG_TITLE
+ String PG_CONTENT_TITLE = " 示例模块主页面 "; //默认的内容区标题
+ String PG_CONTNET_TEXT = "请点击左侧列表";//默认的内容区文字
+ String PG_LEFT_WIDTH = "200";//默认的treeview宽度
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId == null) ContractId = "";
+ //定义Treeview
+ OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage, "扣款信息变更","right");
+
+ out.write(new Button("关闭", "关闭", "closePage()", "", "btn_icon_close").getHtmlText());
+ out.write(new Button("提交", "提交", "doSubmit()", "", "btn_icon_submit").getHtmlText());
+
+ //定义树图结构
+ /* String sFolder1=tviTemp.insertFolder("root","示例信息","",1);
+ tviTemp.insertPage(sFolder1,"所有的示例信息","",1);
+ tviTemp.insertPage(sFolder1,"我的示例信息","",2);
+ tviTemp.insertPage(sFolder1,"他的示例信息","",3); */
+ tviTemp.insertPage("root","项目基本信息","",1);
+ tviTemp.insertPage("root","扣款信息变更","",2);
+ tviTemp.insertPage("root","合同打印","",3);
+
+ //另外两种定义树图结构的方法:SQL生成和代码生成 参见View的生成 ExampleView.jsp和ExampleView01.jsp
+%>
+<%@ include file="/Frame/resources/include/include_main.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp
new file mode 100644
index 000000000..93cc996a1
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp
@@ -0,0 +1,213 @@
+<%@page import="jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "自然人现扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String ID = CurPage.getParameter("id");//租赁物ID
+ if(ID == null)ID = "";
+ String RightType=CurPage.getParameter("RightType");
+ if(RightType==null)RightType="";
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId == null) ContractId = "";
+ String applyId = CurPage.getParameter("ApplyId");
+ if(applyId == null) applyId = "";
+
+ String sTempletNo ="LBDeductCardChange";//--模板号--
+
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ //获取变更表里面的数据,根据process判断是否已经签约了,如果已经签约了,现扣款卡信息页面为只读
+ BizObject boAccount = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME).createQuery("flow_unid=:applyId and file_flag='yes'").setParameter("applyId", applyId).getSingleResult(false);
+ if(boAccount!=null){
+ String signType = boAccount.getAttribute("SIGN_TYPE").toString();
+ if(signType!="" ){
+ RightType= "ReadOnly";
+ }
+ }
+
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ if(RightType!=null && RightType.equals("ReadOnly")){
+ dwTemp.ReadOnly = "1";//只读模式
+ }
+ dwTemp.Style = "2";//freeform
+ dwTemp.genHTMLObjectWindow(applyId);
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ //{"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ };
+ //sButtonPosition = "south";
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
new file mode 100644
index 000000000..7cb215c2b
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
@@ -0,0 +1,326 @@
+<%@page import="jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_DEDUCT_CARD_CHANGE"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_UNION_LESSEE"%>
+<%@page import="jbo.app.tenwa.customer.CUSTOMER_TEL"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_DEDUCT_CARD_HIS"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "自然人原扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String ID = CurPage.getParameter("id");//租赁物ID
+ if(ID == null)ID = "";
+ String RightType=CurPage.getParameter("RightType");
+ if(RightType==null)RightType="";
+ String applyId = CurPage.getParameter("ApplyId");
+ if(applyId==null)applyId="";
+ String customerType=CurPage.getParameter("CustomerType");
+ if(customerType==null)customerType="";
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId==null)ContractId="";
+ String customerId = CurPage.getParameter("CustomerId");
+ if(customerId==null)customerId="";
+ //获取电话号码
+ BizObjectManager bomTel = JBOFactory.getBizObjectManager(CUSTOMER_TEL.CLASS_NAME);
+ BizObject boTel = bomTel.createQuery("select * from o where customerid=:customerid").setParameter("customerid",customerId).getSingleResult(false);
+ String telephone = boTel.getAttribute("telephone").toString();
+ //获取姓名
+ BizObjectManager bomName = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME);
+ BizObject boName = bomName.createQuery("select * from o where CONTRACT_ID=:contract_id").setParameter("contract_id",ContractId).getSingleResult(false);
+ String customerName = boName.getAttribute("customer_name").toString();
+
+
+
+ if(customerId == null) customerId = "";
+ String status = CurPage.getParameter("Status");
+ String sTempletNo ="LBDeductCardOldPerson";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.setVisible("IS_CONSIGN_REPAY", false);
+ doTemp.setVisible("CONSIGN_REPAY_CERT", false);
+ doTemp.setVisible("CONSIGN_REPAY_PHONE", false);
+ if("approve_status02".equals(status)){
+ doTemp.setJboClass(LB_DEDUCT_CARD_HIS.CLASS_NAME);
+ doTemp.appendJboWhere("apply_id='"+CurPage.getParameter("ApplyId")+"'");
+ }
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ if(RightType!=null && "ReadOnly".equals(RightType)){
+ isShowButton=false;
+ }
+
+
+ dwTemp.genHTMLObjectWindow(ContractId);
+ String compClientID = request.getParameter("CompClientID");
+ dwTemp.replaceColumn("change", "", CurPage.getObjectWindowOutput());
+ dwTemp.replaceColumn("contractList", "", CurPage.getObjectWindowOutput());
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ {"true","","Button","生成变更材料","生成合同","generateQuotation()","","","","btn_icon_detail",""},
+ {"true","","Button","发起电子签约","电子签章合同","signOnLine()","","","","btn_icon_detail",""},
+ {"true","","Button","查询签约结果","查询签约结果","getStatus()","","","","btn_icon_detail",""},
+ {"true","All","Button","修改","修改","edit()","","","","btn_icon_edit"},
+ {"false","","Button","下载合同文件","下载合同","downloadDoc()","","","","btn_icon_down",""}
+ };
+ //sButtonPosition = "south";
+
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonMain.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonMain.jsp
new file mode 100644
index 000000000..340314eea
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonMain.jsp
@@ -0,0 +1,97 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin.jspf"%>
+<%
+ /*
+ 页面说明:示例模块主页面
+ */
+ String PG_TITLE = "示例模块主页面"; // 浏览器窗口标题 PG_TITLE
+ String PG_CONTENT_TITLE = " 示例模块主页面 "; //默认的内容区标题
+ String PG_CONTNET_TEXT = "请点击左侧列表";//默认的内容区文字
+ String PG_LEFT_WIDTH = "200";//默认的treeview宽度
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId == null) ContractId = "";
+ //定义Treeview
+ OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage, "扣款信息变更","right");
+
+ out.write(new Button("关闭流程", "关闭流程", "closePage()", "", "btn_icon_close").getHtmlText());
+ out.write(new Button("提交", "提交", "submitApply()", "", "btn_icon_submit").getHtmlText());
+ //定义树图结构
+ /* String sFolder1=tviTemp.insertFolder("root","示例信息","",1);
+ tviTemp.insertPage(sFolder1,"所有的示例信息","",1);
+ tviTemp.insertPage(sFolder1,"我的示例信息","",2);
+ tviTemp.insertPage(sFolder1,"他的示例信息","",3); */
+ tviTemp.insertPage("root","项目基本信息","",1);
+ tviTemp.insertPage("root","扣款信息变更","",2);
+ tviTemp.insertPage("root","合同打印","",3);
+
+ //另外两种定义树图结构的方法:SQL生成和代码生成 参见View的生成 ExampleView.jsp和ExampleView01.jsp
+%>
+<%@ include file="/Frame/resources/include/include_main.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp
new file mode 100644
index 000000000..6d6082ed1
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp
@@ -0,0 +1,36 @@
+<%@page import="jbo.sys.CHANNEL_SUBMIT_APPLICATIONS"%>
+<%@page import="com.tenwa.action.channelportal.channelsubmit.ChannelSubmitAction" %>
+<%@page import="com.tenwa.action.channelportal.businesshanding.businesschangeapply.ChannelUpdate" %>
+<%@page import="com.amarsoft.are.jbo.*"%>
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBeginMDAJAX.jsp"%><%
+ try{
+ String ContractId = CurPage.getParameter("ContractId");
+ String flowNo = "AccountChangeFlow";
+ String ProjectId = CurPage.getParameter("ProjectId");
+ String CustomerType = CurPage.getParameter("CustomerType");
+ String param ="ContractId="+ContractId+"&ProjectId="+ProjectId+"&CustomerType="+CustomerType;
+
+ String curUserId=CurPage.getParameter("CurUserID");
+ BizObjectManager bom=JBOFactory.getBizObjectManager(CHANNEL_SUBMIT_APPLICATIONS.CLASS_NAME);
+
+ if(bom!=null){
+ List bos = bom.createQuery("select * from O WHERE Objectno=:Objectno and FlowNo='AccountChangeFlow' and status='approve_status01'")
+ .setParameter("Objectno", ContractId)
+ .getResultList();
+ if(bos.size()>0){
+ out.print("请勿重复提交");
+ }else{
+ String result =ChannelSubmitAction.changeSubmitStatus(curUserId,ContractId,flowNo,param,null);
+ if("SUCCESS".equals(result)){
+ out.print("SUCCESS");
+ }else{
+ out.print("ERROR");
+ }
+ }
+ }
+ }catch(Exception e){
+ out.print("ERROR");
+ throw e;
+ }
+%><%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp
new file mode 100644
index 000000000..bd7eed0e5
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp
@@ -0,0 +1,70 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-09-28
+ Content:
+ History Log:
+ */
+ String applyId = CurPage.getParameter("applyId");
+ if(applyId==null) applyId = "";
+ String customerType = CurPage.getParameter("customerType");
+ if(customerType==null) customerType = "";
+ ASObjectModel doTemp = new ASObjectModel("DeductCardDocList");
+ //根据中间表id查询
+ doTemp.appendJboWhere("flow_unid='"+applyId+"'");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(20);
+ dwTemp.genHTMLObjectWindow("");
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+
+ };
+%><%@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/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
index a5f7f946d..d65d8deac 100644
--- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
+++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
@@ -199,7 +199,7 @@ FlowFunction.signOpinion=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,isLoadS
}
//弹出签意见界面
AsDialog.PopView("/Common/WorkFlow/SignTaskOpinionInfo.jsp","TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo,
- {width:"700px",height:"600px",title:"签署意见"},function(sReturn){
+ {width:"500px",height:"300px",title:"签署意见"},function(sReturn){
if(sReturn.length>0){
if(sReturn=="SUCCESS"){
alert("签署意见成功");
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
new file mode 100644
index 000000000..f3d482d9e
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
@@ -0,0 +1,76 @@
+<%@ page contentType="text/html; charset=GBK"%>
+ <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf"%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=自定义函数;]~*/%>
+
+ <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp
new file mode 100644
index 000000000..d174fc211
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp
@@ -0,0 +1,156 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "自然人现扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String FlowUnid = CurPage.getParameter("FlowUnid");
+ String rightType = CurPage.getParameter("RightType");
+ if(FlowUnid == null)FlowUnid = "";
+ String ContractId = CurPage.getParameter("ContractId");
+ String IsHistory = CurPage.getParameter("IsHistory");
+ String PhaseNo = CurPage.getParameter("PhaseNo");
+ if(ContractId == null) ContractId = "";
+ String sTempletNo ="LBDeductCardChangeCompanyTemp";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly="1";
+ dwTemp.genHTMLObjectWindow(FlowUnid);
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ {"false","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ };
+ sButtonPosition = "south";
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyInfo.jsp
new file mode 100644
index 000000000..af6b7d384
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyInfo.jsp
@@ -0,0 +1,106 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "自然人原扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String FlowUnid = CurPage.getParameter("FlowUnid");
+ if(FlowUnid == null)FlowUnid = "";
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId == null) ContractId = "";
+ String applyId = CurPage.getParameter("ChannelApplyId");
+ if(applyId==null)applyId="";
+ String RightType = CurPage.getParameter("RightType");
+ if(RightType!=null)RightType = "";
+ String sTempletNo ="LBDeductCardOldTemp";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.setVisible("IS_CONSIGN_REPAY", true);
+ doTemp.setVisible("CONSIGN_REPAY_CERT", true);
+ doTemp.setVisible("CONSIGN_REPAY_PHONE", true);
+ doTemp.setVisible("DEBIT_BANK", true);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.genHTMLObjectWindow(FlowUnid);
+ String compClientID = request.getParameter("CompClientID");
+ dwTemp.replaceColumn("change", "", CurPage.getObjectWindowOutput());
+ dwTemp.replaceColumn("contractList", "", CurPage.getObjectWindowOutput());
+
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ {"ReadOnly".equals(RightType)?"false":"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ };
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp
new file mode 100644
index 000000000..aa21b7126
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp
@@ -0,0 +1,173 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "自然人现扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String FlowUnid = CurPage.getParameter("FlowUnid");
+ String rightType = CurPage.getParameter("RightType");
+ if(FlowUnid == null)FlowUnid = "";
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId == null) ContractId = "";
+ String applyId = CurPage.getParameter("ChannelApplyId");
+ if(applyId == null) applyId = "";
+ String sTempletNo ="LBDeductCardChangeTemp";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.genHTMLObjectWindow(FlowUnid);
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ /* {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}, */
+ };
+ sButtonPosition = "south";
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonInfo.jsp
new file mode 100644
index 000000000..011e41f45
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonInfo.jsp
@@ -0,0 +1,103 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "自然人原扣款信息"; // 浏览器窗口标题 PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+
+<%
+ String FlowUnid = CurPage.getParameter("FlowUnid");
+ if(FlowUnid == null)FlowUnid = "";
+ String ContractId = CurPage.getParameter("ContractId");
+ if(ContractId == null) ContractId = "";
+ String applyId = CurPage.getParameter("ChannelApplyId");
+ if(applyId==null)applyId="";
+ String RightType = CurPage.getParameter("RightType");
+ if(RightType!=null)RightType = "";
+ String sTempletNo ="LBDeductCardOldTemp";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.genHTMLObjectWindow(FlowUnid);
+ String compClientID = request.getParameter("CompClientID");
+ dwTemp.replaceColumn("change", "", CurPage.getObjectWindowOutput());
+ dwTemp.replaceColumn("contractList", "", CurPage.getObjectWindowOutput());
+
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}
+ };
+ sButtonPosition = "north";
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp
new file mode 100644
index 000000000..bd7eed0e5
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp
@@ -0,0 +1,70 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2017-09-28
+ Content:
+ History Log:
+ */
+ String applyId = CurPage.getParameter("applyId");
+ if(applyId==null) applyId = "";
+ String customerType = CurPage.getParameter("customerType");
+ if(customerType==null) customerType = "";
+ ASObjectModel doTemp = new ASObjectModel("DeductCardDocList");
+ //根据中间表id查询
+ doTemp.appendJboWhere("flow_unid='"+applyId+"'");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(20);
+ dwTemp.genHTMLObjectWindow("");
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+
+ };
+%><%@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/CollectionAudit/LcReviewAuditRentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
index 1ed91582a..c9723f6c3 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
@@ -24,8 +24,8 @@
String sButtons[][] = {
{"true","All","Button","批量扣款","批量扣款","batchCollect()","","","","btn_icon_add",""},
//{"true","All","Button","实时扣款","实时扣款","timelyCollect()","","","","btn_icon_add",""},
- {"true","All","Button","手工扣款","手工扣款","afterCollectManage()","","","","btn_icon_add",""},
- {"true","All","Button","查询批量扣款","查询批量扣款","queryBatchCollect()","","","","btn_icon_add",""},
+ //{"true","All","Button","手工扣款","手工扣款","afterCollectManage()","","","","btn_icon_add",""},
+ {"true","All","Button","手动刷新","手动刷新","queryBatchCollect()","","","","btn_icon_add",""},
{"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""},
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
index f15328dd7..ec46453c6 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
@@ -151,8 +151,12 @@ function getNameOfBank(){
var res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "verifyFourelementBank", parm);
if (res == "ERROR") {
alert("校验失败");
+ }else if(res == 'SUCCESS'){
+ alert('校验完成');
+ reloadSelf();
+ }else{
+ alert(res);
}
- reloadSelf();
}
//提示是否为指定银行
function vertifyBankIsValid(){
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
index ae6645fc8..2fd0e58fd 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
@@ -20,10 +20,10 @@
String sTempletNo = "GuarantorInfo";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
- doTemp.setDefaultValue("ASSUROR", customerid);
- doTemp.setDefaultValue("PROJECT_ID", ProjectId);
- doTemp.setDefaultValue("FLOWUNID", sFlowUnid);
- doTemp.setDefaultValue("DATA_STATE", "guarantee");//标记该数据是担保人信息
+// doTemp.setDefaultValue("ASSUROR", customerid);
+ doTemp.setDefaultValue("project_id", ProjectId);
+ doTemp.setDefaultValue("flowunid", sFlowUnid);
+// doTemp.setDefaultValue("DATA_STATE", "guarantee");//标记该数据是担保人信息
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//只读模式
@@ -113,7 +113,7 @@
function goBack(){
//要跳转的url
var url="/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp";
- var sparam="FlowUnid="+getItemValue(0,0,"FLOWUNID")+"&RightType="+'<%=RightType%>';
+ var sparam="FlowUnid="+getItemValue(0,0,"FLOWUNID")+"&ProjectId="+getItemValue(0,0,"project_id")+"&RightType="+'<%=RightType%>';
AsControl.OpenView(url,sparam,"_self","");
}
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index d69bec427..6be6f784f 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -74,32 +74,23 @@
dwTemp.getDataObject().setVisible("thirdopinion", true);
dwTemp.getDataObject().setRequired("thirdchoice", true);
dwTemp.getDataObject().setRequired("thirdopinion", true);
- dwTemp.setGroupHidden("0040,0050");
+ //dwTemp.setGroupHidden("0040,0050");
}else if("0050".equals(phaseNo)){
dwTemp.getDataObject().setVisible("firstchoice", true);
dwTemp.getDataObject().setVisible("firstopinion", true);
dwTemp.getDataObject().setReadOnly("firstchoice", true);
dwTemp.getDataObject().setReadOnly("firstopinion", true);
- dwTemp.getDataObject().setVisible("secondchoice", true);
- dwTemp.getDataObject().setVisible("secondopinion", true);
- dwTemp.getDataObject().setReadOnly("secondchoice", true);
- dwTemp.getDataObject().setReadOnly("secondopinion", true);
- if(money<200000){
- dwTemp.getDataObject().setVisible("thirdchoice", false);
- dwTemp.getDataObject().setVisible("thirdopinion", false);
- dwTemp.getDataObject().setRequired("thirdchoice", false);
- dwTemp.getDataObject().setRequired("thirdopinion", false);
- dwTemp.getDataObject().setReadOnly("thirdchoice", false);
- dwTemp.getDataObject().setReadOnly("thirdopinion", false);
- }else{
- dwTemp.getDataObject().setVisible("thirdchoice", true);
- dwTemp.getDataObject().setVisible("thirdopinion", true);
- dwTemp.getDataObject().setRequired("thirdchoice", true);
- dwTemp.getDataObject().setRequired("thirdopinion", true);
- dwTemp.getDataObject().setReadOnly("thirdchoice", true);
- dwTemp.getDataObject().setReadOnly("thirdopinion", true);
- }
- //dwTemp.setGroupHidden("0040,0050");
+ dwTemp.getDataObject().setVisible("secondchoice", false);
+ dwTemp.getDataObject().setVisible("secondopinion", false);
+ dwTemp.getDataObject().setReadOnly("secondchoice", false);
+ dwTemp.getDataObject().setReadOnly("secondopinion", false);
+ dwTemp.getDataObject().setVisible("thirdchoice", false);
+ dwTemp.getDataObject().setVisible("thirdopinion", false);
+ dwTemp.getDataObject().setRequired("thirdchoice", false);
+ dwTemp.getDataObject().setRequired("thirdopinion", false);
+ dwTemp.getDataObject().setReadOnly("thirdchoice", false);
+ dwTemp.getDataObject().setReadOnly("thirdopinion", false);
+ dwTemp.setGroupHidden("0030,0040,0050");
}
dwTemp.genHTMLObjectWindow(flowunid);
@@ -113,10 +104,10 @@
case '0020':
//$("#A_div_1210").attr("style","display:none;");
//$("#A_div_1220").attr("style","display:none;");
- //$("#A_div_1230").attr("style","display:none;");
- //$("#A_div_1240").attr("style","display:none;");
- //$("#A_div_1250").attr("style","display:none;");
- //$("#A_div_1260").attr("style","display:none;");
+ $("#A_div_1230").attr("style","display:none;");
+ $("#A_div_1240").attr("style","display:none;");
+ $("#A_div_1250").attr("style","display:none;");
+ $("#A_div_1260").attr("style","display:none;");
_user_validator[0]['rules']['FIRSTCHOICE']['required0'] = true;
_user_validator[0]['messages']['FIRSTCHOICE']['required0'] = '请输入初审意见';
_user_validator[0]['rules']['FIRSTOPINION']['required0'] = true;
@@ -127,8 +118,8 @@
//$("#A_div_1220").attr("style","display:none;");
//$("#A_div_1230").attr("style","display:none;");
//$("#A_div_1240").attr("style","display:none;");
- //$("#A_div_1250").attr("style","display:none;");
- //$("#A_div_1260").attr("style","display:none;");
+ $("#A_div_1250").attr("style","display:none;");
+ $("#A_div_1260").attr("style","display:none;");
_user_validator[0]['rules']['SECONDCHOICE']['required0'] = true;
_user_validator[0]['messages']['SECONDCHOICE']['required0'] = '请输入复审意见';
_user_validator[0]['rules']['SECONDOPINION']['required0'] = true;
@@ -150,9 +141,9 @@
$("#A_div_1210").attr("style","display:none;");
//$("#A_div_1220").attr("style","display:none;");
$("#A_div_1230").attr("style","display:none;");
- //$("#A_div_1240").attr("style","display:none;");
+ $("#A_div_1240").attr("style","display:none;");
$("#A_div_1250").attr("style","display:none;");
- //$("#A_div_1260").attr("style","display:none;");
+ $("#A_div_1260").attr("style","display:none;");
_user_validator[0]['rules']['FOURCHOICE']['required0'] = true;
_user_validator[0]['messages']['FOURCHOICE']['required0'] = '请输入总经理意见';
_user_validator[0]['rules']['FOUROPINION']['required0'] = true;
@@ -322,8 +313,14 @@
phaseChoice = getItemValue(0,0,"fourchoice");
phaseOpinion = getItemValue(0,0,"fouropinion");
}
+ var InterOpinion1 = getItemValue(0,0,"InterOpinion1");
+ var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1");
+ var InterOpinion2 = getItemValue(0,0,"InterOpinion2");
+ var DistriOpinion2 = getItemValue(0,0,"DistriOpinion2");
+ var InterOpinion3 = getItemValue(0,0,"InterOpinion3");
+ var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3");
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveApproveOpinion",
- "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
+ "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",InterOpinion1="+InterOpinion1+",DistriOpinion1="+DistriOpinion1+",InterOpinion2="+InterOpinion2+",DistriOpinion2="+DistriOpinion2+",InterOpinion3="+InterOpinion3+",DistriOpinion3="+DistriOpinion3+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
if("SUCCESS" == sResult){
resetDWDialog("保存成功!",true);
reloadSelf();
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
index 4bce4ca9b..2a55c85ff 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
@@ -7,11 +7,13 @@
History Log:
*/
String sPrevUrl = CurPage.getParameter("PrevUrl");
+ String ProjectId = CurPage.getParameter("ProjectId");
if(sPrevUrl == null) sPrevUrl = "";
String sTempletNo = "CustomerFamilyJoinTempInfo";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
doTemp.setColTips("", "");
+ doTemp.setDefaultValue("project_id", ProjectId);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//只读模式
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 130be71e9..761b7a09d 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -19,6 +19,7 @@
+
@@ -577,40 +578,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -893,43 +861,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1988,42 +1920,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3851,6 +3748,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/com/amarsoft/app/util/ProductParamUtil.java b/src/com/amarsoft/app/util/ProductParamUtil.java
index 00a974a95..8734deb96 100644
--- a/src/com/amarsoft/app/util/ProductParamUtil.java
+++ b/src/com/amarsoft/app/util/ProductParamUtil.java
@@ -22,7 +22,7 @@ import org.dom4j.io.XMLWriter;
import jbo.prd.PRD_SPECIFIC_LIBRARY;
import jbo.sys.LB_PRODUCT_INFO;
-import com.alibaba.fastjson.JSON;
+import com.amarsoft.app.als.prd.config.loader.ProductConfig;
import com.amarsoft.app.base.businessobject.BusinessObject;
import com.amarsoft.app.base.businessobject.BusinessObjectHelper;
import com.amarsoft.app.base.util.XMLHelper;
@@ -253,9 +253,10 @@ public class ProductParamUtil {
public static List