diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf index 4cde8a6a1..50c8117c4 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf @@ -50,9 +50,10 @@ dwTemp.Style="1"; //设置为Grid风格 //dwTemp.MultiSelect = true;//允许多选 dwTemp.ReadOnly = "1";//编辑模式 + doTemp.setVisible("ACTIONA","1040".equals(sPhaseType)); dwTemp.genHTMLObjectWindow(""); String sButtons[][] = applyManager.getButtonArr(); - + //control distributor(temporary) List buttonLists = Arrays.asList(sButtons); buttonLists = new ArrayList(buttonLists); @@ -101,4 +102,4 @@ %> <%@include file="/Tenwa/Core/FlowManager/BaseFunction/FlowCommButton.jspf"%> <%/*~END~*/%> -<%@include file="/Frame/resources/include/ui/include_list.jspf"%> \ No newline at end of file +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf index 92dcb115c..2ed4e5897 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf @@ -72,7 +72,7 @@ FlowFunction.doSubmit=function(sObjectType,sObjectNo,sTaskNo,sFlowName,sFlowNo,s var result= AsControl.RunJavaMethodTrans("com.tenwa.flow.treeview.action.CheckAndSaveTreeView","run","TaskNo="+sTaskNo); if(result!="success"){alert(result);return false;} //检查是否签署意见 - var isOpitionRequire=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getIsOpitionsRequire","flowNo="+sFlowNo+",phaseNo="+sPhaseNo) + var isOpitionRequire=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getIsOpitionsRequire","flowNo="+sFlowNo+",phaseNo="+sPhaseNo) if(isOpitionRequire=="Y"){ var sReturn = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","isSignOpinion","TaskNo="+sTaskNo);//返回值: yes-有意见; no-无意见; error-查询出错 if(sReturn!="yes") { @@ -81,44 +81,53 @@ FlowFunction.doSubmit=function(sObjectType,sObjectNo,sTaskNo,sFlowName,sFlowNo,s } return; }} - autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){ - if(riskMessage != true){ - return; - } - if(assignSubmitType=="1"){ - var isResult=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","doFinishAssignTask","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>"); - if(isResult=="SUCCESS"){ - var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; - this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); - alert("流程提交成功"); - FlowFunction.successCallBackReload(); - }else{ - alert("流程提交失败"); - } - }else{ - //处理退回直接提交的任务 - var res = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","checkBackType","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>"); - if(res == "success") { - var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; - this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); - alert("提交成功"); - FlowFunction.successCallBackReload(); - return; - } - - AsDialog.PopView("/Common/WorkFlow/FlowSubmitDialog.jsp","TaskNo="+sTaskNo,"dialogWidth=850px;dialogHeight=550px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){ - if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") { - return; - }else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){ - var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; - this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); - alert("提交成功!"); - FlowFunction.successCallBackReload(); - }else{ - alert(sPhaseInfo); - } - },"提交下一步");} - },sFlowName+":预警检查"); + //判断经销商留言是否填写 + if (sPhaseNo != "0010" && sPhaseNo != "0020") { + var isopenmassge = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction", "getjxsmessage", "TaskNo=" + sTaskNo); + if (isopenmassge == "Y") { + return this.getDealerMessage(sObjectNo, sPhaseNo, sTaskNo); + } + } + + autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){ + if(riskMessage != true){ + return; + } + if(assignSubmitType=="1"){ + var isResult=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","doFinishAssignTask","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>"); + if(isResult=="SUCCESS"){ + var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; + this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); + alert("流程提交成功"); + FlowFunction.successCallBackReload(); + }else{ + alert("流程提交失败"); + } + }else{ + //处理退回直接提交的任务 + var res = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","checkBackType","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>"); + if(res == "success") { + var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; + this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); + alert("提交成功"); + FlowFunction.successCallBackReload(); + return; + } + + AsDialog.PopView("/Common/WorkFlow/FlowSubmitDialog.jsp","TaskNo="+sTaskNo,"dialogWidth=850px;dialogHeight=550px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){ + if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") { + return; + }else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){ + var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; + this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); + alert("提交成功!"); + FlowFunction.successCallBackReload(); + }else{ + alert(sPhaseInfo); + } + },"提交下一步");} + },sFlowName+":预警检查"); + }; /*~[Describe=退回申请;InputParam=无;OutPutParam=无;]~*/ FlowFunction.successCallBackReload=function(){ @@ -139,6 +148,15 @@ FlowFunction.backStep=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,sTaskNo,sF } return; }} + + //判断经销商留言是否填写 + if (sPhaseNo != "0010" && sPhaseNo != "0020") { + var isopenmassge = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction", "getjxsmessage", "TaskNo=" + sTaskNo); + if (isopenmassge == "Y") { + return this.getDealerMessage(sObjectNo, sPhaseNo, sTaskNo); + } + } + if(sFlowName=="业务申请流程"){ autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){ if(riskMessage != true){ @@ -243,6 +261,16 @@ FlowFunction.signOpinion=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,isLoadS } }); }; + +/** + * 经销商留言 + */ +FlowFunction.getDealerMessage=function(sObjectNo,sPhaseNo,sTaskNo){ + var param = "flowunid="+sObjectNo+"&phaseNo="+sPhaseNo+"&taskno="+sTaskNo+"&userid=<%=CurPage.getUserId()%>&orgid=<%=CurPage.getUser().getOrgID()%>"; + var sUrl = "/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp"; + AsDialog.PopView(sUrl,param,"resizable=yes;dialogWidth=1000px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){},"经销商留言"); +} + /*~[Describe=查看意见;InputParam=无;OutPutParam=无;]~*/ FlowFunction.viewOpinions=function (sObjectType,sObjectNo,sFlowNo,sPhaseNo){ AsDialog.PopView("/Common/WorkFlow/ViewFlowOpinions.jsp","FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo,"","","流程审批意见"); diff --git a/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp b/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp index 5ca573ce4..802a5afa3 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp @@ -13,8 +13,8 @@ Content: 业务申请主界面 Input Param: Output param: - History Log: - + History Log: + */ %> <%/*~END~*/%> @@ -34,18 +34,18 @@ String sPrdStage = ""; //产品阶段 String isPageRead=""; //业务页面是否只读 String viewOperatorClass="";//视图处理类 - - - HashMapFlowFixedParam=GetFlowAction.getFlowParamByTask(CurPage.getParameter("TaskNo"),CurPage); + + HashMapFlowFixedParam=GetFlowAction.getFlowParamByTask(CurPage.getParameter("TaskNo"),CurPage); + FlowFixedParam.put("delTabs", CurPage.getParameter("delTabs")); FlowFixedParam.putAll(GetFlowAction.getFlowParamByFlowUnid(FlowFixedParam.get("ObjectNo"))); BizObject flowBussinessObject = GetFlowAction.getFlowBussinessObject(FlowFixedParam.get("ObjectNo")); //流程业务对象 FlowFixedParam.put("ProductId", flowBussinessObject.getAttribute("productId").getString()); - BizObject flowModel = GetFlowAction.getFlowModelParams(FlowFixedParam.get("FlowNo"),FlowFixedParam.get("PhaseNo")); //任务配置 + BizObject flowModel = GetFlowAction.getFlowModelParams(FlowFixedParam.get("FlowNo"),FlowFixedParam.get("PhaseNo")); //任务配置 isPageRead=flowModel.getAttribute("ISREADONLY").getString(); //业务页面是否只读 - FlowFixedParam.put("ProductStage", flowModel.getAttribute("ATTRIBUTE4").getString()); //产品阶段 + FlowFixedParam.put("ProductStage", flowModel.getAttribute("ATTRIBUTE4").getString()); //产品阶段 if(null!=isPageRead&&isPageRead.endsWith("Y")){ FlowFixedParam.put("RightType", "ReadOnly"); //如果 - } + } JBOTransaction tx=JBOFactory.createJBOTransaction(); %> <%/*~END~*/%> @@ -72,7 +72,7 @@ var node = getCurTVItem(); var sValue = node.value; if(!sValue) return; - + var navigation = sValue.split("@"); var target = "right"; var sCurItemname = node.name; @@ -82,7 +82,7 @@ AsControl.OpenView(navigation[0], navigation[1], target); setTitle(sCurItemname); } - + <%/*~[Describe=生成treeview;InputParam=无;OutPutParam=无;]~*/%> function initTreeVeiw(){ <%=tviTemp.generateHTMLTreeView()%> @@ -91,7 +91,7 @@ myleft.width = 200; } initTreeVeiw(); - + <%/*~END~*/%> @@ -100,7 +100,7 @@ function showImage(){ window.parent.showImage(); } - + function editImage(ul){ window.parent.editImage(ul); } diff --git a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp index 903903b6e..5d307285a 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp @@ -1,11 +1,8 @@ -<%@page import="com.tenwa.httpclient.resources.QuartzPropertiesUtil"%> -<%@page import="com.amarsoft.biz.workflow.FlowTask"%> -<%@page import="com.amarsoft.dict.als.manage.CodeManager"%> <%@page import="com.amarsoft.app.lc.workflow.action.GetFlowAction"%> -<%@page import="com.tenwa.flow.tabviewservice.*"%> -<%@page import="com.amarsoft.dict.als.object.Item"%> -<%@page import="com.amarsoft.are.jbo.BizObject"%> -<%@page import="com.amarsoft.app.lc.taskObject.TaskObjectManager"%> +<%@page import="com.tenwa.flow.tabviewservice.FlowTaskViewTab"%> +<%@page import="com.tenwa.flow.tabviewservice.FlowTaskViewTabService"%> +<%@page import="com.tenwa.httpclient.resources.QuartzPropertiesUtil"%> +<%@page import="org.apache.commons.lang3.StringUtils"%> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/IncludeBegin.jsp"%> <%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> @@ -15,6 +12,7 @@ String rightType = CurPage.getParameter("RightType"); String ViewID = CurPage.getParameter("ViewID"); String ReaderId = CurPage.getParameter("ReaderId"); + String delTabs = CurPage.getParameter("delTabs"); String title = CurComp.getParameter("Title"); if(title != null && !title.startsWith("传阅")) { ReaderId = ""; @@ -23,7 +21,7 @@ if(ReaderId==null){ReaderId="";} if(rightType==null){rightType="";} if(ViewID==null){ViewID="";} - HashMapFlowFixedParam=GetFlowAction.getFlowParamByTask(taskNo,CurPage); + HashMapFlowFixedParam=GetFlowAction.getFlowParamByTask(taskNo,CurPage); String custid=CurUser.getUserName(); if(FlowFixedParam.get("AgentFlowUser").length()>0){ if(!custid.equals(FlowFixedParam.get("AgentFlowUser"))&&custid.equals(FlowFixedParam.get("CurFlowUser"))){ @@ -35,7 +33,7 @@ taskNo=FlowFixedParam.get("TaskNo"); MapstartMap=GetFlowAction.getFlowParamByFlowUnid(FlowFixedParam.get("ObjectNo")); FlowTaskViewTab viewTab = new FlowTaskViewTab(taskNo,CurUser.getUserName()); - + //control distributor(temporary) boolean flag = false; List roles = CurUser.getRoleTable(); @@ -58,16 +56,18 @@
<% - + //显示按钮 if(viewTab.getButtonItemList().size()==0) out.write(" "); if(rightType.equals("ReadOnly") || !ReaderId.equals("")){ if(ReaderId.equals("")){ - out.write(new Button("关闭流程", "关闭流程", "closePage()", "", "btn_icon_close").getHtmlText()); + if (StringUtils.isEmpty(delTabs)) { + out.write(new Button("关闭流程", "关闭流程", "closePage()", "", "btn_icon_close").getHtmlText()); + } }else{ rightType = "ReadOnly"; - out.write(new Button("关闭流程", "关闭流程", "closePage()", "", "btn_icon_close").getHtmlText()); - out.write(new Button("结束传阅", "结束传阅", "closePassed()", "", "btn_icon_add").getHtmlText()); + out.write(new Button("关闭流程", "关闭流程", "closePage()", "", "btn_icon_close").getHtmlText()); + out.write(new Button("结束传阅", "结束传阅", "closePassed()", "", "btn_icon_add").getHtmlText()); } }else{ for(Button bt : viewTab.getButtonItemList()){ @@ -106,11 +106,12 @@ $(document).ready(function(){ argmap.put("RightType",rightType); argmap.put("IsHistory", viewTab.getIsHistory()); argmap.put("ViewID",ViewID); + if(StringUtils.isNotBlank(delTabs))argmap.put("delTabs",delTabs); String viewTabInfo = FlowTaskViewTabService.showViewObjectTabInfo(viewTab.getViewTabItemList(), argmap, Sqlca); out.println(viewTabInfo); %> //如果使用addDataItem,则必需调用init()函数 - tabCompent.initTab(); + tabCompent.initTab(); }); /*~[Describe=详情打开;InputParam=无;OutPutParam=无;]~*/ function openObjectInTab(objectType,objectNo,viewID,position){ @@ -170,13 +171,13 @@ $(function(){ paramJson["carAttributes"]="<%=startMap.get("carAttributes")%>"; paramJson["leasehold"]="<%=startMap.get("leasehold")%>"; paramJson["modelid"]="<%=startMap.get("modelid")%>"; - + //paramJson["CurFlowUser"]="<%=FlowFixedParam.get("CurFlowUser")%>"; //paramJson["AgentFlowUser"]="<%=FlowFixedParam.get("AgentFlowUser")%>"; //paramJson["Assignfinish"]="<%=FlowFixedParam.get("Assignfinish")%>"; //paramJson["AssignSubmittype"]="<%=FlowFixedParam.get("AssignSubmittype")%>"; //paramJson["EndTime"]="<%=FlowFixedParam.get("EndTime")%>"; - + var assignInfo = AsControl.RunJavaMethodTrans("com.tenwa.flow.task.FlowAssignUserInfo","getFlowAssignUserInfo","TaskNo="+paramJson["TaskNo"]); var vInfo=assignInfo.split("@"); paramJson["CurFlowUser"]=vInfo[0]; @@ -186,7 +187,7 @@ $(function(){ if(vInfo.length>=5){ paramJson["EndTime"]=vInfo[4]; } - + return paramJson; }; FlowFunction.successCallBackReload=function(){ @@ -198,9 +199,9 @@ function closePassed(){ } function setConfigFlowToOtherUser(){ var param=FlowFunction.loadFlowParam(); - var tasknos=param["TaskNo"]; - var userids=param["CurFlowUser"]; - var agentName=param["AgentFlowUser"]; + var tasknos=param["TaskNo"]; + var userids=param["CurFlowUser"]; + var agentName=param["AgentFlowUser"]; var curUser="<%=CurUser.getUserID()%>"; if(userids!=curUser){ alert("别人委托或指派给你的流程不能指派给其他人"); @@ -211,13 +212,13 @@ function setConfigFlowToOtherUser(){ return false; } FlowFunction.setConfigFlowToOtherUser(curUser,tasknos.split(","),param["ObjectNo"]); - + } function deleteConfigFlowToOtherUser(){ var param=FlowFunction.loadFlowParam(); - var tasknos=param["TaskNo"]; - var agentName=param["AgentFlowUser"]; + var tasknos=param["TaskNo"]; + var agentName=param["AgentFlowUser"]; if (typeof(tasknos)=="undefined" || tasknos.length==0){ alert(getHtmlMessage('1'));//请选择一条信息！ return; @@ -249,8 +250,8 @@ function editImage(ul){ viewer = new Viewer(document.getElementById('dowebok'), { url: 'data-original' }); - } + } } -<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file +<%@ include file="/IncludeEnd.jsp"%> diff --git a/WebContent/Tenwa/Core/InvoiceManager/ContactUs/LBContactUsInfo.jsp b/WebContent/Tenwa/Core/InvoiceManager/ContactUs/LBContactUsInfo.jsp index 4ba73173d..c220946d6 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/ContactUs/LBContactUsInfo.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/ContactUs/LBContactUsInfo.jsp @@ -7,7 +7,7 @@ ASObjectModel doTemp = new ASObjectModel(sTempletNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - dwTemp.genHTMLObjectWindow(id); + dwTemp.genHTMLObjectWindow("1"); String sButtons[][] = { {"true","","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"} }; diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp new file mode 100644 index 000000000..76b87f7de --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp @@ -0,0 +1,89 @@ +<%@page import="com.itextpdf.text.log.SysoCounter"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@include file="/Frame/resources/include/include_begin_info.jspf"%><% + + String id = CurPage.getParameter("id");//ID + String flowunid = CurPage.getParameter("flowunid");//流程编号 + String phaseNo = CurPage.getAttribute("phaseNo"); //流程节点 + String taskno=CurPage.getParameter("taskno"); //流程节点ID + String userid=CurPage.getParameter("userid");//当前登录人 + String orgid=CurPage.getParameter("orgid");//当前登录部门 + + + String username = Sqlca.getString("select username from user_info ui where userid = '"+userid+"'"); + String orgname = Sqlca.getString("select orgname from org_info oi where orgid = '"+orgid+"'"); + + //判断修改人是否为提交人 + String comm = Sqlca.getString("select case when phaseno = '"+phaseNo+"' and inputuser = '"+userid+"' then 'false' else 'true' end as comm from communication where id = '"+id+"'"); + + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = "/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp"; + String sTempletNo = "COMMUNICATION_INFO";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "0";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); + + String sButtons[][] = { + {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp new file mode 100644 index 000000000..a4ba5bacf --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp @@ -0,0 +1,73 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + + //String PG_TITLE = "微信对公账号维护"; // 浏览器窗口标题 PG_TITLE + + String flowunid = CurPage.getParameter("ObjectNo");//流程编号 + String phaseNo = CurPage.getAttribute("PhaseNo"); //流程节点 + String taskno=CurPage.getParameter("TaskNo"); //流程节点ID + String userid = CurPage.getUserId();//当前登录人 + String orgid = CurPage.getUser().getOrgID();//当前登录部门 + + String communicationid = Sqlca.getString("select id from communication where flowunid = '"+flowunid+"' and phaseno = '"+phaseNo+"'"); + if(communicationid==null){ + communicationid = "null"; + } + + ASObjectModel doTemp = new ASObjectModel("COMMUNICATION_LIST"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + //dwTemp.MultiSelect = true; //多选 + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(20); + dwTemp.genHTMLObjectWindow(flowunid); + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, +// {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""}, +// {"true","All","Button","删除","删除","deleteRecord()","","","","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/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp new file mode 100644 index 000000000..49e1ed6b5 --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp @@ -0,0 +1,54 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/IncludeBegin.jsp"%> +<% + String flowunid = CurPage.getParameter("ObjectNo"); + String plannumber=CurPage.getParameter("plannumber"); + String planCName=CurPage.getParameter("planCName"); + String calType=CurPage.getParameter("calType"); + String IsHistory=CurPage.getParameter("IsHistory"); + String RightType=CurPage.getParameter("RightType"); + String productId=CurPage.getParameter("ProductId"); + String projectId=CurPage.getParameter("ProjectId"); + String khcertid = Sqlca.getString("select ci.certid from lb_union_lessee_temp lul left join customer_info ci on ci.customerid = lul.CUSTOMER_ID where lul.IS_MAIN = 'Y' and lul.flowunid='"+flowunid+"'"); + String gtcertid = Sqlca.getString("select cf.certid from customer_family_temp cf where cf.Partner_ = 'Y' and cf.flowunid='"+flowunid+"'"); + String dbcertid = Sqlca.getString("select CERTID from lb_guarantee_unit_temp where flowunid='"+flowunid+"' order by CERTID asc limit 1"); + String dbcertid2 = Sqlca.getString("select CERTID from lb_guarantee_unit_temp where flowunid='"+flowunid+"' order by CERTID desc limit 1"); + //客户传参 + String params="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+khcertid+"&type=client"; + //共同承租人传参 + String params2="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+gtcertid+"&type=jointly"; + //担保人1传参 + String params3="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+dbcertid+"&type=guarantee"; + //担保人2参数 + String params4="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+dbcertid2+"&type=guarantee"; + + //判断是否有共同承租人和担保人 + String custnum1 = Sqlca.getString("select count(cf.id) as num from customer_family_temp cf where cf.Partner_ = 'Y' and cf.flowunid='"+flowunid+"'"); + String custnum2 = Sqlca.getString("select count(lul.ID) as num from lb_guarantee_unit_temp lul where lul.flowunid='"+flowunid+"'"); + Integer c = Integer.valueOf(custnum1); + Integer a = Integer.valueOf(custnum2); + String show1 = "false"; + String show2 = "false"; + String show3 = "false"; + + if (c>0){show1 = "true";} + if (a >= 1){show2 = "true";} + if (a > 1){show3 = "true";} + + //参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是) +// String userid = CurUser.getUserID(); + String orgid = CurUser.getOrgID(); + String sTabStrip[][] = { + {"true", "客户", "/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp",params, "", "", "false"}, + {show1, "共同承租人", "/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp",params2, "", "", "false"}, + {show2, "担保人", "/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp",params3, "", "", "false"}, + {show3, "担保人2", "/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp",params4, "", "", "false"}, + }; +%> +<%@ include file="/Resources/CodeParts/Tab01.jsp"%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp new file mode 100644 index 000000000..108a385fa --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp @@ -0,0 +1,47 @@ +<%@page import="com.itextpdf.text.log.SysoCounter"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@include file="/Frame/resources/include/include_begin_info.jspf"%> +<% + /* + Author: undefined 2023-09-04 + Content: 示例详情页面 + History Log: + */ + + String sTempletNo = "CustomerHistoryInfoTemp";//--模板号-- + String flowunId=CurPage.getParameter("flowunid");//流程编号 + String certId=CurPage.getParameter("certId");//客户证件号 + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.genHTMLObjectWindow("1"); + dwTemp.genHTMLObjectWindow(flowunId+","+certId); + + String compClientID = request.getParameter("CompClientID"); + + dwTemp.replaceColumn("loaned", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("outstand", "", CurPage.getObjectWindowOutput()); + + + String sButtons[][] = { +// {"true","","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"} + }; + + +%> +<%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp new file mode 100644 index 000000000..86c6f450d --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp @@ -0,0 +1,52 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> +<% + + String certId = CurPage.getParameter("certId"); + + ASObjectModel doTemp = new ASObjectModel("LoanedList"); + doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' "); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1";//--设置为Grid风格-- + dwTemp.ReadOnly = "1";//只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(certId); + String sButtons[][] = { + + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp new file mode 100644 index 000000000..b7fee3ef2 --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp @@ -0,0 +1,53 @@ +<%@page import="com.tenwa.comm.dataRightmanager.DataRightManager"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> +<% + + String certId = CurPage.getParameter("certId"); + + ASObjectModel doTemp = new ASObjectModel("LoanedList"); + doTemp.appendJboWhere(" and O.CONTRACT_STATUS < 31 "); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1";//--设置为Grid风格-- + dwTemp.ReadOnly = "1";//只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(certId); + String sButtons[][] = { + + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/App/calculation/calculationFactPenaltyList.jsp b/WebContent/Tenwa/Lease/App/calculation/calculationFactPenaltyList.jsp index 5e53845c3..bf0719f34 100644 --- a/WebContent/Tenwa/Lease/App/calculation/calculationFactPenaltyList.jsp +++ b/WebContent/Tenwa/Lease/App/calculation/calculationFactPenaltyList.jsp @@ -17,7 +17,7 @@ dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "0"; //只读模式 dwTemp.MultiSelect = true; - dwTemp.setPageSize(20); + dwTemp.setPageSize(100); dwTemp.genHTMLObjectWindow(paymentNumber); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 @@ -26,6 +26,7 @@ {"ReadOnly".equals(rightType)?"false":"true","","Button","计算罚息减免额","计算罚息减免额","createPenaltyAdjust()","","","","btn_icon_add",""} }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> +
<%@ include file="/Frame/resources/include/include_end.jspf"%> -
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index c4b6e15f6..4c913c86b 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -393,10 +393,10 @@ function SelectCardataBrand() { var carTypea = "<%=carTypea%>"; - var selectBank = "SelectCardataBrandFlowNew"; + var selectBank = "RCSelectCardataBrandNew"; var parms = "cartypea,"+carTypea; if(typeof(carTypea)=="undefined" || carTypea.length==0 ){ - selectBank = "SelectCardataBrandNew"; + selectBank = "RCSelectCardataBrandNew"; parms = "projectId,<%=projectId%>"; } AsDialog.OpenSelector(selectBank, parms ,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", @@ -440,10 +440,7 @@ var brandid=""; if(MyOjbect.brandid){ brandid=MyOjbect.brandid; - let selectType = 'SelectCardataSeriesCYC'; - if (MyOjbect.cartypea == 'SYC') { - selectType = 'SelectCardataSeriesSYC'; - } + let selectType = 'RCSelectCardataSeriesNew'; AsDialog.OpenSelector(selectType,"brandid,"+brandid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_") @@ -472,10 +469,7 @@ var seriesid=""; if(MyOjbect.seriesid){ seriesid=MyOjbect.seriesid; - let selectType = 'SelectCardataModelCYC'; - if (MyOjbect.cartypea == 'SYC') { - selectType = 'SelectCardataModelSYC'; - } + let selectType = 'RCSelectCardataModelNew'; AsDialog.OpenSelector(selectType,"seriesid,"+seriesid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_") diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp index e0e86c818..b46fc9b5e 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp @@ -72,6 +72,7 @@ $("#IDEXPIRY_TYPE_0").prop("checked", "checked"); } changeIdexpiryType(); + birthdayCheck(); }); function changeIdexpiryType(){ @@ -398,7 +399,28 @@ } } checkCertidRepeat(); + birthdayCheck(); } + + function birthdayCheck(){ + //校验证件类型为身份证或临时身份证时，出生日期是否同证件编号中的日期一致 + var certID = getItemValue(0,0,"CERTID"); + var birthday = getItemValue(0,0,"BIRTHDAY"); + if(""!=birthday){ + return; + } + //将身份证中的日期自动赋给出生日期,把身份证中的性别赋给性别 + if(certID.length == 15){ + certID = certID.substring(6,12); + certID = "19"+certID.substring(0,2)+"/"+certID.substring(2,4)+"/"+certID.substring(4,6); + setItemValue(0,0,"BIRTHDAY",certID); + }else if(certID.length == 18){ + certID = certID.substring(6,14); + certID = certID.substring(0,4)+"/"+certID.substring(4,6)+"/"+certID.substring(6,8); + setItemValue(0,0,"BIRTHDAY",certID); + } + } + function checkCertidRepeat(){ var certtype = getItemValue(0,getRow(),"CERTTYPE"); if("Ind01"==certtype){ diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 3b4d103c9..e2c16e242 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -60,6 +60,14 @@ score_result_code = null == rcScoreResultBiz.getAttribute("score_result_code") ? "" : rcScoreResultBiz.getAttribute("score_result_code").toString(); } + + //复审意见展示 + if("业务申请流程".equals(flowName)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo)||"0080".equals(phaseNo))){ + doTemp.setVisible("VETO",true); + }else { + doTemp.setVisible("VETO",false); + } + if(("业务申请流程".equals(flowName)||"业务变更流程".equals(flowName))&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo))){ dwTemp.getDataObject().setVisible("subjectname", true); }else { @@ -195,6 +203,17 @@ %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>