周报

src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyForm.jsp

@@ -84,6 +84,7 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>创建人：</label>
                     <div class="layui-input-block">
+                        <input path="projectId" type="hidden" name="projectId"  id="projectId"  class="form-control required layui-input" value="${projectPlanWeekly.projectId}"/>
                         <input path="id" type="hidden"  id="id"  class="form-control required layui-input" value="${projectPlanWeekly.id}"/>
                         <input path="user.name" htmlEscape="false" readonly="readonly"   id="userId"  class="form-control required layui-input" value="${projectPlanWeekly.user.name}"/>
                     </div>

src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyList.jsp

@@ -259,9 +259,9 @@
                         return xml;
                     }}
                 ,{field:'createBy',align:'center', title: '负责人',width:100}
-                ,{field:'createDate',align:'center', title: '计划创建日期',width:100}
                 ,{field:'beginDate',align:'center', title: '计划开始日期',width:100}
                 ,{field:'endDate',align:'center', title: '计划结束日期',width:100}
+                ,{field:'createDate',align:'center', title: '计划创建日期',width:100}
                 ,{align:'center',width:100, title: '状态' ,templet:function(d){
                         var st = getWeeklyState(d.weeklyStatus);
                         if(st.action)
@@ -285,12 +285,14 @@
                         if(d.weeklyStatus != undefined && d.weeklyStatus =="0")
                         {
                             if (d.btnAgent != undefined && d.btnAgent == '0'){
-                                <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: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>
+                                if (d.projectId == undefined || d.projectId == '' || d.projectId == null){
+                                    <shiro:hasPermission name="projectplan:weekly:edit">
+                                    xml+="<a href=\"#\" onclick=\"openDialog('修改周报信息', '${ctx}/projectplan/weekly/form?id=" + d.id +"&projectId="+d.projectId+"','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></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>
+								}
 								<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>