diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf index 63e7531fb..45662b347 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf @@ -3,40 +3,27 @@ <%@page import="java.util.Date"%> <%@page import="com.amarsoft.awe.control.model.Parameter" %> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%> -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%> +<%/*~BEGIN~驴脡卤脿录颅脟酶~[Editable=true;CodeAreaID=List00;Describe=脳垄脢脥脟酶;]~*/%> <% /* - Content: 流程申请页面 + Content: 脕梅鲁脤脡锚脟毛脪鲁脙忙 */ %> <%/*~END~*/%> -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> +<%/*~BEGIN~驴脡卤脿录颅脟酶~[Editable=true;CodeAreaID=List01;Describe=露篓脪氓脪鲁脙忙脢么脨脭;]~*/%> <% - String PG_TITLE = "流程对象管理"; // 浏览器窗口标题 PG_TITLE + String PG_TITLE = "脕梅鲁脤露脭脧贸鹿脺脌铆"; // 盲炉脌脌脝梅麓掳驴脷卤锚脤芒 PG_TITLE %> <%/*~END~*/%> -<%/*~BEGIN~可编辑区~[Describe=其它操作;]~*/%> +<%/*~BEGIN~驴脡卤脿录颅脟酶~[Describe=脝盲脣眉虏脵脳梅;]~*/%> <% - //KKK here update of is before check user in the other -- by K - boolean bFlag = false; - List roles = CurUser.getRoleTable(); - String distributorRole = QuartzPropertiesUtil.get("distributor_role"); - distributorRole = distributorRole == null ? "" : distributorRole; - for(String role : roles) { - if(distributorRole.indexOf(role) != -1) { - bFlag = true; - break; - } - } - //KKK 2.setVisible not show object -- by K - String sApplyType = CurPage.getParameter("ApplyType"); String sPhaseType = CurPage.getParameter("PhaseType"); if(sApplyType == null) sApplyType = ""; if(sPhaseType == null) sPhaseType = ""; - //根据申请类型applyType、阶段类型phaseType 得到申请主树图,申请按钮,申请列表显示模板,申请列表where条件等。 + //赂霉戮脻脡锚脟毛脌脿脨脥applyType隆垄陆脳露脦脌脿脨脥phaseType 碌脙碌陆脡锚脟毛脰梅脢梅脥录拢卢脡锚脟毛掳麓脜楼拢卢脡锚脟毛脕脨卤铆脧脭脢戮脛拢掳氓拢卢脡锚脟毛脕脨卤铆where脤玫录镁碌脠隆拢 ApplyManager applyManager = new ApplyManager(sApplyType,sPhaseType,CurUser); ASObjectModel doTemp = new ASObjectModel(applyManager.getDono()); doTemp.setLockCount(2); @@ -48,29 +35,22 @@ doTemp.setVisible("flow_key", false); doTemp.setVisible("CONTRACT_NO", true); } - //setVisible show Or show don't - if(!("1010".equals(sPhaseType)) && bFlag) { - doTemp.setVisible("ACTION", false); - } - //doTemp.appendJboWhere(applyManager.getWhereClause()+" order by objectNo desc "); doTemp.appendJboWhere(applyManager.getWhereClause()); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //设置为Grid风格 - //dwTemp.MultiSelect = true;//允许多选 - dwTemp.ReadOnly = "1";//编辑模式 + dwTemp.Style="1"; //脡猫脰脙脦陋Grid路莽赂帽 + //dwTemp.MultiSelect = true;//脭脢脨铆露脿脩隆 + dwTemp.ReadOnly = "1";//卤脿录颅脛拢脢陆 dwTemp.genHTMLObjectWindow(""); String sButtons[][] = applyManager.getButtonArr(); - //vivotab + //control distributor(temporary) List buttonLists = Arrays.asList(sButtons); buttonLists = new ArrayList(buttonLists); int num1 = 0; - boolean flag1 = false; + boolean flag1 = false; int num2 = 0; boolean flag2 = false; - int num3 = 0; - boolean flag3 = false; for(int i = 0; i < sButtons.length; i ++) { for(int j = 0; j < sButtons[i].length; j ++) { if("viewFlowGraph()".equals(sButtons[i][j])) { @@ -82,17 +62,10 @@ num2 = i; flag2 = true; break; - } - //jingXiaoShang power limit by K 2018/08/11 - if(!("1010".equals(sPhaseType)) && "viewTab()".equals(sButtons[i][j])) { - num3 = i; - flag3 = true; - break; } } } - //KKK this code look top top top - /* boolean bFlag = false; + boolean bFlag = false; List roles = CurUser.getRoleTable(); String distributorRole = QuartzPropertiesUtil.get("distributor_role"); distributorRole = distributorRole == null ? "" : distributorRole; @@ -101,7 +74,7 @@ bFlag = true; break; } - } */ + } if(bFlag) { if(flag1) { String[] removeB1 = buttonLists.get(num1); @@ -111,10 +84,6 @@ String[] removeB2 = buttonLists.get(num2); buttonLists.remove(removeB2); } - if(flag3) {//jingXiaoShang power limit by K 2018/08/11 - String[] removeB3 = buttonLists.get(num3); - buttonLists.remove(removeB3); - } } sButtons = new String[buttonLists.size()][]; for(int i = 0; i < buttonLists.size(); i ++) {