1.去掉报价单等操作里面的修改按钮

2.修改付款申请的BUG
3.修改实际付款的BUG
This commit is contained in:
zhangbb 2018-09-13 20:47:55 +08:00
parent 13a78be8d6
commit e9a381311e
6 changed files with 13 additions and 13 deletions

View File

@ -64,9 +64,9 @@
getObj(0,i,"FILENAME").innerHTML=html;
};
for(var i=0;i<getRowCount(0);i++){
html='<a class="btn_icon_detail" onclick="viewOffice()">&nbsp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
html='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
if((null ==RightType||RightType!="ReadOnly")&&(null==ishistory||ishistory!="true")){
html+=' <a class="btn_icon_edit" onclick="editOffice()">&nbsp;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
html+=' <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
}
getObj(0,i,"ACTION").innerHTML=html;
}

View File

@ -62,9 +62,9 @@
getObj(0,i,"FILENAME").innerHTML=html;
};
for(var i=0;i<getRowCount(0);i++){
html='<a class="btn_icon_detail" onclick="viewOffice()">&nbsp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
html='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
if((null ==RightType||RightType!="ReadOnly")&&(null==ishistory||ishistory!="true")){
html+=' <a class="btn_icon_edit" onclick="editOffice()">&nbsp;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
html+=' <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
}
getObj(0,i,"ACTION").innerHTML=html;
}

View File

@ -75,9 +75,9 @@ if("".equals(PROJECT_PLAN_NUMBER)||PROJECT_PLAN_NUMBER.length()==0){
getObj(0,i,"FILENAME").innerHTML=html;
};
for(var i=0;i<getRowCount(0);i++){
html='<a class="btn_icon_detail" onclick="viewOffice()">&nbsp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
html='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
if((null ==RightType||RightType!="ReadOnly")&&(null==ishistory||ishistory!="true")){
html+=' <a class="btn_icon_edit" onclick="editOffice()">&nbsp;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
html+='<a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
}
getObj(0,i,"ACTION").innerHTML=html;
}
@ -143,7 +143,6 @@ if("".equals(PROJECT_PLAN_NUMBER)||PROJECT_PLAN_NUMBER.length()==0){
var sparam="";
//模板号
param["templateNo"]="2017052300000001";
//生成文件关联关系
tempParam["OBJECTTYPE"]="";
tempParam["FLOW_UNID"]="<%=flowunid%>";

View File

@ -9,7 +9,7 @@
String rightType = CurComp.getParameter("RightType");
String flowunid = CurPage.getParameter("FlowUnid");
String ishistory = CurPage.getParameter("IsHistory");
ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList");
ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempListBusiness");
if(null!=ishistory&&ishistory.equals("true")){
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
}

View File

@ -9,7 +9,7 @@
String rightType = CurComp.getParameter("RightType");
String flowunid = CurPage.getParameter("FlowUnid");
String ishistory = CurPage.getParameter("IsHistory");
ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList");
ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempListBusiness");
if(null!=ishistory&&ishistory.equals("true")){
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
}

View File

@ -30,11 +30,12 @@ public class CalcConditionTempToContract extends Bizlet{
String sContractId=flow.getAttribute("contract_id").getString();//ºÏͬºÅ
//String rent_method=contract.getAttribute("RENT_METHOD").getString();
if("1".equals(projinfo!=null?projinfo.getAttribute(LB_PROJECT_INFO.BUSINESSTYPE).toString():"")){//Æû³µ
// if("1".equals(projinfo!=null?projinfo.getAttribute(LB_PROJECT_INFO.BUSINESSTYPE).toString():"")){//汽车
//安鹏没有多次起租只有单次起租
ser.tempToContractOne(sFlowUnid,sContractId,Sqlca);
}else{
ser.tempToContractMany(sFlowUnid, sContractId, Sqlca);
}
// }else{
// ser.tempToContractMany(sFlowUnid, sContractId, Sqlca);
// }
String sMessage="true";
return sMessage;