Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectplanweekly/web/ProjectPlanWeeklyController.java

@@ -65,8 +65,9 @@ public class ProjectPlanWeeklyController extends BaseController {
     public String form(ProjectPlanWeekly projectPlanWeekly, HttpServletRequest request,Model model) {
         if (null!=projectPlanWeekly.getId()&&!projectPlanWeekly.getId().equals("")){
             ProjectPlanWeekly projectPlanWeeklyUpdate = projectPlanWeeklyService.get(projectPlanWeekly.getId());
-            projectPlanWeeklyUpdate.setUser(UserUtils.getUser());
-            projectPlanWeeklyUpdate.setOffice(UserUtils.getUser().getOffice());
+            User byUserId = UserUtils.getByUserId(projectPlanWeeklyUpdate.getCreateBy().getId());
+            projectPlanWeeklyUpdate.setUser(byUserId);
+            projectPlanWeeklyUpdate.setOffice(byUserId.getOffice());
             model.addAttribute("projectPlanWeekly", projectPlanWeeklyUpdate);
         }else {
             projectPlanWeekly.setUser(UserUtils.getUser());
@@ -182,7 +183,11 @@ public class ProjectPlanWeeklyController extends BaseController {
                     projectPlanWeekly.setBtnAgent("0");
                 }
             }else {
-                projectPlanWeekly.setBtnAgent("1");
+                if (null!=projectPlanWeekly.getProjectUserId()){
+                    if (projectPlanWeekly.getProjectUserId().equals(id)){
+                        projectPlanWeekly.setBtnAgent("0");
+                    }
+                }
             }
         }
     }

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

@@ -89,7 +89,7 @@
                     </div>
                 </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="office.name" htmlEscape="false" readonly="readonly"   id="officeId"  class="form-control required layui-input" value="${projectPlanWeekly.office.name}"/>
                     </div>

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

@@ -257,9 +257,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}
+                ,{field:'beginDate',align:'center', title: '计划开始日期',width:100}
+                ,{field:'endDate',align:'center', title: '计划结束日期',width:100}
                 ,{align:'center',width:100, title: '状态' ,templet:function(d){
                         var st = getWeeklyState(d.weeklyStatus);
                         if(st.action)
@@ -291,7 +291,7 @@
 						}
                         return xml;
 
-                    }}
+                }}
             ]]
             ,data: [
                 <c:if test="${ not empty page.list}">

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

@@ -89,7 +89,7 @@
                     </div>
                 </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="office.name" htmlEscape="false" readonly="readonly"   id="officeId"  class="form-control required layui-input" value="${projectPlanWeekly.office.name}"/>
                     </div>
@@ -114,6 +114,14 @@
                         <form:textarea path="remarks"  htmlEscape="false" rows="5" maxlength="127" readonly="true" class="form-control"/>
                     </div>
                 </div>
+                <c:if test="${projectPlanWeekly.weeklyStatus} !='0'">
+                    <div class="layui-item layui-col-sm12  with-textarea" style="margin-top: 10px">
+                        <label class="layui-form-label">未完成原因：</label>
+                        <div class="layui-input-block">
+                            <form:textarea path="remarksReason"  htmlEscape="false" rows="5" maxlength="127" readonly="true" class="form-control"/>
+                        </div>
+                    </div>
+                </c:if>
             </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>