|
|
@@ -271,15 +271,13 @@
|
|
|
var xml="";
|
|
|
if(d.weeklyStatus != undefined && d.weeklyStatus =="0")
|
|
|
{
|
|
|
- if (d.projectId == undefined || d.projectId == ''){
|
|
|
+ if (d.btnAgent != undefined && d.btnAgent == '0'){
|
|
|
xml+="<a href=\"#\" onclick=\"openDialog('修改周报信息', '${ctx}/projectplan/weekly/form?id=" + d.id +"','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
|
|
|
+ xml+="<a href=\"${ctx}/projectplan/weekly/sureWeeklyStatus?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要完成该工作计划吗？', this.href)\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: darkseagreen\"><i class=\"fa fa-check\"></i>确认完成</a>";
|
|
|
+ xml+="<a href=\"#\" onclick=\"weeklyText('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: #ffa44e\" ><i class=\"fa fa-plus-square-o\"></i> 备注</a>";
|
|
|
+ xml+="<a href=\"${ctx}/projectplan/weekly/delete?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要删除该计划信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
|
|
|
}
|
|
|
- // xml+="<a href=\"#\" onclick=\"weeklySure('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: darkseagreen\"><i class=\"fa fa-check\"></i> 确认完成</a>";
|
|
|
- xml+="<a href=\"${ctx}/projectplan/weekly/sureWeeklyStatus?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要完成该工作计划吗？', this.href)\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: darkseagreen\"><i class=\"fa fa-check\"></i>确认完成</a>";
|
|
|
- xml+="<a href=\"#\" onclick=\"weeklyText('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: #ffa44e\" ><i class=\"fa fa-plus-square-o\"></i> 备注</a>";
|
|
|
- xml+="<a href=\"${ctx}/projectplan/weekly/delete?id=" + d.id + "&projectId="+d.projectId+"\" onclick=\"return confirmx('确认要删除该计划信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
|
|
|
- // xml+="<a href='javascript:void(0)' class='op-btn op-btn-edit' title='备注' onclick='projectText()'><i class='fa fa-edit'></i>备注</a>";
|
|
|
- }
|
|
|
+ }
|
|
|
return xml;
|
|
|
|
|
|
}}
|
|
|
@@ -298,6 +296,7 @@
|
|
|
,"projectId":"${projectPlanWeekly.projectRecords.id}"
|
|
|
,"projectName":"${projectPlanWeekly.projectRecords.projectName}"
|
|
|
,"remarksReason":"${projectPlanWeekly.remarksReason}"
|
|
|
+ ,"btnAgent":"${projectPlanWeekly.btnAgent}"
|
|
|
}
|
|
|
</c:forEach>
|
|
|
</c:if>
|
Enford