Browse Source

项目管理 将树形图修改成列表结构

user5 5 năm trước cách đây
mục cha
commit
b090a8334b

+ 2 - 2
src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -110,7 +110,7 @@ public class ProjectRecordsController extends BaseController {
 		Page<ProjectRecords> page = projectRecordsService.findPage(new Page<ProjectRecords>(request, response), projectRecords);
         //无合同状态下,获取委托方的名称
 		List<ProjectRecords> list = page.getList();
-		/*for (int i = 0; i < list.size(); i++) {
+		for (int i = 0; i < list.size(); i++) {
 			ProjectRecords records1 = list.get(i);
 			if (records1.getWorkContractInfo() == null) {
 				projectRecordsService.queryLinkmanInfos(records1);
@@ -121,7 +121,7 @@ public class ProjectRecordsController extends BaseController {
 					records1.setWorkContractInfo(contractInfo);
 				}
 			}
-		}*/
+		}
 		model.addAttribute("page", page);
 		return "modules/projectrecord/projectRecordsList";
 	}

+ 12 - 12
src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp

@@ -302,8 +302,8 @@
 
                     <div style="clear: both;"></div>
 				</div>
-<%--				<table class="oa-table layui-table" id="contentTable1"></table>--%>
-                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+				<table class="oa-table layui-table" id="contentTable1"></table>
+<%--                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>--%>
 				<!-- 分页代码 -->
 				<table:page page="${page}"></table:page>
 				<div style="clear: both;"></div>
@@ -316,7 +316,7 @@
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
 
-   /* layui.use('table', function(){
+    layui.use('table', function(){
         layui.table.render({
             limit:${ page.pageSize }
             ,elem: '#contentTable1'
@@ -421,7 +421,7 @@
             // ,even: true
             // ,height: 315
         });
-    })*/
+    })
 
     resizeListTable();
     $("a").on("click",addLinkVisied);
@@ -434,7 +434,7 @@
 </script>
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
-<script>
+<%--<script>
     /*使用模块加载的方式 加载文件*/
     layui.config({
         base: '${ctx}/resoueces/css/layui/module/'
@@ -478,18 +478,18 @@
 							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看成果文件名称', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&dictType="+d.dictType+"&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
 						}
 						}},
-                    {field: 'projectLeader', align:'center', title: '项目负责人/工作内容',templet: function(d){
+					{field: 'clientName', align:'center', title: '委托方/当前阶段',templet: function(d){
 							if(0 == d.pid){
-								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectLeader+"</font>";
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.clientName+"</font>";
 							}else{
-								return "<font>"+d.projectLeader+"</font>";
+								return "<font>"+d.clientName+"</font>";
 							}
 						}},
-					{field: 'clientName', align:'center', title: '委托方/当前阶段',templet: function(d){
+                    {field: 'projectLeader', align:'center', title: '项目负责人/工作内容',templet: function(d){
 							if(0 == d.pid){
-								return "<font style = 'font-size:14px;font-weight:500;'>"+d.clientName+"</font>";
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectLeader+"</font>";
 							}else{
-								return "<font>"+d.clientName+"</font>";
+								return "<font>"+d.projectLeader+"</font>";
 							}
 						}},
                     {field: 'projectRegistrant', align:'center', title: '登记人',templet: function(d){
@@ -749,6 +749,6 @@
 		});
 		return false;
 	}
-</script>
+</script>--%>
 </body>
 </html>