项目登记页面、撤回修改页面、查看页面、驳回修改页面信息修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -27,6 +27,7 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.entity.Activity;
 import com.jeeplus.modules.workactivity.service.ActivityService;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
@@ -181,7 +182,10 @@ public class RuralCostProjectRecordsController extends BaseController {
 			projectPlanInfo.setProjectId(projectRecords.getId());
 			//获取项目计划信息
 			List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+			//项目计划附件信息
+			List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
 			projectRecords.setProjectPlanList(projectPlanList);
+			projectRecords.setWorkAttachments(projectPlanAttachment);
 		}
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsView";

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -27,6 +27,7 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.entity.Activity;
 import com.jeeplus.modules.workactivity.service.ActivityService;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
@@ -157,7 +158,10 @@ public class RuralProjectRecordsController extends BaseController {
 			projectPlanInfo.setProjectId(projectRecords.getId());
 			//获取项目计划信息
 			List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+			//项目计划附件信息
+			List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
 			projectRecords.setProjectPlanList(projectPlanList);
+			projectRecords.setWorkAttachments(projectPlanAttachment);
 		}
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsView";

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -1095,11 +1095,80 @@
             </div>
 
             <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目报告</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th width="25%">报告编号</th>
+                            <th width="25%">报告名称</th>
+                            <th width="20%">工作内容类型</th>
+                            <th width="10%">签章类型</th>
+                            <th width="10%">创建日期</th>
+                            <th width="10%">状态</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:choose>
+                            <c:when test="${not empty projectRecords.projectReportData}">
+                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+                                    <tr>
+                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+                                                ${projectReportData.number}
+                                        </a></td>
+                                        <td>
+                                                ${projectReportData.name}
+                                        </td>
+                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
+                                                ${fns:getContentTypeName(projectReportData.type,"")}
+                                        </td>
+                                        <td title="${projectReportData.reportType}">
+                                                ${projectReportData.reportType}
+                                        </td>
+                                        <td>
+                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+                                        </td>
+                                        <td class="op-td">
+                                                <%--<c:choose>--%>
+                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:when>--%>
+                                                <%--<c:otherwise>--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:otherwise>--%>
+                                                <%--</c:choose>--%>
+                                            <div style="text-align: center" id="status_td_${index.index+1}">
+                                            </div>
+                                            <script>
+                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+                                            </script>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </c:when>
+                            <c:otherwise>
+                                <tr>
+                                    <td colspan="7">
+                                        暂无数据
+                                    </td>
+                                </tr>
+                            </c:otherwise>
+                        </c:choose>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <div class="layui-item nav-btns">
+                <%--<div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                     <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralCostProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>
-                </div>
+                </div>--%>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
                     <span id="fileName_attachment" ></span>
                     <b><span id="baifenbi_attachment" ></span></b>
@@ -1149,7 +1218,7 @@
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
                                     </div>
                                 </td>
                             </tr>
@@ -1158,49 +1227,6 @@
                     </table>
                 </div>
             </div>
-
-            <%--<div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目组成员列表</h2></div>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="usersListTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th width="25%">姓名</th>
-                            <th width="25%">部门</th>
-                            <th width="25%">职级</th>
-                            <th width="150px;">状态</th>
-                        </tr>
-                        </thead>
-                        <tbody id="usersList">
-                        <c:if test="${not empty ruralProjectRecords.projectMembers}">
-                            <c:forEach items="${ruralProjectRecords.projectMembers}" var="user">
-                                <tr id="${user.id}">
-                                    <td>
-                                            ${user.name}
-                                    </td>
-                                    <td>
-                                            ${user.office.name}
-                                    </td>
-                                    <td>
-                                            ${user.basicInfo.jobGrade.name}
-                                    </td>
-                                    <td>
-                                        <c:choose>
-                                            <c:when test="${user.delFlag == 0}">
-                                                正常
-                                            </c:when>
-                                            <c:otherwise>
-                                                移除
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:if>
-                        </tbody>
-                    </table>
-                </div>
-            </div>--%>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp

@@ -32,10 +32,6 @@
                   parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                   return false;
               }
-              if($(".trIdAdds").length==0){
-                  top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
-                  return;
-              }
               if($("#workClientLinkmanList tr").length==0){
                   top.layer.alert('请选择委托方联系人！', {icon: 0});
                   return;
@@ -1001,10 +997,79 @@
             </div>
 
             <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目报告</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th width="25%">报告编号</th>
+                            <th width="25%">报告名称</th>
+                            <th width="20%">工作内容类型</th>
+                            <th width="10%">签章类型</th>
+                            <th width="10%">创建日期</th>
+                            <th width="10%">状态</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:choose>
+                            <c:when test="${not empty projectRecords.projectReportData}">
+                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+                                    <tr>
+                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+                                                ${projectReportData.number}
+                                        </a></td>
+                                        <td>
+                                                ${projectReportData.name}
+                                        </td>
+                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
+                                                ${fns:getContentTypeName(projectReportData.type,"")}
+                                        </td>
+                                        <td title="${projectReportData.reportType}">
+                                                ${projectReportData.reportType}
+                                        </td>
+                                        <td>
+                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+                                        </td>
+                                        <td class="op-td">
+                                                <%--<c:choose>--%>
+                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:when>--%>
+                                                <%--<c:otherwise>--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:otherwise>--%>
+                                                <%--</c:choose>--%>
+                                            <div style="text-align: center" id="status_td_${index.index+1}">
+                                            </div>
+                                            <script>
+                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+                                            </script>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </c:when>
+                            <c:otherwise>
+                                <tr>
+                                    <td colspan="7">
+                                        暂无数据
+                                    </td>
+                                </tr>
+                            </c:otherwise>
+                        </c:choose>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <div class="layui-item nav-btns">
+                <%--<div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                </div>
+                </div>--%>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
                     <span id="fileName_attachment" ></span>
                     <b><span id="baifenbi_attachment" ></span></b>
@@ -1054,7 +1119,7 @@
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
                                     </div>
                                 </td>
                             </tr>
@@ -1063,49 +1128,6 @@
                     </table>
                 </div>
             </div>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目组成员列表</h2></div>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="usersListTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th width="25%">姓名</th>
-                            <th width="25%">部门</th>
-                            <th width="25%">职级</th>
-                            <th width="25%">状态</th>
-                        </tr>
-                        </thead>
-                        <tbody id="usersList">
-                        <c:if test="${not empty projectRecords.projectMembers}">
-                            <c:forEach items="${projectRecords.projectMembers}" var="user">
-                                <tr id="${user.id}">
-                                    <td>
-                                            ${user.name}
-                                    </td>
-                                    <td>
-                                            ${user.office.name}
-                                    </td>
-                                    <td>
-                                            ${user.basicInfo.jobGrade.name}
-                                    </td>
-                                    <td>
-                                        <c:choose>
-                                            <c:when test="${user.delFlag == 0}">
-                                                正常
-                                            </c:when>
-                                            <c:otherwise>
-                                                移除
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:if>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -482,49 +482,6 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目组成员列表</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-				<table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
-					<thead>
-					<tr>
-						<th width="25%">姓名</th>
-						<th width="25%">部门</th>
-						<th width="25%">职级</th>
-						<th width="25%">状态</th>
-					</tr>
-					</thead>
-					<tbody id="usersList">
-					<c:if test="${not empty projectRecords.projectMembers}">
-						<c:forEach items="${projectRecords.projectMembers}" var="user">
-							<tr id="${user.id}">
-								<td>
-										${user.name}
-								</td>
-								<td>
-										${user.office.name}
-								</td>
-								<td>
-										${user.basicInfo.jobGrade.name}
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${user.delFlag == 0}">
-											正常
-										</c:when>
-										<c:otherwise>
-											移除
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-						</c:forEach>
-					</c:if>
-					</tbody>
-				</table>
-			</div>
-			</div>
-
-			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目报告</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<table id="upTable" class="table table-bordered table-condensed details">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -1113,12 +1113,81 @@
                 </div>
             </div>
 
-            <%--<div class="form-group layui-row">
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目报告</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th width="25%">报告编号</th>
+                            <th width="25%">报告名称</th>
+                            <th width="20%">工作内容类型</th>
+                            <th width="10%">签章类型</th>
+                            <th width="10%">创建日期</th>
+                            <th width="10%">状态</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:choose>
+                            <c:when test="${not empty projectRecords.projectReportData}">
+                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+                                    <tr>
+                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+                                                ${projectReportData.number}
+                                        </a></td>
+                                        <td>
+                                                ${projectReportData.name}
+                                        </td>
+                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
+                                                ${fns:getContentTypeName(projectReportData.type,"")}
+                                        </td>
+                                        <td title="${projectReportData.reportType}">
+                                                ${projectReportData.reportType}
+                                        </td>
+                                        <td>
+                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+                                        </td>
+                                        <td class="op-td">
+                                                <%--<c:choose>--%>
+                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:when>--%>
+                                                <%--<c:otherwise>--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:otherwise>--%>
+                                                <%--</c:choose>--%>
+                                            <div style="text-align: center" id="status_td_${index.index+1}">
+                                            </div>
+                                            <script>
+                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+                                            </script>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </c:when>
+                            <c:otherwise>
+                                <tr>
+                                    <td colspan="7">
+                                        暂无数据
+                                    </td>
+                                </tr>
+                            </c:otherwise>
+                        </c:choose>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <div class="layui-item nav-btns">
+                <%--<div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                     <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>
-                </div>
+                </div>--%>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
                     <span id="fileName_attachment" ></span>
                     <b><span id="baifenbi_attachment" ></span></b>
@@ -1133,7 +1202,7 @@
                     <table id="listAttachment" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
-                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;
+                                <%-- <th>序号</th>--%>
                             <th width="25%">文件</th>
                             <th width="25%">上传人</th>
                             <th width="25%">上传时间</th>
@@ -1143,7 +1212,7 @@
                         <tbody id="file_attachment">
                         <c:forEach items="${ruralProjectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
                             <tr class="trIdAdds">
-                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
+                                    <%-- <td>${status.index + 1}</td>--%>
                                 <c:choose>
                                     <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
@@ -1168,7 +1237,7 @@
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
                                     </div>
                                 </td>
                             </tr>
@@ -1176,50 +1245,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>--%>
-
-            <%--<div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目组成员列表</h2></div>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="usersListTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th width="25%">姓名</th>
-                            <th width="25%">部门</th>
-                            <th width="25%">职级</th>
-                            <th width="150px;">状态</th>
-                        </tr>
-                        </thead>
-                        <tbody id="usersList">
-                        <c:if test="${not empty ruralProjectRecords.projectMembers}">
-                            <c:forEach items="${ruralProjectRecords.projectMembers}" var="user">
-                                <tr id="${user.id}">
-                                    <td>
-                                            ${user.name}
-                                    </td>
-                                    <td>
-                                            ${user.office.name}
-                                    </td>
-                                    <td>
-                                            ${user.basicInfo.jobGrade.name}
-                                    </td>
-                                    <td>
-                                        <c:choose>
-                                            <c:when test="${user.delFlag == 0}">
-                                                正常
-                                            </c:when>
-                                            <c:otherwise>
-                                                移除
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:if>
-                        </tbody>
-                    </table>
-                </div>
-            </div>--%>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -32,10 +32,6 @@
                   parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                   return false;
               }
-              if($(".trIdAdds").length==0){
-                  top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
-                  return;
-              }
               if($("#workClientLinkmanList tr").length==0){
                   top.layer.alert('请选择委托方联系人！', {icon: 0});
                   return;
@@ -991,10 +987,79 @@
             </div>
 
             <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目报告</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th width="25%">报告编号</th>
+                            <th width="25%">报告名称</th>
+                            <th width="20%">工作内容类型</th>
+                            <th width="10%">签章类型</th>
+                            <th width="10%">创建日期</th>
+                            <th width="10%">状态</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:choose>
+                            <c:when test="${not empty projectRecords.projectReportData}">
+                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+                                    <tr>
+                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+                                                ${projectReportData.number}
+                                        </a></td>
+                                        <td>
+                                                ${projectReportData.name}
+                                        </td>
+                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
+                                                ${fns:getContentTypeName(projectReportData.type,"")}
+                                        </td>
+                                        <td title="${projectReportData.reportType}">
+                                                ${projectReportData.reportType}
+                                        </td>
+                                        <td>
+                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+                                        </td>
+                                        <td class="op-td">
+                                                <%--<c:choose>--%>
+                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:when>--%>
+                                                <%--<c:otherwise>--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:otherwise>--%>
+                                                <%--</c:choose>--%>
+                                            <div style="text-align: center" id="status_td_${index.index+1}">
+                                            </div>
+                                            <script>
+                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+                                            </script>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </c:when>
+                            <c:otherwise>
+                                <tr>
+                                    <td colspan="7">
+                                        暂无数据
+                                    </td>
+                                </tr>
+                            </c:otherwise>
+                        </c:choose>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <div class="layui-item nav-btns">
+                <%--<div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                </div>
+                </div>--%>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
                     <span id="fileName_attachment" ></span>
                     <b><span id="baifenbi_attachment" ></span></b>
@@ -1044,7 +1109,7 @@
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
                                     </div>
                                 </td>
                             </tr>
@@ -1053,49 +1118,6 @@
                     </table>
                 </div>
             </div>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目组成员列表</h2></div>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="usersListTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th width="25%">姓名</th>
-                            <th width="25%">部门</th>
-                            <th width="25%">职级</th>
-                            <th width="25%">状态</th>
-                        </tr>
-                        </thead>
-                        <tbody id="usersList">
-                        <c:if test="${not empty projectRecords.projectMembers}">
-                            <c:forEach items="${projectRecords.projectMembers}" var="user">
-                                <tr id="${user.id}">
-                                    <td>
-                                            ${user.name}
-                                    </td>
-                                    <td>
-                                            ${user.office.name}
-                                    </td>
-                                    <td>
-                                            ${user.basicInfo.jobGrade.name}
-                                    </td>
-                                    <td>
-                                        <c:choose>
-                                            <c:when test="${user.delFlag == 0}">
-                                                正常
-                                            </c:when>
-                                            <c:otherwise>
-                                                移除
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:if>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -482,49 +482,6 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目组成员列表</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-				<table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
-					<thead>
-					<tr>
-						<th width="25%">姓名</th>
-						<th width="25%">部门</th>
-						<th width="25%">职级</th>
-						<th width="25%">状态</th>
-					</tr>
-					</thead>
-					<tbody id="usersList">
-					<c:if test="${not empty projectRecords.projectMembers}">
-						<c:forEach items="${projectRecords.projectMembers}" var="user">
-							<tr id="${user.id}">
-								<td>
-										${user.name}
-								</td>
-								<td>
-										${user.office.name}
-								</td>
-								<td>
-										${user.basicInfo.jobGrade.name}
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${user.delFlag == 0}">
-											正常
-										</c:when>
-										<c:otherwise>
-											移除
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-						</c:forEach>
-					</c:if>
-					</tbody>
-				</table>
-			</div>
-			</div>
-
-			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目报告</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<table id="upTable" class="table table-bordered table-condensed details">