周报

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

@@ -82,7 +82,7 @@
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>个人周报</h2></div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>执行人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>创建人：</label>
                     <div class="layui-input-block">
                         <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}"/>

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

@@ -238,6 +238,15 @@
                     }
 					return xml;
 				}}
+                ,{align:'center',width:150, title: '项目信息',templet:function(d){
+                        var xml = "";
+                        if (d.projectId != undefined && d.projectId != '' && d.projectId != null ){
+                            xml = "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projectName + "</a>";
+                        }else {
+                            xml = "<span>无项目</span>";
+                        }
+                        return xml;
+                    }}
                 ,{field:'beginDate',align:'center', title: '开始日期',width:100}
                 ,{field:'endDate',align:'center', title: '结束日期',width:100}
                 ,{align:'center',width:100, title: '状态' ,templet:function(d){
@@ -248,15 +257,6 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                 }}
-                ,{align:'center',width:150, title: '项目信息',templet:function(d){
-					var xml = "";
-					if (d.projectId != undefined && d.projectId != '' && d.projectId != null ){
-						xml = "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projectName + "</a>";
-					}else {
-                        xml = "<span>暂无项目</span>";
-					}
-					return xml;
-                }}
                 ,{align:'center',width:150, title: '备注信息',templet:function(d){
                     var xml = "";
                     if (d.remarksReason != undefined){
@@ -275,7 +275,7 @@
                                 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=\"weeklyText('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-op-btn-revert\" style=\"color: white;background: #ffa44e\" ><i class=\"fa fa-hand-stop-o\"></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>";
                         }
                         return xml;

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

@@ -82,7 +82,7 @@
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>个人周报</h2></div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>执行人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>创建人：</label>
                     <div class="layui-input-block">
                         <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}"/>
@@ -95,21 +95,21 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">开始时间：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>开始时间：</label>
                     <div class="layui-input-block">
                         <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date required layui-input"
                                value="<fmt:formatDate value="${projectPlanWeekly.beginDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">结束时间：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>结束时间：</label>
                     <div class="layui-input-block">
                         <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date required layui-input"
                                value="<fmt:formatDate value="${projectPlanWeekly.endDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12  with-textarea">
-                    <label class="layui-form-label">周报内容：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>周报内容：</label>
                     <div class="layui-input-block">
                         <form:textarea path="remarks"  htmlEscape="false" rows="5" maxlength="127" readonly="true" class="form-control"/>
                     </div>