From 2d84f83bdefb07363609f0ae6b178089202087f1 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 19 Jul 2018 20:37:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=EF=BC=8C=E5=8F=98=E6=9B=B4=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp index 6086a1d80..f227a1a2a 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp @@ -32,6 +32,7 @@ String sFlowUnid = CurPage.getParameter("FlowUnid");//Á÷³Ì±àºÅ + String PhaseNo = CurPage.getParameter("PhaseNo"); if(sFlowUnid == null) sFlowUnid = ""; String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); @@ -53,7 +54,7 @@ CurPage.getCurComp().setAttribute("RightType", null); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + if((null!=RightType&&RightType.equals("ReadOnly")&&(!PhaseNo.equals("0010")))||(null!=ishistory&&ishistory.equals("true"))){ dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ isShowButton=false; }else{ From d410505bf5baf8c2ee6e9be38825332bb159d4b1 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Thu, 19 Jul 2018 20:40:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 24 ++++++++++++ .../apzl/configurate/ConfigurateInfo.jsp | 30 +++++++++++++++ .../apzl/configurate/ConfigurateList.jsp | 37 +++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp create mode 100644 WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index a4c99ca3c..d7935aea8 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3953,6 +3953,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp b/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp new file mode 100644 index 000000000..65d763e3f --- /dev/null +++ b/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp @@ -0,0 +1,30 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2018-07-19 + Content: ʾÀýÏêÇéÒ³Ãæ + History Log: + */ + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = "/com/tenwa/apzl/configurate/ConfigurateList.jsp"; + + String sTempletNo = "ConfigurateInfo";//--Ä£°åºÅ-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + //doTemp.setColTips("", "²âÊÔ"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); + + String sButtons[][] = { + {"true","All","Button","±£´æ","±£´æËùÓÐÐÞ¸Ä","as_save(0)","","","",""}, + {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","·µ»Ø","·µ»ØÁбí","returnList()","","","",""} + }; + sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp b/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp new file mode 100644 index 000000000..909fd6f6b --- /dev/null +++ b/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-07-19 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("ConfigurateList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--ÉèÖÃΪGrid·ç¸ñ-- + dwTemp.ReadOnly = "1"; //Ö»¶Áģʽ + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0¡¢ÊÇ·ñչʾ 1¡¢ ȨÏÞ¿ØÖÆ 2¡¢ չʾÀàÐÍ 3¡¢°´Å¥ÏÔʾÃû³Æ 4¡¢°´Å¥½âÊÍÎÄ×Ö 5¡¢°´Å¥´¥·¢Ê¼þ´úÂë 6¡¢ 7¡¢ 8¡¢ 9¡¢Í¼±ê£¬CSS²ãµþÑùʽ 10¡¢·ç¸ñ + String sButtons[][] = { + {"true","All","Button","ÐÂÔö","ÐÂÔö","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","ɾ³ý","ɾ³ý","if(confirm('ȷʵҪɾ³ýÂð?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From a62f2cecd0507cc6e27532056df65f9130208fa8 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 19 Jul 2018 20:44:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp | 5 +++-- .../Lease/Flow/Comm/LBContractTemplate/contract_template.jsp | 4 ++-- .../tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp index 4f7c91591..84c6cf9af 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp @@ -41,13 +41,14 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ RightType="ReadOnly"; sButtons=new String[][] { - {"false","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""} + {"false","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","ɾ³ý","ɾ³ý","deletecontract()","","","","btn_icon_delete",""}, }; }else{ sButtons=new String[][]{ {"false","","Button","ÐÂÔö","ÐÂÔö","newRecord()","","","","btn_icon_add",""}, {"false","","Button","ÐÞ¸Ä","ÐÞ¸Ä","viewAndEdit()","","","","btn_icon_edit",""}, - {"true","","Button","ɾ³ý","ɾ³ý","deletecontract()","","","","btn_icon_delete",""}, + {"false","","Button","ɾ³ý","ɾ³ý","deletecontract()","","","","btn_icon_delete",""}, //{"true","","Button","Éú³ÉºÏͬ","ɾ³ý","createContractByTemplate()","","","","btn_icon_up",""}, //{"true","","Button","ÉÏ´«","ÐÂÔöÎĵµÐÅÏ¢","uploadContract()","","","","btn_icon_up",""} }; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index add71dd60..adf31681f 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -86,10 +86,10 @@ $(document).ready(function(){ var RightType="<%=RightType%>"; var phaseno="<%=phaseno%>" - if(RightType=="ReadOnly"){ + /* if(RightType=="ReadOnly"){ $('#A_Group_0010').css('display','none'); $('#A_Group_0020').css('display','none'); - } + } */ if(phaseno=="0015"){ $('#ButtonTR').css('display','block'); $('#A_Group_0010').css('display','none'); diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java index a44b2eda7..e89531fa0 100644 --- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java +++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java @@ -108,12 +108,12 @@ public class FileTemplateUtil { if("01".equals(leasform)){ /*return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏͬ-C¶ËÖ±×â','value':'24aba365e2794a018814ae81341486bf'}," + "{'text':'Ö±×â¸öÈËÊÚȨЭÒéÊé','value':'3334eed6051248b88cd4f2a22e93ac96'},]"+"\"}]";*/ - return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏͬ','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]"; + return "[{'fileTemplate':\""+"[{'text':'ºÏͬ£¨Ö±×⣩','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]"; }else{ /*return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏͬ-C¶Ë»Ø×â','value':'641c55a1168f4a488a5028ee68870156'}," + "{'text':'»Ø×â¸öÈËÊÚȨЭÒéÊé','value':'e980635a77124d5598be1717c062b877'}," + "{'text':'µÖѺºÏͬ','value':'ec90c114914d4725b57729107888511c'}]"+"\"}]";*/ - return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏͬ£¨ÊÛºó»Ø×⣩','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; + return "[{'fileTemplate':\""+"[{'text':'ºÏͬ£¨ÊÛºó»Ø×⣩','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; } } From 8c581ec5bf3a688ba1466bbfec4ae697f91c79c6 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 19 Jul 2018 20:46:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=94=B3=E8=AF=B7=E5=8F=91=E8=B5=B7=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contract/ContractChange/ContractChangeApplyList_Car.jsp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp index 06890d79b..b7d897b1a 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp @@ -10,7 +10,6 @@ //alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡ return; } - debugger; sReturn = sReturn.split("@"); var contract_id=sReturn[0]; var project_id=sReturn[1]; @@ -18,8 +17,10 @@ var contract_number = sReturn[3]; var project_name = sReturn[4]; var project_no = sReturn[4].split("-")[0]; + var customertype = sReturn[6]; + var leasform = sReturn[7]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@");