Enford 5 gadi atpakaļ
vecāks
revīzija
9ea0f24652

+ 1 - 1
src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyForm.jsp

@@ -111,7 +111,7 @@
                 <div class="layui-item layui-col-sm12  with-textarea">
                     <label class="layui-form-label">周报内容:</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks"  htmlEscape="false" rows="5"    maxlength="127" class="form-control"/>
+                        <form:textarea path="remarks"  htmlEscape="false" rows="5"    maxlength="127" class="form-control required"/>
                     </div>
                 </div>
             </div>

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

@@ -274,7 +274,8 @@
                             if (d.projectId == undefined || d.projectId == ''){
                                 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=\"#\" 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=\"#\" 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='javascript:void(0)' class='op-btn  op-btn-edit' title='备注' onclick='projectText()'><i class='fa fa-edit'></i>备注</a>";
                         }