Enford 5 년 전
부모
커밋
736dc11fb2
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyList.jsp

+ 4 - 4
src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyList.jsp

@@ -288,15 +288,15 @@
                                 <shiro:hasPermission name="projectplan:weekly:edit">
                                     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>";
                                 </shiro:hasPermission>
-                                <shiro:hasPermission name="projectplan:weekly:complete">
+                                <shiro:hasPermission name="projectplan:weekly:del">
+                                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>";
+                                </shiro:hasPermission>
+								<shiro:hasPermission name="projectplan:weekly:complete">
                                     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>";
                                 </shiro:hasPermission>
                                 <shiro:hasPermission name="projectplan:weekly:text">
                                     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>";
                                 </shiro:hasPermission>
-                                <shiro:hasPermission name="projectplan:weekly:del">
-                                    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>";
-                                </shiro:hasPermission>
                             }
 						}
                         return xml;