Enford 5 éve
szülő
commit
8b6ddc0157

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

@@ -82,8 +82,9 @@
             <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}"/>
                     </div>
                 </div>

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

@@ -231,7 +231,13 @@
             ,page: false
             ,cols: [[
                 {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'remarks',align:'center',title:'周报内容',width:200}
+                ,{align:'center',title:'周报内容',width:200,templet:function(d){
+                    var xml = "";
+                    if (d.remarks != undefined && d.remarks != '' && d.remarks != null) {
+                      xml+= "<a class=\"attention-info\" title=\"" + d.remarks + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/projectplan/weekly/view?id=" + d.id +"&projectId="+d.projectId+"','95%', '95%')\">" + d.remarks + "</a>";
+                    }
+					return xml;
+				}}
                 ,{field:'beginDate',align:'center', title: '开始日期',width:100}
                 ,{field:'endDate',align:'center', title: '结束日期',width:100}
                 ,{align:'center',width:100, title: '状态' ,templet:function(d){
@@ -245,7 +251,7 @@
                 ,{align:'center',width:150, title: '项目信息',templet:function(d){
 					var xml = "";
 					if (d.projectId != undefined && d.projectId != '' && d.projectId != null ){
-						xml = '<span>'+d.projectName+'</span>';
+						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>";
 					}
@@ -260,14 +266,16 @@
                     }
                     return xml;
 				}}
-                ,{field:'op',align:'center',title:"操作",templet:function(d){
+                ,{field:'op',align:'center',width:300,title:"操作",templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.weeklyStatus != undefined && d.weeklyStatus =="0")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目评估', '${ctx}/project/projectAssess/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-edit\" ><i class=\"fa fa-edit\"></i> 确认完成</a>";
-                            xml+="<a href=\"#\" onclick=\"weeklyText('" + d.id+"','"+d.projectId+"')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 备注</a>";
+                            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=\"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='javascript:void(0)' class='op-btn  op-btn-edit' title='备注' onclick='projectText()'><i class='fa fa-edit'></i>备注</a>";
                         }
                         return xml;

+ 123 - 0
src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyView.jsp

@@ -0,0 +1,123 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>新增个人周报</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            laydate.render({
+                elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                format: 'yyyy-MM-dd',
+                type : 'date'
+            });
+
+            laydate.render({
+                elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                format: 'yyyy-MM-dd',
+                type : 'date'
+            });
+        });
+        function doSubmit(){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
+            if(validateForm.form()){
+                $("#inputForm").submit();
+                return true;
+            }
+            return false;
+        }
+        var validateForm;
+        $(document).ready(function() {
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交,请稍等...');
+                    form.submit();
+                },
+                rules:{
+                },
+                messages:{
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误,请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+        });
+
+        function isNumber(val){
+            if(val === "" || val ==null){
+                return false;
+            }
+            var regPos = /^\d+(\.\d+)?$/; //非负浮点数
+            var regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //负浮点数
+            if(regPos.test(val) || regNeg.test(val)){
+                return true;
+            }else{
+                return false;
+            }
+
+        }
+
+    </script>
+    <style>
+        /*超过5个汉字,调整label的长度,以下是配套的*/
+        .layui-item .layui-form-label{
+            width:90px;
+        }
+        .form-group .layui-item .layui-input-block,
+        .query .layui-input-block {
+            margin-left: 116px;
+        }
+    </style>
+</head>
+<body>
+<div class="single-form">
+    <div class="container">
+        <form:form id="inputForm" modelAttribute="projectPlanWeekly" action="${ctx}/projectplan/weekly/save" method="post" class="form-horizontal" >
+            <form:hidden path="id"/>
+            <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>
+                    <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}"/>
+                    </div>
+                </div>
+                <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="office.name" htmlEscape="false" readonly="readonly"   id="officeId"  class="form-control required layui-input" value="${projectPlanWeekly.office.name}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">开始时间:</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>
+                    <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>
+                    <div class="layui-input-block">
+                        <form:textarea path="remarks"  htmlEscape="false" rows="5" maxlength="127" readonly="true" class="form-control"/>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group layui-row page-end"></div>
+        </form:form>
+    </div>
+</div>
+</body>
+</html>