From 04088b7fc89c04f83d8545958efc1d93c2b9ee4d Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Sun, 24 Sep 2023 14:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowInstanceTrack/FlowInstanceTrack.jsp | 4 +- .../FlowInstanceTrackBusiness.jsp | 63 +++++++++++++++++++ .../BusinessApplication/ApprovalForm.jsp | 20 ++++-- .../BusinessApplication/RCScoreResult.jsp | 18 ++++-- 4 files changed, 94 insertions(+), 11 deletions(-) create mode 100644 WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index 936d2d6ae..bc97ee385 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -1,4 +1,5 @@ <%@page import="cn.bean.User"%> +<%@ page import="com.amarsoft.app.util.ASUserObject" %> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%> <%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> @@ -33,14 +34,13 @@ <% String soft = CurPage.getParameter("soft"); String userId = CurUser.getUserID(); - ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack3"); doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator"); String ros = "true"; if("业务申请分担".equals(soft)){ ros = "false"; - doTemp.appendJboWhere("( (O.flow_name='业务申请流程' and O.PHASENAME='信审初审') or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); + doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO in ('0030','0040','0050','0051','0052') ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); }; if("付款业务分担".equals(soft)){ ros = "false"; diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp new file mode 100644 index 000000000..c1cc4fef7 --- /dev/null +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp @@ -0,0 +1,63 @@ +<%@page import="cn.bean.User"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<% + String PG_TITLE = "流程实例跟踪"; // 浏览器窗口标题 PG_TITLE + + String soft = CurPage.getParameter("soft"); + String userId = CurUser.getUserID(); + ArrayList roleList = CurUser.getRoleTable(); + String isRisk = "false"; + if( roleList!=null && roleList.size()>0 ){ + for(int i=0 ;i +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 1d15773aa..9ca1d90eb 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -18,6 +18,7 @@ String flowunid = CurPage.getParameter("FlowUnid"); String flowName = CurPage.getParameter("FlowName");//获取流程名称 String projectId = CurPage.getParameter("ProjectId");//获取项目id + String riskParam = CurComp.getParameter("riskParam"); String clean_lease_money = Sqlca.getString("select CLEAN_LEASE_MONEY from LC_CALC_CONDITION_TEMP where flowunid='"+flowunid+"'"); //获取合同状态 String projectstatus = Sqlca.getString("select PROJECT_STATUS from lb_project_info where id='"+projectId+"'"); @@ -36,6 +37,15 @@ doTemp.setHtmlEvent("firstchoice","onChange","changeFirstChoice"); doTemp.setHtmlEvent("secondchoice","onChange","changeSecondChoice"); doTemp.setHtmlEvent("thirdchoice","onChange","changeThirdChoice"); + + String falg = "true"; + if ( (riskParam!=null && riskParam.length() > 0 ) || "0010,0020".indexOf(phaseNo)>-1 ){ + falg = "false"; + doTemp.setReadOnly("FIRSTCHOICE",true); + doTemp.setReadOnly("FIRSTOPINION",true); + doTemp.setReadOnly("SECONDCHOICE",true); + doTemp.setReadOnly("SECONDOPINION",true); + } ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); dwTemp.Style = "2";//freeform dwTemp.setAttr("inputWidth", "163"); @@ -60,13 +70,13 @@ //复审意见展示 - if("业务申请流程".equals(flowName)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo)||"0080".equals(phaseNo))){ + if("业务申请流程".equals(flowName)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".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))){ + if(("业务申请流程".equals(flowName)||"业务变更流程".equals(flowName))&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo))){ dwTemp.getDataObject().setVisible("subjectname", true); }else { dwTemp.getDataObject().setVisible("subjectname", false); @@ -89,7 +99,7 @@ // dwTemp.getDataObject().setReadOnly("InterOpinion2", true); dwTemp.setGroupHidden("0040,0050"); } - }else if("0040".equals(phaseNo)||"0050".equals(phaseNo)){//复审 + }else if("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo)){//复审 dwTemp.getDataObject().setVisible("firstchoice", true); dwTemp.getDataObject().setVisible("firstopinion", true); dwTemp.getDataObject().setReadOnly("firstchoice", true); @@ -197,7 +207,7 @@ dwTemp.genHTMLObjectWindow(flowunid); String sButtons[][] = { - {"0010,0020".indexOf(phaseNo)>-1?"false":"true","","Button","保存","保存所有修改","save()","","","",""} + {falg,"","Button","保存","保存所有修改","save()","","","",""} }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>