Merge branch 'ap007' into dailyfix

This commit is contained in:
ap007 2022-10-31 11:06:49 +08:00
commit fa2e6ae924
4 changed files with 49 additions and 6 deletions

View File

@ -5,6 +5,8 @@
Content: ʾÀýÏêÇéÒ³Ãæ
History Log:
*/
String userId= CurUser.getUserID();
String userName = CurUser.getUserName();
String sFlowUnid = CurPage.getParameter("FlowUnid");//Á÷³Ì±àºÅ
String PhaseNo=CurPage.getParameter("PhaseNo");
String RightType=CurPage.getParameter("RightType");
@ -337,7 +339,7 @@ function getCode(){
}
function getRequestParam(appCode,appName,code){
let busiNo = getItemValue(0,0,'DISTRIBUTOR_NO');
let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo);
let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>");
return param;
}
</script>

View File

@ -5,6 +5,8 @@
Content: ʾÀýÏêÇéÒ³Ãæ
History Log:
*/
String userId= CurUser.getUserID();
String userName = CurUser.getUserName();
String sFlowUnid = CurPage.getParameter("FlowUnid");//Á÷³Ì±àºÅ
String RightType=CurPage.getParameter("RightType");
if(sFlowUnid == null) sFlowUnid="";
@ -252,7 +254,7 @@ function getCode(){
}
function getRequestParam(appCode,appName,code){
let busiNo = getItemValue(0,0,'DISTRIBUTOR_NO');
let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo);
let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>");
return param;
}
</script>

View File

@ -3,18 +3,55 @@
include
file="/Frame/resources/include/include_begin_info.jspf"%>
<%
String userId= CurUser.getUserID();
String userName = CurUser.getUserName();
String sFlowUnid = CurPage.getParameter("FlowUnid");//직넋긍뵀
String sPhaseNo=CurPage.getParameter("PhaseNo");//쌓뙈뵀
String FlowNo=CurPage.getParameter("FlowNo");//직넋츰냔
String projectNo=CurPage.getParameter("ProjectNo");//淃커긍뵀
String sTempletNo = "LBContractInfo_Car";//--Ä£°åºÅ--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ
dwTemp.ReadOnly = "1";//怜뗍친駕
dwTemp.genHTMLObjectWindow(CurPage.getParameter("ContractId"));
String sButtons[][] = {
{"true","","Button","栗죕헌데","栗죕헌데","openFileList()","","","","btn_icon_saveNew",""}
};
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function openFileList(){
let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl","");
let params = getRequestParam();
if(params!=null){
AsControl.postICMS(url,params);
}
}
function getRequestParam(){
let busiNo = getItemValue(0,getRow(),"PROJECT_NO");
let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowNoRJM", "flowNo=RentDormantFlow");
let index = appInfo.indexOf("@");
if(index==-1){
alert(appInfo);
return;
}
let appCode = appInfo.substr(0,index);
let appName = appInfo.substr(index+1,appInfo.length);
if(appCode=='0000'){
alert(appName);
return;
}
let code = 'ECM0002';
if("<%=FlowNo%>"=="RentDormantFlow"&&"<%=sPhaseNo%>"=="0010"){
code = 'ECM0001';
}
if(busiNo==null||busiNo==""||busiNo=="null"){
busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>");
}
let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>");
return param;
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

View File

@ -24,6 +24,8 @@
<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量,获取参数;]~*/%>
<%
String userId= CurUser.getUserID();
String userName = CurUser.getUserName();
String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
String FlowNo = CurPage.getParameter("FlowNo");//流程编号
String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号
@ -255,7 +257,7 @@ init();
if(busiNo==null||busiNo==""||busiNo=="null"){
busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>");
}
let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo);
let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>");
return param;
}