领报告号页面展示

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectContentTreeData.java

@@ -27,6 +27,7 @@ public class ProjectContentTreeData {
     private String contentName;//工作内容
     private String stageName;//阶段名称
     private String reportType;
+    private String typeName;
 
     public String getId() {
         return id;
@@ -156,4 +157,12 @@ public class ProjectContentTreeData {
     public void setReportType(String reportType) {
         this.reportType = reportType;
     }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -103,7 +103,15 @@ public class ProjectReportNumController extends BaseController {
 			stageName=projectReportNumService.getStageName(reportType);
 
 			for(ProjectContentTreeData pct:projectContentTreeDataList){
-
+				pct.setStageName(stageName);
+				//判定如果不是父节点 则查询工作内容名称并展示
+				if (!"0".equals(pct.getPid())){
+					String typeId = pct.getNum().split("-")[1];
+					ProjectType dataByType = projectTypeService.getDataByTypeId(typeId);
+					pct.setTypeName(dataByType.getTypeName());
+				}else{
+					pct.setTypeName("");
+				}
 			}
 		}
 

src/main/webapp/webpage/modules/projectreportnum/projectReportNumList.jsp

@@ -33,11 +33,11 @@
 
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
-				<div class="nav-btns">
+				<%--<div class="nav-btns">
 					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="getOne()" title="领取"><i class="fa fa-plus"></i>&nbsp;领一个</button>
-<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="getMore()" title="领取"><i class="fa fa-plus"></i>&nbsp;领多个</button>--%>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="getMore()" title="领取"><i class="fa fa-plus"></i>&nbsp;领多个</button>
 					<div style="clear: both;"></div>
-				</div>
+				</div>--%>
 				<%--<table class="oa-table layui-table" id="contentTable">
 				</table>--%>
 				<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
@@ -105,7 +105,7 @@
 				treeSpid: 0,//最上级的父级id
 				treeIdName: 'permissionId',//id字段的名称
 				treePidName: 'pid',//pid字段的名称
-				treeDefaultClose: true,//是否默认折叠
+				treeDefaultClose: false,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#permissionTable',
 				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectId=${projectId}&reportType=${reportType}',
@@ -113,6 +113,8 @@
 				cols: [[
 					{field:'index',align:'center',width:120, title: '序号'},
 					{field:'num',align:'center',  title: '报告号'},
+					{field:'stageName',align:'center',  title: '阶段'},
+					{field:'typeName',align:'center',  title: '工作内容'},
 					{templet: complain, title: '操作',width:130}
 				]],
 				done: function () {

src/main/webapp/webpage/modules/projectreportnum/projectReportNumSel.jsp

@@ -33,11 +33,11 @@
 
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
-				<div class="nav-btns">
+				<%--<div class="nav-btns">
 					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="getOne()" title="领取"><i class="fa fa-plus"></i>&nbsp;领一个</button>
-<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="getMore()" title="领取"><i class="fa fa-plus"></i>&nbsp;领多个</button>--%>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="getMore()" title="领取"><i class="fa fa-plus"></i>&nbsp;领多个</button>
 					<div style="clear: both;"></div>
-				</div>
+				</div>--%>
 				<table class="oa-table layui-table"  id="contentTable" lay-filter="contentTable">
 				</table>
 
@@ -108,8 +108,8 @@
 					{checkbox: true,width:80},
 					{field:'index',align:'center',width:120, title: '序号'},
 					{field:'num',align:'center',  title: '报告号'},
-					{field:'num',align:'center',  title: '阶段'},
-					{field:'num',align:'center',  title: '工作内容'},
+					{field:'stageName',align:'center',  title: '阶段'},
+					{field:'typeName',align:'center',  title: '工作内容'},
 					{templet: complain, title: '操作',width:130}
 				]],
 				done: function () {