src/main/java/com/jeeplus/modules/projectConstruction/dao/ContractDao.java

@@ -23,6 +23,13 @@ public interface ContractDao extends CrudDao<ConstructionContract> {
     int queryCount(ConstructionContract constructionContract);
 
     /**
+     * 根据项目id查询施工合同集合
+     * @param id
+     * @return
+     */
+    List<ConstructionContract> find(String id);
+
+    /**
      * 获取工程进度款信息集合
      * @param constructionContract
      * @return

src/main/java/com/jeeplus/modules/projectConstruction/entity/ProjectContractTree.java

@@ -0,0 +1,32 @@
+package com.jeeplus.modules.projectConstruction.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+
+import java.util.List;
+
+public class ProjectContractTree extends DataEntity<ProjectContractTree> {
+    private String projectId;		// 项目编号
+    private String projectName;		// 项目名称
+    private String contractName;	// 合同名称
+    private String projectLeader;   // 负责人
+    private String projectRegistrant;   // 项目登记人
+    private String clientName;      // 主委托方
+    private Integer projectStatus;  // 项目状态
+    private String pid;             // 父id
+    private String loginId;         //登陆者id
+    private String createId;        //创建者id
+    private String status;          //状态
+    private String reportId;        //报告id
+    private String reportName;      //报告名称
+
+    private String contentPId;      //保留工作内容id
+
+    private String dictType;
+    private String parentIds;
+
+    private List<String> masterIdList;  //项目负责人集合
+    private Integer operationSign;   //操作标识
+    private String projectContentId;  //工作内容id
+    private String recordId;
+    private String reportRecordName;   //归档信息名称
+}

src/main/java/com/jeeplus/modules/projectConstruction/service/ContractService.java

@@ -132,4 +132,18 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
         }
         return count;
     }
+
+    /**
+     * 根据项目id查询施工合同集合
+     * @param id
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public List<ConstructionContract> find(String id) {
+        if(StringUtils.isNotEmpty(id)){
+            return  contractDao.find(id);
+        }else{
+            return null;
+        }
+    }
 }

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -22,6 +22,7 @@ import com.jeeplus.modules.projectConstruction.service.ContractService;
 import com.jeeplus.modules.projectType.entity.ProjectTemplateType;
 import com.jeeplus.modules.projectType.service.ProjectResultsFileTemplateService;
 import com.jeeplus.modules.projectType.service.ProjectTypeService;
+import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
 import com.jeeplus.modules.projectcontentinfo.entity.*;
 import com.jeeplus.modules.projectcontentinfo.service.*;
 import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
@@ -96,7 +97,7 @@ public class ContractController extends BaseController {
     @Autowired
     private ProjectcontentinfoService projectcontentinfoService;
 
-    @ModelAttribute
+    /*@ModelAttribute
     public ConstructionContract get(@RequestParam(required=false) String id) {
         ConstructionContract entity = null;
         if (StringUtils.isNotBlank(id)){
@@ -106,18 +107,36 @@ public class ContractController extends BaseController {
             entity = new ConstructionContract();
         }
         return entity;
-    }
+    }*/
+    /*@ModelAttribute
+    public ProjectImplementEarly get(@RequestParam(required=false) String id) {
+        ProjectImplementEarly entity = null;
+        if (StringUtils.isNotBlank(id)){
+            entity = projectImplementEarlyService.get(id);
+        }
+        if (entity == null){
+            entity = new ProjectImplementEarly();
+        }
+        return entity;
+    }*/
 
     /**
      * 项目列表页面
      */
     @RequiresPermissions("project:constructionContract:list")
     @RequestMapping(value = {"list", ""})
-    public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
-        if(UserUtils.isManager()){
+    public String list(ProjectImplementEarly projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        /*if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
+        model.addAttribute("page", page);*/
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        //无合同状态下，获取委托方的名称
+        List<ProjectImplementEarly> list = page.getList();
         model.addAttribute("page", page);
         return "modules/projectConstruction/projectConstructionList";
     }
@@ -148,7 +167,7 @@ public class ContractController extends BaseController {
                 }
             }
             //将界面需要展示数据放入类中
-            projectRecordTreeData.setId(records1.getId());
+            projectRecordTreeData.setId(records1.getId());//获取项目id
             projectRecordTreeData.setProjectName(records1.getProjectName());
             projectRecordTreeData.setProjectId(records1.getProjectId());
             projectRecordTreeData.setProjectContentId(records1.getProjectContentId());
@@ -192,44 +211,35 @@ public class ContractController extends BaseController {
             projectRecordTreeData.setLoginId(UserUtils.getUser().getId());
             projectRecordTreeDataList.add(projectRecordTreeData);
 
-            //获取阶段Type父节点信息
-            String projectType = projectImplementEarlyService.getProjectType(records1.getProjectTypeId(), "实施前期");
-            //根据项目id查询相关的项目阶段内容
-            List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataList(records1.getId(),projectType);
-            if(0 != reportDataList.size()){
-                Projectcontentinfo select = new Projectcontentinfo();
-                ProjectRecords project = new ProjectRecords();
-                project.setId(records1.getId());
-                select.setParentIds("0,");
-                select.setProject(project);
-                List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
-                for (ProjectRecordTreeData reportData : reportDataList) {
-                    //添加工作内容id
-                    if(p.size()>0){
-                        reportData.setContentPId(p.get(0).getId());
-                        reportData.setParentIds("0,");
-                        reportData.setDictType("");
-                    }
-                    //将项目所属类型名称放入树形列表的projectId中
-                    reportData.setProjectId(reportData.getProjectLeader());
-                    //添加项目负责人
-                    reportData.setProjectLeader(projectLeader);
-                    //添加登陆者id
-                    reportData.setLoginId(UserUtils.getUser().getId());
-                    reportData.setCreateId(records1.getCreateBy().getId());
+            //根据项目id查询合同的集合
+            List<ConstructionContract> contractList = contractService.find(records1.getId());
+            if(0 != contractList.size()){
+                for(int j=0;j<contractList.size();j++){
+                    ProjectRecordTreeData treeNew=new ProjectRecordTreeData();
+                    ConstructionContract contract=contractList.get(j);
+                    treeNew.setId(contract.getId()); //合同Id
+
+                    treeNew.setPid(records1.getId());//子类父id也就是项目Id
+                    treeNew.setProjectId(contract.getCnumber());
+                    treeNew.setProjectName(contract.getContractName());
+                    treeNew.setContCate(contract.getContCate());
+                    treeNew.setTrueAmt(contract.getTrueAmt());
+                    treeNew.setProjectLeader(projectLeader);
+                    treeNew.setProjectRegistrant(contract.getCreateName());
+                    treeNew.setCreateDate(contract.getCreateDate());
                     //如果当前登录人为项目登记者或项目负责人则允许其添加子节点信息
                     for (String masterId : masterIdList) {
                         if(masterId.equals(UserUtils.getUser().getId())){
-                            reportData.setOperationSign(1);
+                            treeNew.setOperationSign(1);
                             break;
                         }else{
-                            reportData.setOperationSign(0);
+                            treeNew.setOperationSign(0);
                         }
+
                     }
+                    projectRecordTreeDataList.add(treeNew);
                 }
             }
-            projectRecordTreeDataList.addAll(reportDataList);
-
         }
         map.put("data",projectRecordTreeDataList);
         return map;
@@ -267,7 +277,7 @@ public class ContractController extends BaseController {
      * @param model
      * @return
      */
-    @RequiresPermissions(value={"project:constructionContract:view"})
+    /*@RequiresPermissions(value={"project:constructionContract:view"})*/
     @RequestMapping(value = "view")
     public String view(ConstructionContract constructionContract, Model model) {
         constructionContract = contractService.get(constructionContract.getId());
@@ -285,7 +295,7 @@ public class ContractController extends BaseController {
     /**
      * 添加合同数据
      */
-    @RequiresPermissions(value={"project:constructionContract:add","project:constructionContract:edit"})
+    /*@RequiresPermissions(value={"project:constructionContract:add","project:constructionContract:edit"})*/
     @RequestMapping(value = "save")
     public String save(ConstructionContract constructionContract, Model model, RedirectAttributes redirectAttributes) {
         contractService.insertContract(constructionContract);
@@ -306,9 +316,31 @@ public class ContractController extends BaseController {
     /**
      * 删除工程款信息
      */
-    @RequestMapping(value = "delete")
+    /*@RequestMapping(value = "delete")
     public String delete(ConstructionContract constructionContract) {
+
         contractService.delete(constructionContract);
         return "redirect:"+ Global.getAdminPath()+"/project/constructionContract/?repage";
+    }*/
+
+    /**
+     * 删除依据性资料
+     */
+    @RequestMapping(value = "delete")
+    @ResponseBody
+    public Map<String,Object> delete(ConstructionContract constructionContract, RedirectAttributes redirectAttributes) {
+        Map<String,Object> j= new HashMap<>();
+        try {
+            contractService.delete(constructionContract);
+            j.put("status",true);
+            j.put("msg","删除成功");
+            addMessage(redirectAttributes, "删除成功");
+        }catch (Exception e){
+            j.put("status",false);
+            j.put("msg","删除失败");
+            addMessage(redirectAttributes, "删除失败");
+        }
+        return j;
     }
+
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectContentDataService.java

@@ -9,6 +9,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectBasedDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectBasedData;
@@ -227,4 +228,6 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentReportArchiveDataList(projectId,projectTypeParentId);
         return projectRecordTreeDataList;
     }
+
+
 }

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -30,6 +30,12 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private String recordId;
     private String reportRecordName;   //归档信息名称
 
+    private String contCate;//合同分类
+    private double trueAmt;//有效合同金额
+
+
+
+
     public String getProjectId() {
         return projectId;
     }
@@ -197,4 +203,23 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setReportRecordName(String reportRecordName) {
         this.reportRecordName = reportRecordName;
     }
+
+    public String getContCate() {
+        return contCate;
+    }
+
+    public void setContCate(String contCate) {
+        this.contCate = contCate;
+    }
+
+    public double getTrueAmt() {
+        return trueAmt;
+    }
+
+    public void setTrueAmt(double trueAmt) {
+        this.trueAmt = trueAmt;
+    }
+
+
+
 }

src/main/resources/mappings/modules/constructionContract/contractDao.xml

@@ -236,4 +236,22 @@
 			</if>
 		</where>
 	</select>
+
+
+
+	<select id="find" resultType="com.jeeplus.modules.projectConstruction.entity.ConstructionContract" >
+		SELECT
+		pr.project_name as 'projectName',
+		sd.label as 'contCate',
+		su.name as 'createName',
+		<include refid="workContentContractinfoColumns"/>
+		FROM construction_contract a
+		left join sys_dict sd on sd.value = a.cont_cate
+		left join project_records pr on pr.id = a.project_id
+		left join sys_user su on a.create_by=su.id
+		<where>
+			a.del_flag = 0
+			and a.project_id=#{id} ORDER BY a.update_date DESC
+		</where>
+	</select>
 </mapper>

src/main/webapp/webpage/modules/projectConstruction/contractList.jsp

@@ -0,0 +1,555 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目登记</title>
+	<meta name="decorator" content="default"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+    <style>
+        .layui-table th{
+            font-size: 14px;
+            /*表头内容居中显示*/
+            text-align: center;
+        }
+		.pid{
+			font-size:14px;
+			font-weight:400;
+		}
+    </style>
+	<script type="text/javascript">
+        $(document).ready(function() {
+
+            //搜索框收放
+            $('#moresee').click(function(){
+                if($('#moresees').is(':visible'))
+                {
+                    $('#moresees').slideUp(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+                }else{
+                    $('#moresees').slideDown(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+                }
+            });
+            laydate.render({
+                elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
+            laydate.render({
+                elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
+        });
+
+        function reset() {
+            $("#searchForm").resetForm();
+        }
+
+        function openDialog(title,url,width,height,target) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+
+            }
+
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url,
+                skin: 'three-btns',
+                btn: ['送审', '暂存', '关闭'],
+                /*yes: function (index, layero) {
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if (target) {
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    } else {
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+
+                    if (iframeWin.contentWindow.doSubmit()) {
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function () {
+                            top.layer.close(index)
+                        }, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+
+                },*/
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }else {
+                        return false;
+                    }
+                },
+                btn3: function (index) {
+                }
+            });
+        }
+
+        function openDialogre(title,url,width,height,target,buttons) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+
+            }
+            var split = buttons.split(",");
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                skin: 'three-btns',
+                content: url,
+                btn: split,
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    if(split.length==2){return}
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }else {
+                        return false;
+                    }
+                },
+                btn3: function (index) {
+                }
+            });
+        }
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="projectImplementEarly" action="${ctx}/project/constructionContract/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目名称：</label>
+							<div class="layui-input-block">
+								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目负责人：</label>
+							<div class="layui-input-block">
+								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
+					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+
+                    <div style="clear: both;"></div>
+				</div>
+                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</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>
+    /*使用模块加载的方式 加载文件*/
+    layui.config({
+        base: '${ctx}/resoueces/css/layui/module/'
+    }).extend({
+        treetable: 'treetable-lay/treetable'
+    }).use(['layer', 'table', 'treetable'], function () {
+        var $ = layui.jquery;
+        var table = layui.table;
+        var layer = layui.layer;
+        var treetable = layui.treetable;
+
+        // 渲染表格
+        var renderTable = function () {
+        	var projectName = $("#projectName").val();
+        	var workContractInfoName = $("#workContractInfoName").val();
+        	var workContractInfoClientName = $("#workContractInfoClientName").val();
+        	if(undefined == workContractInfoName){
+				workContractInfoName = "";
+			}
+        	if(undefined == workContractInfoClientName){
+				workContractInfoClientName = "";
+			}
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: true,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+				url: '${ctx}/project/constructionContract/getProjectList?projectId=${projectRecords.id}&pageNo=${page.pageNo}&projectName='+$("#projectName").val()+'&leaderNameStr='+$("#leaderNameStr").val(),
+                page: false,
+                cols: [[
+                    {type: 'numbers', align:'center', title: '序号' ,width:80},
+					{field: 'projectId', title: '项目编号/施工合同编号'},
+					{field: 'projectName', align:'center', title: '项目名称/施工合同名称',templet:function(d){
+							if(0 == d.pid){
+								return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+							}else{
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
+							}
+						}},
+					{field: 'contCate', align:'center', title: '合同分类',templet: function(d){
+							if(0 == d.pid){
+								return "";
+							}else{
+								return "<font>"+d.contCate+"</font>";
+							}
+						}},
+					{field: 'trueAmt', align:'center', title: '有效合同额',templet: function(d){
+							if(0 == d.pid){
+								return "";
+							}else{
+								return "<font>"+d.trueAmt+"</font>";
+							}
+						}},
+					{field: 'projectLeader', align:'center', title: '项目负责人',templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectLeader+"</font>";
+							}else{
+								return "<font>"+d.projectLeader+"</font>";
+							}
+						}},
+					{field: 'projectRegistrant', align:'center', title: '登记人',templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectRegistrant+"</font>";
+							}else{
+								return "<font>"+d.projectRegistrant+"</font>";
+							}
+						}},
+                    {field: 'createDate', align:'center', title: '登记日期',width:100,templet: function(d){
+							var date=d.createDate;
+							date=date.replace(new RegExp(/-/gm) ,"/");
+
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}else{
+								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}
+						}},
+					/*{align:'center', title: '状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else if(d.pid !=0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id="+ d.id + "&type="+d.projectStatus+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},*/
+                    {templet: complain, align:'center', title: '操作',width:130}
+                ]],
+                done: function () {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+
+        renderTable();
+
+        //触发三个button按钮
+        $('#btn-expand').click(function () {
+            treetable.expandAll('#permissionTable');
+        });
+
+        $('#btn-fold').click(function () {
+            treetable.foldAll('#permissionTable');
+        });
+
+        $('#btn-refresh').click(function () {
+            renderTable();
+        });
+
+
+        function complain(d){//操作中显示的内容
+			if(d.pid=="0") {
+				if(1 == d.operationSign) {
+					return [
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementEarly/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+					].join('');
+				}else{
+					return [
+						'',
+					].join('');
+				}
+			} else if (d.pid!="0"){
+				if(1 == d.operationSign) {
+					if(d.status ==null){
+						//子级内容
+						return [
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=early&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+						].join('');
+
+					}else{
+						return [
+							'',
+						].join('');
+					}
+
+				}else{
+					return [
+						'',
+					].join('');
+				}
+			}else{
+				return[''].join('');
+			}
+        }
+        //监听工具条
+        table.on('tool(permissionTable)', function (obj) {
+            var data = obj.data;
+            var layEvent = obj.event;
+            if(data.permissionName!=null){
+                if (layEvent === 'del') {
+                    layer.msg('删除' + data.id);
+                } else if (layEvent === 'edit') {
+                    layer.msg('修改' + data.id);
+                }
+            }
+        });
+    });
+
+</script>
+<script>
+	function openDialogres(title,url,width,height,target){
+
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin: 'three-btns',
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['提交','暂存','关闭'],
+			btn1: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				if(iframeWin.contentWindow.doSubmit(1) ){
+					//top.layer.close(index);//关闭对话框。
+					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+				}
+			},
+			btn2:function(index,layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				if(iframeWin.contentWindow.doSubmit(2) ){
+					// top.layer.close(index);//关闭对话框。
+					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+				}
+				return false;
+			},
+			btn3: function(index){
+			}
+		});
+	}
+	function openDialogreAudit(title,url,width,height,target){
+
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin: 'three-btns',
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['提交','关闭'],
+			btn1: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				if(iframeWin.contentWindow.doSubmit(1) ){
+					top.layer.close(index);//关闭对话框。
+					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+				}
+			},
+			btn2: function(index){
+			}
+		});
+	}
+	// 确认对话框
+	function confirmxRefresh(mess, href){
+		top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+			//do something
+			if (typeof href == 'function') {
+				href();
+			}else{
+				resetTip(); //loading();
+				$.ajax({
+					url:href,
+					data:$('#loginForm').serialize(),
+					type:"post",
+					success:function(data){
+						if(data.status){
+							parent.layer.msg(data.msg,{icon:1});
+						}else {
+							parent.layer.msg(data.msg,{icon:2});
+						}
+						//parent.refreshTrees();
+						location = '${ctx}/project/projectRecords/list';
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/projectConstruction/projectConstructionForm.jsp

@@ -229,6 +229,7 @@
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="constructionContract" action="${ctx}/project/constructionContract/save" method="post" class="form-horizontal">
             <form:hidden path="id"/>
+            <%--<form:hidden path="projectId"/>--%>
         <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>合同信息</h2></div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/projectConstruction/projectConstructionList.jsp

@@ -1,27 +1,38 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false"%>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>客户管理管理</title>
+	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+	<style>
+		.layui-table th{
+			font-size: 14px;
+			/*表头内容居中显示*/
+			text-align: center;
+		}
+		.pid{
+			font-size:14px;
+			font-weight:400;
+		}
+	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			$("#cus_name").show();
-			$("#cus_name").siblings().hide();
+
 			//搜索框收放
 			$('#moresee').click(function(){
 				if($('#moresees').is(':visible'))
 				{
-					$('#moresees').slideUp(0,resizeListWindow1);
+					$('#moresees').slideUp(0,resizeListWindow2);
 					$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
 				}else{
-					$('#moresees').slideDown(0,resizeListWindow1);
+					$('#moresees').slideDown(0,resizeListWindow2);
 					$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
 				}
 			});
 			laydate.render({
-				elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
 				type : 'date'
 			});
@@ -31,36 +42,143 @@
 				type : 'date'
 			});
 		});
-		function switchInput(obj){
-			$("#"+obj).show();
-			$("#"+obj).siblings().hide();
+
+		function reset() {
+			$("#searchForm").resetForm();
 		}
-		//打开对话框(查看)
-		function openDialogNow(title,url,width,height){
-			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
-				width='auto';
-				height='auto';
-			}else{//如果是PC端，根据用户设置的width和height显示。
+
+		function openDialog(title,url,width,height,target) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
 
 			}
+
 			top.layer.open({
 				type: 2,
 				area: [width, height],
 				title: title,
 				maxmin: true, //开启最大化最小化按钮
-				content: url ,
-				btn: ['关闭'],
-				cancel: function(index){
+				content: url,
+				skin: 'three-btns',
+				btn: ['送审', '暂存', '关闭'],
+				/*yes: function (index, layero) {
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if (target) {
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    } else {
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+
+                    if (iframeWin.contentWindow.doSubmit()) {
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function () {
+                            top.layer.close(index)
+                        }, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+
+                },*/
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}else {
+						return false;
+					}
+				},
+				btn3: function (index) {
 				}
 			});
 		}
-	</script>
-	<script type="text/javascript">
-		$(function () {
-			function openNewWindowTab(url) {
-				alert(url);
+
+		function openDialogre(title,url,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
 			}
-		})
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					if(split.length==2){return}
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}else {
+						return false;
+					}
+				},
+				btn3: function (index) {
+				}
+			});
+		}
 	</script>
 	<style>
 		body{
@@ -72,34 +190,29 @@
 		}
 	</style>
 </head>
-<body class="gray-bg">
+<body>
 <div class="wrapper wrapper-content">
 	<sys:message content="${message}"/>
 	<div class="layui-row">
 		<div class="full-width fl">
-			<div class="contentShadow layui-row" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="constructionContract" action="${ctx}/project/constructionContract/list" method="post" class="form-inline">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="projectImplementEarly" action="${ctx}/project/constructionContract/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-					<div class="commonQuery lw14">
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">合同名称：</label>
+							<label class="layui-form-label">项目名称：</label>
 							<div class="layui-input-block">
-								<form:input path="contractName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-						<%--<div class="layui-item query athird">
-							<label class="layui-form-label">创建时间：</label>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目负责人：</label>
 							<div class="layui-input-block">
-								<input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${constructionContract.startDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
-								<span class="group-sep">-</span>
-								<input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${constructionContract.endDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
+								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
-						</div>--%>
+						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -109,31 +222,19 @@
 						</div>
 						<div style="    clear:both;"></div>
 					</div>
-					<div id="moresees" style="clear:both;display:none;" class="lw14">
-
-					</div>
 				</form:form>
 			</div>
 		</div>
-
 		<div class="full-width fl">
-			<div class="contentShadow layui-form contentDetails">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
-						<%--<table:addRow url="${ctx}/project/constructionContract/form" title="合同管理"></table:addRow>--%><!-- 增加按钮 -->
-					<%--<shiro:hasPermission name="project:constructionContract:import">
-						<table:importExcel url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcel><!-- 导入按钮 -->
-					</shiro:hasPermission>
-
-					<shiro:hasPermission name="project:constructionContract:export">
-						<table:exportExcel url="${ctx}/workclientinfo/workClientInfo/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>--%>
-
+					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
+					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
 					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+
 					<div style="clear: both;"></div>
 				</div>
-				<table class="oa-table layui-table" id="contentTable"></table>
-
+				<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
 				<!-- 分页代码 -->
 				<table:page page="${page}"></table:page>
 				<div style="clear: both;"></div>
@@ -142,69 +243,19 @@
 	</div>
 	<div id="changewidth"></div>
 </div>
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
-<%--<script>
-	layui.use('table', function(){
-		layui.table.render({
-			limit:${ page.pageSize }
-			,elem: '#contentTable'
-			,page: false
-			,cols: [[
-				{field:'index',align:'center', title: '序号',width:40}
-				,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-						return "<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>";
-						return xml;
-					}}
-				,{field:'contractName',align:'center', title: '合同名称',minWidth:200,templet:function(d){
-						var xml = "<a class=\"attention-info\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.id + "','95%','95%')\">" +
-								"<span title=" + d.contractName + ">" + d.contractName.substr(0,40) + "</span></a>";
-						return xml;
-					}}
-				,{field:'cnumber',align:'center', title: '合同编号',width:150}
-				,{field:'contCate',align:'center', title: '合同分类',width:150}
-				,{field:'trueAmt',align:'center', title: '有效合同额',width:150}
-				,{field:'createDate',align:'center', title: '创建时间', width:85}
-				,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
-						////对操作进行初始化
-						var xml = "";
-
-						if(d.canedit != undefined && d.canedit == "1")
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改客户信息', '${ctx}/project/constructionContract/form?id=" + d.id + "&param=1','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i>修改</a>"
-
-						if(d.candelete != undefined && d.candelete == "1")
-							xml +="<a href=\"${ctx}/project/constructionContract/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该客户信息吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
-						return xml;
-					}}
-			]]
-			,data: [
-				<c:if test="${ not empty page.list}">
-				<c:forEach items="${page.list}" var="constructionContract" varStatus="index">
-				<c:if test="${index.index != 0}">,</c:if>
-				{
-					"index":"${index.index+1}"
-					,"id":"${constructionContract.id}"
-					,"projectId":"${constructionContract.projectId}"
-					,"contractName":"${constructionContract.contractName}"
-					,"cnumber":"${constructionContract.cnumber}"
-					,"contCate":"${constructionContract.contCate}"
-					,"trueAmt":"${constructionContract.trueAmt}"
-					,"projectName":"${constructionContract.projectName}"
-					,"createDate":"<fmt:formatDate value="${constructionContract.createDate}" pattern="yyyy-MM-dd"/>"
-					<c:if test="${flag == '1' or fns:getUser().id == constructionContract.createBy.id}">
-					<shiro:hasPermission name="project:constructionContract:edit">,"canedit":"1"</shiro:hasPermission>
-					<shiro:hasPermission name="project:constructionContract:del">,"candelete":"1"</shiro:hasPermission>
-					</c:if>
-				}
-				</c:forEach>
-				</c:if>
-			]
-		});
 
-	})
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
 
-	resizeListTable();/*消除由于有竖向滚动条造成table出现横向滚动条*/
+	resizeListTable();
 	$("a").on("click",addLinkVisied);
-</script>--%>
+</script>
+<script>
+	resizeListWindow2();
+	$(window).resize(function(){
+		resizeListWindow2();
+	});
+</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>
@@ -222,9 +273,13 @@
 		// 渲染表格
 		var renderTable = function () {
 			var projectName = $("#projectName").val();
-			var contractName = $("#contractName").val();
-			if(undefined == contractName){
-				contractName = "";
+			var workContractInfoName = $("#workContractInfoName").val();
+			var workContractInfoClientName = $("#workContractInfoClientName").val();
+			if(undefined == workContractInfoName){
+				workContractInfoName = "";
+			}
+			if(undefined == workContractInfoClientName){
+				workContractInfoClientName = "";
 			}
 			layer.load(2);
 			treetable.render({
@@ -235,7 +290,7 @@
 				treeDefaultClose: true,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#permissionTable',
-				url: '${ctx}/project/constructionContract/getProjectList?projectId=${projectRecords.id}&pageNo=${page.pageNo}&projectName='+$("#projectName").val()+'&leaderNameStr='+$("#leaderNameStr").val()+'&workContractInfo.name='+contractName,
+				url: '${ctx}/project/constructionContract/getProjectList?projectId=${projectRecords.id}&pageNo=${page.pageNo}&projectName='+$("#projectName").val()+'&leaderNameStr='+$("#leaderNameStr").val(),
 				page: false,
 				cols: [[
 					{type: 'numbers', align:'center', title: '序号' ,width:80},
@@ -244,21 +299,21 @@
 							if(0 == d.pid){
 								return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 							}else{
-								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看施工合同内容', '${ctx}/project/constructionContract/view?id="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
 							}
 						}},
-					{field: 'clientName', align:'center', title: '合同分类',templet: function(d){
+					{field: 'contCate', align:'center', title: '合同分类',templet: function(d){
 							if(0 == d.pid){
 								return "";
 							}else{
-								return "<font>"+d.clientName+"</font>";
+								return "<font>"+d.contCate+"</font>";
 							}
 						}},
-					{field: 'projectLeader', align:'center', title: '有效合同额',templet: function(d){
+					{field: 'trueAmt', align:'center', title: '有效合同额',templet: function(d){
 							if(0 == d.pid){
 								return "";
 							}else{
-								return "<font>"+d.projectLeader+"</font>";
+								return "<font>"+d.trueAmt+"</font>";
 							}
 						}},
 					{field: 'projectLeader', align:'center', title: '项目负责人',templet: function(d){
@@ -277,7 +332,7 @@
 						}},
 					{field: 'createDate', align:'center', title: '登记日期',width:100,templet: function(d){
 							var date=d.createDate;
-							date=date.replace(new RegExp(/-/gm) ,"/");
+							/*date=date.replace(new RegExp(/-/gm) ,"/");*/
 
 							if(0 == d.pid){
 								return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
@@ -285,6 +340,24 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
+					/*{align:'center', title: '状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else if(d.pid !=0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id="+ d.id + "&type="+d.projectStatus+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},*/
 					{templet: complain, align:'center', title: '操作',width:130}
 				]],
 				done: function () {
@@ -313,7 +386,7 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementEarly/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增施工合同\', \'${ctx}/project/constructionContract/form?view=before&projectId=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
 					].join('');
 				}else{
 					return [
@@ -325,8 +398,8 @@
 					if(d.status ==null){
 						//子级内容
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=early&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-							/*'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改施工合同内容\', \'${ctx}/project/constructionContract/form?id='+d.id+'&projectId='+d.pid+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<a href="${ctx}/project/constructionContract/delete?projectId='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该施工合同吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 						].join('');
 
 					}else{
@@ -468,7 +541,7 @@
 							parent.layer.msg(data.msg,{icon:2});
 						}
 						//parent.refreshTrees();
-						location = '${ctx}/project/projectRecords/list';
+						location = '${ctx}/project/constructionContract/list';
 					}
 				});
 			}
@@ -477,13 +550,5 @@
 		return false;
 	}
 </script>
-<script type="text/javascript">
-	resizeListWindow1();
-	$(window).resize(function(){
-		resizeListWindow1();
-	});
-</script>
 </body>
-
-</html>
-
+</html>