소스 검색

Merge remote-tracking branch 'origin/master'

[user3] 4 년 전
부모
커밋
1b1f950761

+ 9 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkCntractBorrow.java

@@ -36,6 +36,7 @@ public class WorkCntractBorrow extends ActEntity<WorkCntractBorrow> {
     private Date endContractDate;		// 结束
     private Integer notifyFlag; //代办判定条件
     private String notifyId; //代办判定条件
+    private String pageFlag; //页面判定条件
     // 流程任务
     private Task task;
     private Map<String, Object> variables;
@@ -213,4 +214,12 @@ public class WorkCntractBorrow extends ActEntity<WorkCntractBorrow> {
     public void setNotifyId(String notifyId) {
         this.notifyId = notifyId;
     }
+
+    public String getPageFlag() {
+        return pageFlag;
+    }
+
+    public void setPageFlag(String pageFlag) {
+        this.pageFlag = pageFlag;
+    }
 }

+ 171 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoAllService.java

@@ -0,0 +1,171 @@
+
+package com.jeeplus.modules.workcontractinfo.service;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.oss.OSSClientUtil;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
+import com.jeeplus.common.utils.IdGen;
+import com.jeeplus.common.utils.MenuStatusEnum;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.WordToPic;
+import com.jeeplus.modules.act.entity.Act;
+import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.act.utils.ActUtils;
+import com.jeeplus.modules.act.utils.ProcessDefCache;
+import com.jeeplus.modules.alterinfo.entity.AlterInfo;
+import com.jeeplus.modules.alterinfo.service.AlterInfoService;
+import com.jeeplus.modules.contractclient.dao.WorkContractClientDao;
+import com.jeeplus.modules.contractclient.entity.WorkContractClient;
+import com.jeeplus.modules.contractclient.service.WorkContractClientService;
+import com.jeeplus.modules.isignature.service.ISignatureDocumentService;
+import com.jeeplus.modules.serialnum.service.SerialNumTplService;
+import com.jeeplus.modules.sys.dao.RoleDao;
+import com.jeeplus.modules.sys.dao.WorkattachmentDao;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
+import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.sys.utils.RoleActivityEnname;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
+import com.jeeplus.modules.workactivity.entity.Activity;
+import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
+import com.jeeplus.modules.workactivity.service.ActivityService;
+import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
+import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
+import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
+import com.jeeplus.modules.workbidproject.dao.WorkBidProjectDao;
+import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
+import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
+import com.jeeplus.modules.workcontractinfo.dao.*;
+import com.jeeplus.modules.workcontractinfo.entity.*;
+import com.jeeplus.modules.workfullmanage.dao.WorkFullRecordDao;
+import com.jeeplus.modules.workinvoicedetail.dao.WorkInvoiceDetailDao;
+import com.jeeplus.modules.workinvoicedetail.entity.WorkInvoiceDetail;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
+import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
+import org.activiti.engine.ActivitiObjectNotFoundException;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.IdentityService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.awt.*;
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.*;
+
+/**
+ * 合同管理Service
+ * @author 丁旭
+ * @version 2017-03-21
+ */
+@SuppressWarnings("all")
+@Service
+@Transactional(readOnly = true)
+public class WorkContractInfoAllService extends CrudService<WorkContractInfoDao, WorkContractInfo> {
+
+	@Autowired
+	private WorkattachmentService workattachmentService;
+	@Autowired
+	private WorkContractInfoDao workContractInfoDao;
+	@Autowired
+	private WorkContractReviewDao workContractReviewDao;
+	@Autowired
+	private AlterInfoService alterInfoService;
+	@Autowired
+	private WorkContractClientService workContractClientService;
+	@Autowired
+	private WorkClientInfoService workClientInfoService;
+
+	public List<WorkContractInfo> findList(WorkContractInfo workContractInfo) {
+		if (StringUtils.isNotBlank(workContractInfo.getTotalContractIds())){
+			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
+		}
+		return super.findList(workContractInfo);
+	}
+
+	public Page<WorkContractInfo> findPage(Page<WorkContractInfo> page, WorkContractInfo workContractInfo) {
+		if (StringUtils.isNotBlank(workContractInfo.getTotalContractIds())){
+			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
+		}
+		String companyId = UserUtils.getUser().getComId();
+		int count = dao.queryCount(workContractInfo);
+		page.setCount(count);
+		page.setCountFlag(false);
+		workContractInfo.setPage(page);
+		List<WorkContractInfo> list = super.findList(workContractInfo);
+		page.setList(list);
+		return page;
+	}
+
+	public WorkContractInfo getInfo(String id) {
+		WorkContractInfo workContractInfo = super.get(id);
+
+		if(workContractInfo != null){
+			WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+			workClientAttachment.setAttachmentId(id);
+			workClientAttachment.setAttachmentFlag("44");
+			workContractInfo.setWorkAttachments(workattachmentService.getAttachmentList(workClientAttachment));
+			WorkClientAttachment workClientAttachment2 = new WorkClientAttachment();
+			workClientAttachment2.setAttachmentId(id);
+			workClientAttachment2.setAttachmentFlag("81");
+			workContractInfo.setWorkAttachmentAlters(workattachmentService.getAttachmentList(workClientAttachment2));
+			String totalContractId = workContractInfo.getTotalContractId();
+			if(!Strings.isNullOrEmpty(totalContractId)){
+				WorkContractInfo wc = workContractInfoDao.get(totalContractId);
+				if(wc != null){
+					workContractInfo.setTotalContractName(wc.getName());
+				}
+			}
+			WorkContractReview workContractReview = workContractReviewDao.getByContractId(workContractInfo.getId());
+			if (workContractReview!=null){
+				WorkClientAttachment clientAttachment = new WorkClientAttachment();
+				clientAttachment.setAttachmentId(workContractReview.getId());
+				clientAttachment.setAttachmentFlag("80");
+				workContractReview.setWorkAttachments(workattachmentService.getAttachmentList(clientAttachment));
+				workContractInfo.setWorkContractReview(workContractReview);
+			}
+			AlterInfo alterInfo = new AlterInfo();
+			alterInfo.setBeforeId(workContractInfo.getId());
+			List<AlterInfo> list = alterInfoService.findList(alterInfo);
+			if(list!=null && list.size()>0){
+				workContractInfo.setAlterInfo(list.get(0));
+			}
+			WorkContractClient workContractClient = new WorkContractClient();
+			workContractClient.setContractId(workContractInfo.getId());
+			List<WorkContractClient> list1 = workContractClientService.findList(workContractClient);
+			List<WorkClientInfo> list2 = new ArrayList<>();
+			if(list1!=null && list1.size()>0){
+				for(WorkContractClient w :list1){
+					WorkClientInfo workClientInfo = workClientInfoService.get(w.getClientId());
+					list2.add(workClientInfo);
+				}
+			}
+			workContractInfo.setWorkClientInfoList(list2);
+		}
+		return workContractInfo;
+	}
+}

+ 17 - 2
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractBorrowController.java

@@ -76,7 +76,7 @@ public class WorkContractBorrowController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 合同借用列表页面
 	 */
@@ -130,6 +130,9 @@ public class WorkContractBorrowController extends BaseController {
 			workCntractBorrow.setCreateDate(new Date());
 		}
 		model.addAttribute("workContractBorrow", workCntractBorrow);
+		if("contractAll".equals(workCntractBorrow.getHome())){
+			return "modules/workContractBorrow/"+view;
+		}
 		return "modules/workContractBorrow/"+view;
 	}
 
@@ -230,6 +233,9 @@ public class WorkContractBorrowController extends BaseController {
 			addMessage(redirectAttributes, "合同借用申请提交失败!");
 			addMessage(redirectAttributes, "系统内部错误");
 		}
+		if("contractAll".equals(workCntractBorrow.getPageFlag())){
+			return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfoAll/?repage";
+		}
 		return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 	}
 
@@ -258,6 +264,9 @@ public class WorkContractBorrowController extends BaseController {
 		if (StringUtils.isNotBlank(workCntractBorrow.getHome()) && "home".equals(workCntractBorrow.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		}else {
+			if("contractAll".equals(workCntractBorrow.getHome())){
+				return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfoAll/?repage";
+			}
 			return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 		}
 	}
@@ -313,6 +322,9 @@ public class WorkContractBorrowController extends BaseController {
 			workCntractBorrowService.cancelInvalidate(workCntractBorrow);
 			addMessage(redirectAttributes, "撤回成功");
 		}
+		if("contractAll".equals(workCntractBorrow.getHome())){
+			return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfoAll/?repage";
+		}
 		return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 	}
 
@@ -354,6 +366,9 @@ public class WorkContractBorrowController extends BaseController {
 	public String updateGiveDate(WorkCntractBorrow workCntractBorrow, RedirectAttributes redirectAttributes) {
 		workCntractBorrowService.updateGiveDate(workCntractBorrow);
 		addMessage(redirectAttributes, "合同归还成功");
+		if("contractAll".equals(workCntractBorrow.getHome())){
+			return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfoAll/?repage";
+		}
 		return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 	}
 
@@ -383,4 +398,4 @@ public class WorkContractBorrowController extends BaseController {
 		return JsonMapper.toJsonString(map);
 	}
 
-}
+}

+ 155 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoAllController.java

@@ -0,0 +1,155 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.workcontractinfo.web;
+
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkCntractBorrow;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoAllService;
+import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+/**
+ * 啥看所有合同信息
+ *
+ * @author 徐滕
+ * @version 2021-05-13
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/workcontractinfo/workContractInfoAll")
+public class WorkContractInfoAllController extends BaseController {
+
+    @Autowired
+    private WorkContractInfoAllService workContractInfoAllService;
+    @Autowired
+    private WorkContractInfoService workContractInfoService;
+    @Autowired
+    private WorkProjectNotifyService workProjectNotifyService;
+
+    @ModelAttribute
+    public WorkContractInfo get(@RequestParam(required = false) String id) {
+        WorkContractInfo entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = workContractInfoService.get(id);
+        }
+        if (entity == null) {
+            entity = new WorkContractInfo();
+
+        }
+        return entity;
+    }
+
+    /**
+     * 合同管理列表页面
+     */
+    @RequiresPermissions("workcontractinfo:workContractInfo:list")
+    @RequestMapping(value = {"list", ""})
+    public String list(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        User user = UserUtils.getUser();
+        Page<WorkContractInfo> page = workContractInfoAllService.findPage(new Page<WorkContractInfo>(request, response), workContractInfo);
+        List<WorkContractInfo> list = page.getList();
+
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+        workProjectNotify.setUser(UserUtils.getUser());
+        workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        workProjectNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("16");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify recordNotify = new WorkProjectNotify();
+        recordNotify.setUser(UserUtils.getUser());
+        recordNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        recordNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("42");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> recordNotifyList = workProjectNotifyService.findList(recordNotify);
+
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify borrowNotify = new WorkProjectNotify();
+        recordNotify.setUser(UserUtils.getUser());
+        recordNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        recordNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("93");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> borrowNotifyList = workProjectNotifyService.findList(recordNotify);
+
+        //查询合同借用信息状态
+        if(list.size()>0){
+            for (WorkContractInfo info: list) {
+                WorkCntractBorrow workCntractBorrow = workContractInfoService.getBorrowInfo(info.getId());
+                if(null != workCntractBorrow){
+                    info.setBorrowStatus(workCntractBorrow.getStatus());
+                    info.setGiveStatus(workCntractBorrow.getGiveStatus());
+                    info.setBorrowCreateById(workCntractBorrow.getCreateBy().getId());
+                    info.setBorrowId(workCntractBorrow.getId());
+                }else{
+                    info.setBorrowStatus("0");
+                    info.setGiveStatus("0");
+                    info.setBorrowCreateById("");
+                    info.setBorrowId("");
+                }
+                if(user.getRoleList().size()>0){
+                    //判断是否为admin
+                    if (UserUtils.isManager()){
+                        info.setFlagAdmin("1");
+                    }else{
+                        info.setFlagAdmin("0");
+                    }
+                }else{
+                    info.setFlagAdmin("0");
+                }
+                for (WorkProjectNotify notify: notifyList) {
+                    if(notify.getNotifyId().equals(info.getId())){
+                        info.setNotifyId(notify.getId());
+                        if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setNotifyFlag(1);
+                        }
+                        break;
+                    }
+                }
+                for (WorkProjectNotify notify: recordNotifyList) {
+                    if(notify.getNotifyId().equals(info.getContrractRecordId())){
+                        info.setRecordNotifyId(notify.getId());
+                        if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setRecordNotifyFlag(1);
+                        }
+                        break;
+                    }
+                }
+                for (WorkProjectNotify notify: borrowNotifyList) {
+                    if(notify.getNotifyId().equals(info.getBorrowId())){
+                        info.setBorrowNotifyId(notify.getId());
+                        if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setBorrowNotifyFlag(1);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+        model.addAttribute("page", page);
+        return "modules/workcontractinfo/workContractInfoAllList";
+    }
+
+}

+ 2 - 1
src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowForm.jsp

@@ -75,6 +75,7 @@
 		<form:form id="inputForm" modelAttribute="workContractBorrow" action="${ctx}/workContractBorrow/workContractBorrow/save" method="post" class="form-horizontal">
 			<form:hidden path="id"/>
 			<form:hidden path="workContractInfo.id"/>
+			<form:hidden path="pageFlag"/>
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
@@ -202,4 +203,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>

+ 928 - 0
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp

@@ -0,0 +1,928 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>合同管理</title>
+	<meta name="decorator" content="default"/>
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+	<style>
+	</style>
+	<%@include file="/webpage/include/treetable.jsp" %>
+	<%--<style>--%>
+	<%--.shows .input-group{--%>
+	<%--width: 78%!important;--%>
+	<%--}--%>
+	<%--.form-group shows{--%>
+	<%--width: auto;--%>
+	<%--}--%>
+	<%--#beginContractDate{--%>
+	<%--width:200px;--%>
+	<%--}--%>
+	<%--#endContractDate{--%>
+	<%--width:200px;--%>
+	<%--}--%>
+	<%--</style>--%>
+	<script type="text/javascript">
+        var validateForm;
+        $(document).ready(function() {
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交,请稍等...');
+                    form.submit();
+                },
+                rules:{
+                    number:{
+                        required:true
+                    },
+                    businessType:{
+                        required:true
+                    }
+                },
+                messages:{
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误,请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            // $("#treeTable").treeTable({expandLevel : 1,column:1}).show();
+
+            //搜索框收放
+            $('#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: '#beginContractDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+            laydate.render({
+                elem: '#endContractDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+        });
+
+
+        function contractOpenDialogre(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: false, //开启最大化最小化按钮
+                skin:"three-btns",
+                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
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function contractOpenDialogres(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: false, //开启最大化最小化按钮
+                skin:"three-btns",
+                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
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+
+        function contractAdminUpdate(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: false, //开启最大化最小化按钮
+                skin:"three-btns",
+                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
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function openDialogre(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: false, //开启最大化最小化按钮
+                content: url ,
+                skin:"three-btns",
+                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(3) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+	</script>
+	<script type="text/javascript">
+
+        function openDialogreReapply(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, //开启最大化最小化按钮
+                skin:"two-btns",
+                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中展示
+                    var formId = inputForm.attr("id");
+                    if(formId){
+                        var $document = iframeWin.contentWindow.document;
+                        $document.getElementById(formId).setAttribute("action","${ctx}/workcontractinfo/workContractInfo/invalidateContractSaveAudit?reapply=yes");
+                        formSubmit($document,formId,index);
+                    }
+                },
+                /*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中展示
+                    var formId = inputForm.attr("id");
+                    if(formId){
+                        var $document = iframeWin.contentWindow.document;
+                        $document.getElementById(formId).setAttribute("action","${ctx}/workcontractinfo/workContractInfo/invalidateContractSaveAudit?reapply=no");
+                        formSubmit($document,formId,index);
+                    }
+                    return false;
+                },*/
+                btn3: function (index) {
+                }
+            });
+        }
+        function formSubmit($document,inputForm,index){
+            var validateForm = $($document.getElementById(inputForm)).validate({
+                submitHandler: function(form){
+                    loading('正在提交,请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $($document.getElementById("#messageBox")).text("输入有误,请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            if(validateForm.form()){
+                var loadingMessage = parent.layer.load(0, {shade: [0.1,'#393d49']});
+                $($document.getElementById(inputForm)).ajaxSubmit({
+                    success:function(data) {
+                        top.layer.close(index);
+                        parent.layer.msg("保存成功!!!",{icon:6});
+                        parent.layer.close(loadingMessage);
+                        window.location.reload();
+                    }
+                });
+            }
+        }
+
+	</script>
+	<script type="text/javascript">
+       /* function contractInvalidateForm(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, //开启最大化最小化按钮
+                skin:"two-btns",
+                content: url ,
+                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中展示
+                    var formId = inputForm.attr("id");
+                    if(formId){
+                        var $document = iframeWin.contentWindow.document;
+                        formSubmit($document,formId,index);
+                    }
+                },
+                cancel: function(index){
+                }
+            });
+        }*/
+
+        function contractInvalidateForm(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: false, //开启最大化最小化按钮
+                skin:"three-btns",
+                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
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+	   function openDialogreplay(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: false, //开启最大化最小化按钮
+			   skin: 'two-btns',
+			   content: url ,
+			   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
+				   }
+
+			   },
+			   cancel: function(index){
+			   }
+		   });
+	   }
+	</script>
+	<script>
+
+		function notifyDialogre(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){
+				}
+			});
+
+		}
+	</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="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li class="active"><a href="${ctx}/workcontractinfo/workContractInfo/list">合同管理</a></li>
+					<li><a href="${ctx}/workcontractinfoalter/workContractInfoAlter/alterLists">合同变更</a></li>
+					<li><a href="${ctx}/workcontractinfoi/workContractInfoI/ilist">合同作废</a></li>
+					<li><a href="${ctx}/workcontractsignature/workContractSignature/list">合同签章</a></li>
+					<li><a href="${ctx}/workcontractrecord/workContractRecord/list">合同归档</a></li>
+				</ul>
+			</div>
+		</div>--%>
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="workContractInfo" action="${ctx}/workcontractinfo/workContractInfoAll/list" 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 lw7">
+					<div class="layui-item query athird">
+						<label class="layui-form-label">客户名称:</label>
+						<div class="layui-input-block with-icon">
+							<form:input path="client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+						</div>
+					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">合同名称:</label>
+						<div class="layui-input-block with-icon">
+							<form:input path="name" 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>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<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>
+				<div id="moresees" class="lw7" style="clear:both;display:none;height: 70px;">
+					<div class="layui-item query athird">
+						<label class="layui-form-label">签订日期:</label>
+						<div class="layui-input-block">
+							<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workContractInfo.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+							<span class="group-sep">-</span>
+							<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workContractInfo.endContractDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+						</div>
+					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">合同状态:</label>
+						<div class="layui-input-block with-icon">
+							<form:select path="contractState"  class="form-control simple-select">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('audit_contract_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">归档状态:</label>
+						<div class="layui-input-block with-icon">
+							<form:select path="contrractRecordStatus"  class="form-control simple-select">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('archive_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label  double-line">合同金额(元):</label>
+						<div class="layui-input-block with-icon">
+							<form:input path="contractPrice" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+						</div>
+					</div>
+				</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="contentShadow layui-form contentDetails">
+				<div class="nav-btns">
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
+					<div class="layui-btn-group">
+						<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
+							<button class="layui-btn layui-btn-sm layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">&nbsp;添加</button>
+						</shiro:hasPermission>
+						<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
+							<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
+						<%--<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
+                        </shiro:hasPermission>--%>
+						<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
+							<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">--%>
+<%--						<button class="nav-btn nav-btn-add" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:import">--%>
+<%--						<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					&lt;%&ndash;<shiro:hasPermission name="workcontractinfo:workContractInfo:export">--%>
+<%--					</shiro:hasPermission>&ndash;%&gt;--%>
+<%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:export">--%>
+<%--						<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					&lt;%&ndash;<table:importInfoErr url="${ctx}/workcontractinfo/workContractInfo/importInfoErr" title="导入日志"></table:importInfoErr>&ndash;%&gt;--%>
+
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>--%>
+
+					<div style="clear: both;"></div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable1"></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>
+    layui.use('table', function(){
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable1'
+            ,page: false
+            ,cols: [[
+                // {checkbox: true, fixed: true},
+                {field:'index',align:'center', title: '序号',width:40}
+                ,{field:'contractNum',align:'center', sort:true,title: '合同编号',minWidth:200,templet:function(d){
+                        return "<span title='"+ d.contractNum +"'>" + d.contractNum + "</span>";
+                    }}
+                ,{field:'contractName',align:'center', title: '合同名称',minWidth:200,templet:function(d){
+                        return "<a class=\"attention-info\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.id + "','95%', '95%')\">" + d.contractName + "</a>";
+                    }}
+                ,{field:'recordNum',align:'center', title: '案卷号',minWidth:200,templet:function(d){
+                        return "<a class=\"attention-info\" title=\""+d.recordNum+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=1','95%', '95%')\">" + d.recordNum + "</a>";
+                    }}
+                ,{field:'clientName',align:'center', title: '客户名称',minWidth:160,templet:function(d){
+                        return "<a class=\"attention-info\" title=\""+d.clientName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看客户管理', '${ctx}/workclientinfo/workClientInfo/detail?id=" + d.clientId +"','95%', '95%')\">" + d.clientName + "</a>";
+                    }}
+                ,{field:'contractPrice', align:'center',title: '合同金额(元)',width:100,templet:function(d){
+                        return "<span title='"+ d.contractPrice2 +"'>" + d.contractPrice2 + "</span>";
+                    }}
+                ,{field:'createBy',align:'center', title: '创建人',  width:80,templet:function(d){
+                        return "<span title='"+ d.createBy +"'>" + d.createBy + "</span>";
+                    }}
+                ,{field:'signDate',align:'center', title: '签订日期',  width:80}
+                ,{align:'center', title: '状态',  width:70,templet:function(d){
+                        <%--var st = getAuditState(d.status);--%>
+                        <%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workcontractinfo/workContractInfo/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+                        <%--return xml;--%>
+                        var st = getAuditContractState(d.status);
+                        if(st.action)
+                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workcontractinfo/workContractInfo/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;
+                    }}
+                ,{align:'center', title: '归档状态',  width:70,templet:function(d){
+                        var st = getRuralProjectArchiveState(d.contrractRecordStatus);
+                        if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workcontractrecord/workContractRecord/getProcessOne?id=" + d.contrractRecordId + "','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;
+                    }}
+                ,{align:'center', title: '借用状态',  width:70,templet:function(d){
+						var result = '';
+						if(d.borrowStatus == "0" || d.borrowStatus == "4" || d.giveStatus == "5"){
+							result = "0";
+						}else if(d.borrowStatus != "5"){
+							result = "2";
+						}else if(d.borrowStatus == "5"){
+							result = "5";
+						}
+                        var st = getBorrowState(result);
+                        if(st.action)
+                            var xml = "<span onclick=\"openDialogView('借用详情列表', '${ctx}/workContractBorrow/workContractBorrow/getWorkCntractBorrowList?contractId=" + 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;
+                    }}
+                ,{align:'center',title:"操作",minWidth:180,templet:function(d){
+                        ////对操作进行初始化
+                        var xml="<div class=\"layui-btn-group\">";
+
+						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同登记审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+						}
+						if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+						}
+						if(d.borrowNotifyFlag != undefined && d.borrowNotifyFlag !=null && "" != d.borrowNotifyFlag && d.borrowNotifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同借用审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.borrowNotifyId +"&home=contractAll','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+						}
+						if(d.updateAdmin != undefined && d.updateAdmin == "1" ){
+							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
+						}
+                        if(d.status != 5){
+							/*if(d.signature != undefined && d.signature =="1")
+                                                    {
+                                                        xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('签章申请', '${ctx}/workcontractsignature/workContractSignature/form?id="+ d.id +"&tbal=1','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 签章</a>";
+                        }*/
+
+							/*if(d.canalter != undefined && d.canalter =="1")
+                            {
+                                xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('变更合同管理', '${ctx}/workcontractinfo/workContractInfo/alterForm?id="+ d.id +"','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
+                        }
+                        if(d.caninvalid != undefined && d.caninvalid =="1")
+                        {
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"contractInvalidateForm('合同作废送审', '${ctx}/workcontractinfo/workContractInfo/contractInvalidateForm?id=" + d.id + "&dialog=invalidateReasonForm','95%','95%')\"   class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 作废</a>";
+                        }*/
+							if(d.canedit != undefined && d.canedit =="1")
+							{
+								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改合同</a>";
+							}
+							if(d.canedits != undefined && d.canedits =="1")
+							{
+								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
+							}
+							if(d.candelete != undefined && d.candelete =="1")
+							{
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/delete?id=" + d.id + "&contractState="+d.status+"\" onclick=\"return confirmx('确认要作废该合同信息吗?', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 合同作废</a>";
+							}
+							if(d.cancancel != undefined && d.cancancel =="1")
+							{
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revoke?id="+ d.id +"&contractState="+d.status+"&processInstanceId="+ d.processInstanceId +"\" onclick=\"return confirmx('确认要撤回该合同管理吗?', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回合同</a>";
+							}
+
+							/*if(d.canalterCom != undefined && d.canalterCom =="1")
+							{
+								<shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗?', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";
+								</shiro:hasPermission>
+							}*/
+							if(d.canalterComRevoke != undefined && d.canalterComRevoke =="1")
+							{
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗?', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回合同</a>";
+							}
+							if(d.canalterComDel != undefined && d.canalterComDel =="1")
+							{
+								<%--/* xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗?', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";*/--%>
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同吗?', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除合同</a>";
+							}
+						} else if(d.contrractRecordStatus !="5"){
+							if(d.back != undefined && d.back =="1")
+							{
+								xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('归档申请', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.id +"&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-orange\" > 归档</a>";
+							}
+
+							if(d.cancancelRecord != undefined && d.cancancelRecord == "1")
+								xml += "<a href=\"${ctx}/workcontractrecord/workContractRecord/cancelInvalidate?id=" + d.contrractRecordId + "&status="+d.contrractRecordStatus+"\" onclick=\"return confirmx('确认要强制撤回?', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 撤回归档</a>";
+							if(d.caneditRecord1 != undefined && d.caneditRecord1 == "1")
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
+							if(d.caneditRecord2 != undefined && d.caneditRecord2 == "1")
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
+							if(d.caneditRecord3 != undefined && d.caneditRecord3 == "1")
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请归档', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
+							/*if(d.candeleteRecord != undefined && d.candeleteRecord == "1")
+								xml +="<a href=\"${ctx}/workcontractrecord/workContractRecord/delete?id=" + d.contrractRecordId + "\" onclick=\"return confirmx('确认要删除该合同归档申请吗?', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";*/
+						}
+                        //合同借用
+                        else if(d.contrractRecordStatus =="5"){
+							if((d.borrowStatus != undefined && d.borrowStatus == "0")|| d.borrowStatus == "4" || (d.giveStatus != undefined && d.giveStatus == "5"))
+							{
+								xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('借用申请', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.id +"&tabId=4&pageFlag=contractAll','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-orange\" > 借用</a>";
+							}
+
+							if(d.cancancelBorrow != undefined && d.cancancelBorrow == "1")
+								xml += "<a href=\"${ctx}/workContractBorrow/workContractBorrow/cancelInvalidate?id=" + d.borrowId + "&home=contractAll&pageFlag=contractAll\" onclick=\"return confirmx('确认要强制撤回?', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 撤回借用</a>";
+							/*if(d.caneditBorrow1 != undefined && d.caneditBorrow1 == "1")
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改归档信息', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.borrowId + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							if(d.caneditBorrow2 != undefined && d.caneditBorrow2 == "1")
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改归档信息', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.borrowId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							if(d.caneditBorrow3 != undefined && d.caneditBorrow3 == "1")
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请归档', '${ctx}/workContractBorrow/workContractBorrow/form?id=" + d.borrowId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							if(d.candeleteBorrow != undefined && d.candeleteBorrow == "1")
+								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/delete?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要删除该合同归档申请吗?', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";*/
+							if(d.giveBorrow != undefined && d.giveBorrow == "1")
+								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "&home=contractAll&pageFlag=contractAll\" onclick=\"return confirmx('确认归还该合同信息吗?', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-orange\"> 归还合同</a>";
+						}
+                        xml+="</div>"
+                        return xml;
+
+                    }}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="workContractInfo" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"contractNum":"${workContractInfo.contractNum}"
+                    ,"id":"${workContractInfo.id}"
+                    ,"contractName":"${workContractInfo.name}"
+					,"clientId":"${workContractInfo.client.id}"
+                    ,"clientName":"${workContractInfo.client.name}"
+                    ,"clientType":"${fns:getMainDictLabel(workContractInfo.contractType, 'contract_type', '')}"
+                    ,"contractPrice":"${workContractInfo.contractPrice}"
+                    ,"contractPrice2":"<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"
+                    ,"signDate":"<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>"
+                    ,"createBy":"${workContractInfo.createName}"
+                    ,"status":"${workContractInfo.contractState}"
+                    ,"contrractRecordStatus":"${workContractInfo.contrractRecordStatus}"
+                    ,"contrractRecordId":"${workContractInfo.contrractRecordId}"
+                    ,"recordNum":"${workContractInfo.recordNum}"
+                    ,"borrowStatus":"${workContractInfo.borrowStatus}"
+                    ,"giveStatus":"${workContractInfo.giveStatus}"
+                    ,"borrowId":"${workContractInfo.borrowId}"
+                    ,"flagAdmin":"${workContractInfo.flagAdmin}"
+					,"notifyFlag":"${workContractInfo.notifyFlag}"
+					,"notifyId":"${workContractInfo.notifyId}"
+					,"recordNotifyFlag":"${workContractInfo.recordNotifyFlag}"
+					,"recordNotifyId":"${workContractInfo.recordNotifyId}"
+					,"borrowNotifyFlag":"${workContractInfo.borrowNotifyFlag}"
+					,"borrowNotifyId":"${workContractInfo.borrowNotifyId}"
+                    <%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id && workContractInfo.signatureStatus == 1   }">,"signature":"1"</c:if>/*签章*/--%>
+                    <%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id}">,"canalter":"1"</c:if>/*变更*/--%>
+					<%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id}">,"caninvalid":"1"</c:if>/*作废*/--%>
+                    <%--<c:if test="${(workContractInfo.contractState == 5 ||workContractInfo.contractState == 7)&& workContractInfo.recordState != 3 && workContractInfo.signatureStatus == 2 && fns:getUser().id == workContractInfo.createBy.id}">,"back":"1"</c:if>--%>
+                    <c:if test="${workContractInfo.contractState == 5 && workContractInfo.contrractRecordStatus == 0 && fns:getUser().id == workContractInfo.createBy.id}">,"back":"1"</c:if>
+					<c:if test="${(workContractInfo.contractState == 1) && fns:getUser().id == workContractInfo.createBy.id}">,"canedit":"1"</c:if>
+                    <c:if test="${(workContractInfo.contractState == 3 or workContractInfo.contractState == 4) && fns:getUser().id == workContractInfo.createBy.id}">,"canedits":"1"</c:if>
+					<c:if test="${(workContractInfo.contractState == 3 or workContractInfo.contractState == 1 or workContractInfo.contractState == 4)&& ( workContractInfo.createBy.id == fns:getUser().id or flag == true )}">,"candelete":"1"</c:if>
+					<c:if test="${workContractInfo.contractState == 2 && fns:getUser().id == workContractInfo.createBy.id}">,"cancancel":"1","processInstanceId":"${workContractInfo.processInstanceId}"</c:if>
+					<c:if test="${((workContractInfo.contractState == 7 && workContractInfo.signatureStatus == 1)||((workContractInfo.contractState == 7 || workContractInfo.contractState == 5)&& workContractInfo.recordState==3)) && fns:getUser().office.id eq workContractInfo.chargeCompany}">,"canalterCom":"1"</c:if>
+					<c:if test="${workContractInfo.contractState == 9 && fns:getUser().id eq workContractInfo.createBy.id && workContractInfo.completionStatus == 2 }">,"canalterComRevoke":"1"</c:if>
+					<c:if test="${workContractInfo.contractState == 9 && fns:getUser().id eq workContractInfo.createBy.id && (workContractInfo.completionStatus == 3 ||workContractInfo.completionStatus == 4)  }">,"canalterComDel":"1"</c:if>
+
+					<c:if test="${fns:getUser().id == workContractInfo.createBy.id}">
+						<c:if test="${workContractInfo.contrractRecordStatus == '2' }">,"cancancelRecord":"1"</c:if>
+						<shiro:hasPermission name="workcontractrecord:workContractRecord:edit">
+							<c:choose>
+								<c:when test="${workContractInfo.contrractRecordStatus == '1' }">,"caneditRecord1":"1"</c:when>
+								<c:when test="${workContractInfo.contrractRecordStatus == '4'}">,"caneditRecord2":"1"</c:when>
+								<c:when test="${workContractInfo.contrractRecordStatus == '3'}">,"caneditRecord3":"1"</c:when>
+							</c:choose>
+						</shiro:hasPermission>
+						<shiro:hasPermission name="workcontractrecord:workContractRecord:del">
+							<c:choose>
+								<c:when test="${(workContractInfo.contrractRecordStatus == '1' or workContractInfo.contrractRecordStatus == '3' or workContractInfo.contrractRecordStatus == '4')}">,"candeleteRecord":"1"</c:when>
+							</c:choose>
+						</shiro:hasPermission>
+					</c:if>
+					//借用状态处理
+					<c:if test="${fns:getUser().id == workContractInfo.borrowCreateById}">
+						<c:if test="${workContractInfo.borrowStatus == '2' }">,"cancancelBorrow":"1"</c:if>
+						<c:choose>
+							<c:when test="${workContractInfo.borrowStatus == '1'}">,"caneditBorrow1":"1"</c:when>
+							<c:when test="${workContractInfo.borrowStatus == '4'}">,"caneditBorrow2":"1"</c:when>
+							<c:when test="${workContractInfo.borrowStatus == '3'}">,"caneditBorrow3":"1"</c:when>
+						</c:choose>
+						<c:choose>
+							<c:when test="${(workContractInfo.borrowStatus == '1' or workContractInfo.borrowStatus == '3' or workContractInfo.borrowStatus == '4')}">,"candeleteBorrow":"1"</c:when>
+						</c:choose>
+					</c:if>
+					<c:if test="${'1' == workContractInfo.flagAdmin}">
+						<c:choose>
+							<c:when test="${workContractInfo.contractState == 5 }">,"updateAdmin":"1"</c:when>
+						</c:choose>
+					</c:if>
+					<shiro:hasPermission name="workcontractrecord:workContractRecord:revert">,"giveBorrow":	<c:choose><c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                }
+                </c:forEach>
+                </c:if>
+            ]
+            // ,even: true
+            // ,height: 315
+        });
+
+    })
+
+    resizeListTable();
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+</body>
+</html>

+ 3 - 3
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -737,7 +737,7 @@
 						}
 						if(d.borrowNotifyFlag != undefined && d.borrowNotifyFlag !=null && "" != d.borrowNotifyFlag && d.borrowNotifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同借用审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.borrowNotifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同借用审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.borrowNotifyId +"&home=contract','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
 						if(d.updateAdmin != undefined && d.updateAdmin == "1" ){
 							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
@@ -823,7 +823,7 @@
 							if(d.candeleteBorrow != undefined && d.candeleteBorrow == "1")
 								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/delete?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要删除该合同归档申请吗?', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";*/
 							if(d.giveBorrow != undefined && d.giveBorrow == "1")
-								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认归还该合同信息吗?', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-orange\"> 归还合同</a>";
+								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "&home=contract\" onclick=\"return confirmx('确认归还该合同信息吗?', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-orange\"> 归还合同</a>";
 						}
                         xml+="</div>"
                         return xml;
@@ -925,4 +925,4 @@
     });
 </script>
 </body>
-</html>
+</html>