修改合同页面信息、项目计划提醒人默认信息

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

@@ -10,7 +10,9 @@ public class ProjectPlanInfo extends DataEntity<ProjectPlanInfo> {
     private String beginDate;       //计划开始时间
     private String endDate;         //计划结束时间
     private String remindName;    //提醒人
+    private String remindId;    //提醒人Id
     private String finishName;    //完成人
+    private String finishId;    //完成人id
 
     private String loginId;
 
@@ -75,4 +77,20 @@ public class ProjectPlanInfo extends DataEntity<ProjectPlanInfo> {
     public void setLoginId(String loginId) {
         this.loginId = loginId;
     }
+
+    public String getRemindId() {
+        return remindId;
+    }
+
+    public void setRemindId(String remindId) {
+        this.remindId = remindId;
+    }
+
+    public String getFinishId() {
+        return finishId;
+    }
+
+    public void setFinishId(String finishId) {
+        this.finishId = finishId;
+    }
 }

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -55,10 +55,10 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             }
             //根据用户姓名查询用户id
             //获取提醒人信息
-            User userR = dao.getUserId(projectPlanInfo.getRemindName());
+            User userR = dao.getUserId(projectPlanInfo.getRemindId());
             projectPlanInfo.setRemindName(userR.getId());
             //获取完成人信息
-            User userF = dao.getUserId(projectPlanInfo.getFinishName());
+            User userF = dao.getUserId(projectPlanInfo.getFinishId());
             projectPlanInfo.setFinishName(userF.getId());
             //根据项目类型查询typeId
             /*String projectTypeId = dao.getProjectTypeName(projectPlanInfo.getProjectStage(),projectRecords.getProjectTypeId());

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanController.java

@@ -120,7 +120,8 @@ public class ProjectPlanController extends BaseController {
         //获取项目信息
         //如果没有id则为新增 添加创建人信息和当前创建时间信息
         if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
-            projectRecords = ruralProjectRecordsService.get(projectRecords.getId());
+            //projectRecords = ruralProjectRecordsService.get(projectRecords.getId());
+            projectRecords = ruralProjectRecordsService.getMasters(projectRecords.getId());
         }else {
             projectRecords.setCreateBy(UserUtils.getUser());
             projectRecords.setCreateDate(new Date());
@@ -138,6 +139,11 @@ public class ProjectPlanController extends BaseController {
                 for (MainDictDetail mainDict : mainDictList) {
                     ProjectPlanInfo projectPlan = new ProjectPlanInfo();
                     projectPlan.setProjectStage(mainDict.getLabel());
+                    //将项目负责人添加到展示栏
+                    if(null != projectRecords.getProjectLeaders()) {
+                        projectPlan.setRemindName(projectRecords.getProjectLeaders().get(0).getName());
+                        projectPlan.setRemindId(projectRecords.getProjectLeaders().get(0).getId());
+                    }
                     projectPlanList.add(projectPlan);
                 }
             }

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -417,6 +417,9 @@ public class WorkContractInfoController extends BaseController {
      */
     @RequestMapping(value = "adminForm")
     public String adminForm(WorkContractInfo workContractInfo, Model model) {
+        if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+            workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
+        }
         model.addAttribute("workContractInfo", workContractInfo);
         return "modules/workcontractinfo/workContractInfoAdminForm";
     }

src/main/resources/mappings/modules/projectrecord/ProjectPlanDao.xml

@@ -21,7 +21,7 @@
 	
     
 	<select id="getUserId" resultType="com.jeeplus.modules.sys.entity.User">
-		select * from sys_user where name = #{userName}
+		select * from sys_user where id = #{userName}
 	</select>
 
 	<insert id="insert">

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanForm.jsp

@@ -218,13 +218,14 @@
                                     <td class="hide">
                                         <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                                         <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
                                     </td>
 
                                     <td width="60px">
                                         <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <input id="projectPlanList{{idx}}_projectStage" readonly="true" name="projectPlanList[{{idx}}].projectStage" list ="num" value="{{row.projectStage}}" class="form-control required"/>
+                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" list ="num" value="{{row.projectStage}}" class="form-control required"/>
                                     </td>
 
                                     <td>
@@ -235,12 +236,11 @@
                                     </td>
 
                                     <td>
-                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"
-                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        <input id="projectPlanList{{idx}}_remindName" readonly="true" name="projectPlanList[{{idx}}].remindName" list ="num" value="{{row.remindName}}" class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="finishName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"
+                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>合同管理管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<style>
 		label.error{
 			left:0;
@@ -15,8 +17,12 @@
         var count = 0;
         function doSubmit(obj){
             $("#contractPrice").val($("#contractPrice").val().replace(/\,/g, ""));
-            $("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
+            //$("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
             // 回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if($("#contractTypeDoc").val() == ""){
+				parent.layer.msg("请选择合同类型!", {icon: 5});
+				return false;
+			}
             if(validateForm.form()){
 				$("#inputForm").attr("action","${ctx}/workcontractinfo/workContractInfo/adminUpdate");
                 $("#inputForm").submit();
@@ -27,6 +33,14 @@
             return false;
         }
         $(document).ready(function() {
+			var chargeCriterionH = $("#chargeCriterionH").val();
+			if(chargeCriterionH.indexOf("4")!=-1){
+				document.getElementById("otherDetails").readOnly=false
+			}else{
+				document.getElementById("otherDetails").readOnly=true
+				$("#otherDetails").val("");
+			}
+
             if($("#createDate").val()==null || $("#createDate").val()==''){
                 $("#createDate").val(getNowFormatDate());
             }
@@ -143,10 +157,10 @@
 
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
-            if(id.val() == clientId){
+            /*if(id.val() == clientId){
 				top.layer.msg("委托方不允许删除",{icon:2});
                 return;
-            }
+            }*/
             if (id.val() == "") {
                 $(obj).parent().parent().remove();
             } else if (delFlag.val() == "0") {
@@ -410,7 +424,7 @@
                     //自动计算出结果并填充在相应的输入框中
                     var size = $("#workClientInfoList tr").length+count;
                     if(size == 0){
-                        addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
+						/*addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
                         console.log("---------"+data.companyType+"---------"+data.companyIndustry+"---------"+data.areaName);
                         console.log("---------"+workClientInfoListRowIdx+"---------"+workClientInfoListTpl);
                         var row = workClientInfoListRowIdx - 1 ;
@@ -418,7 +432,7 @@
                         $("#"+"workClientInfoList"+row+"_name").val(d.name);
                         $("#"+"workClientInfoList"+row+"_companyType").val(d.companyType);
                         $("#"+"workClientInfoList"+row+"_companyIndustry").val(d.companyIndustry);
-                        $("#"+"workClientInfoList"+row+"_area").val(d.areaName);
+                        $("#"+"workClientInfoList"+row+"_area").val(d.areaName);*/
                     }else {
                         var num = 'alone';
                         for (var i = 0; i < size; i++) {
@@ -545,8 +559,9 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/save" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
+			<input type="hidden" id="chargeCriterionH" value="${workContractInfo.chargeCriterion}">
 			<%--创建人--%>
 			<form:hidden path="createBy.name" htmlEscape="false"  readonly="true" value="${fns:getUser().name}" class="form-control "/>
 			<div class="tabs-container">
@@ -560,7 +575,7 @@
 					<div id="tab-11" class="tab-pane active">
 						<div class="form-group layui-row first lw9">
 							<div class="form-group-label"><h2>合同基础信息</h2></div>
-							<div class="layui-item layui-col-sm6">
+							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同来源：</label>
 								<div class="layui-input-block">
 									<input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
@@ -568,32 +583,15 @@
 									<input type="radio" class="i-checks" name="ext" id="ext1" value="1">
 									<label for="ext1">非投标项目</label>
 								</div>
-							</div>
+							</div>--%>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同编号：</label>
-								<div class="layui-input-block">
-									<div class="input-group">
-										<form:input path="contractNum" id="contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-										<span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-									</div>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6" id="tr1">
-								<label class="layui-form-label"><span class="require-item">*</span>投标项目：</label>
-								<div class="layui-input-block with-icon">
-									<input type="hidden" value="" id ="ids">
-									<sys:gridselectcallprojectt url="${ctx}/workinvoice/workInvoice/selectprojectt" id="project" name="project.id"  value="${workContractInfo.project.id}"  title="选择投标项目" labelName="workContractInfo.project.projectName"
-																labelValue="${workContractInfo.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
+								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
+								<div class="layui-input-block with-icon" style="margin-right:95px;">
+									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
+														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6" id="tr2">
-								<label class="layui-form-label">投标编号：</label>
-								<div class="layui-input-block">
-									<form:input id ="pNumber" path="project.projectNumber" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-								</div>
+								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
@@ -602,116 +600,54 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">总合同名称：</label>
-								<div class="layui-input-block with-icon" style="margin-right:95px;">
-									<c:choose>
-										<c:when test="${workContractInfo.contractState == 4}">
-											<form:input path="totalContractName" htmlEscape="false" readonly="true"   class="form-control  layui-input"/>
-										</c:when>
-										<c:otherwise>
-											<sys:gridselectContract url="${ctx}/workcontractinfo/workContractInfo/selectcontract" type="" isTotal="1" id="totalContractId" name="totalContractId"  value="${workContractInfo.totalContractId}"  title="选择合同" labelName="workContractInfo.totalContractName"
-																	labelValue="${workContractInfo.totalContractName}" cssClass="form-control layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
-										</c:otherwise>
-									</c:choose>
-								</div>
-								<a href="javascript:void(0)" onclick="deleteContract()" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="glyphicon glyphicon-share-alt"></i> 清空</a>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>所属部门：</label>
-								<div class="layui-input-block with-icon">
-									<sys:treeselect id="chargeCompany" name="chargeCompany" value="${workContractInfo.chargeCompany}" labelName="chargeCompanyName" labelValue="${workContractInfo.chargeCompanyName}"
-													title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>合 同 金 额 (元)预计金额：</label>
-								<div class="layui-input-block">
-									<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
-								<div class="layui-input-block with-icon" style="margin-right:95px;">
-									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
-
+									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 								</div>
-								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同生效日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
+									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同终止日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>工程投资额(万元)：</label>
-								<div class="layui-input-block">
-									<form:input path="investmentAmount" htmlEscape="false" pattern="#.00"  class="form-control number required layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">对方合同编号：</label>
-								<div class="layui-input-block">
-									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
+									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 ">
-								<label class="layui-form-label"><span class="require-item">*</span>工程分类：</label>
+								<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
 								<div class="layui-input-block">
-									<form:select path="contractType" cssClass="form-control required simple-select">
+									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
 										<form:option value="" label=""/>
-										<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 									</form:select>
-									<style>
-										#contractType{
-											height:40px;
-											line-height: 40px;
-											-moz-box-sizing: border-box;
-											-webkit-box-sizing: border-box;
-											box-sizing: border-box;
-										}
-									</style>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 ">
-								<label class="layui-form-label">归档状态：</label>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)预计金额：</label>
 								<div class="layui-input-block">
-									<input htmlEscape="false" class="form-control layui-input" readonly="true" value="${fns:getDictLabel(workContractInfo.recordState, 'record_state','')}"/>
+									<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 ">
-								<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">对方合同编号：</label>
 								<div class="layui-input-block">
-									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
-										<form:option value="" label=""/>
-										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-									</form:select>
+									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">创建时间：</label>
+							<div class="layui-item layui-col-sm12">
+								<label class="layui-form-label">收费标准</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy-MM-dd"/>">
+									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 								</div>
 							</div>
-
-							<div class="layui-item layui-col-sm12 with-textarea">
-								<label class="layui-form-label ">付款摘要：</label>
+							<div class="layui-item layui-col-sm12">
+								<label class="layui-form-label ">其他详情：</label>
 								<div class="layui-input-block">
-									<form:textarea path="summaryPayment" id="summaryPayment" htmlEscape="false" maxlength="1000" rows="4"    class="form-control"/>
+									<form:input path="otherDetails" readonly="true" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12 with-textarea">
@@ -720,12 +656,6 @@
 									<form:textarea path="contractSpecial" htmlEscape="false" rows="4" maxlength="1000"   class="form-control "/>
 								</div>
 							</div>
-							<%--<div class="layui-item layui-col-sm12 with-textarea">
-								<label class="layui-form-label ">合同类型说明：</label>
-								<div class="layui-input-block">
-									<form:textarea path="contractTypeDoc" id="contractTypeDoc" htmlEscape="false" rows="4"  maxlength="1000"  class="form-control "/>
-								</div>
-							</div>--%>
 							<div class="layui-item layui-col-sm12 with-textarea">
 								<label class="layui-form-label ">备注：</label>
 								<div class="layui-input-block">
@@ -733,7 +663,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="form-group layui-row">
+						<%--<div class="form-group layui-row">
 							<div class="form-group-label"><h2><span class="require-item">*</span>委托方列表</h2></div>
 							<div class="layui-item nav-btns">
 								<a href="javascript:void(0)" onclick="openBill2('新增客户管理', '${ctx}/workclientinfo/workClientInfo/formType?param=1','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增客户</a>
@@ -819,7 +749,7 @@
 								</script>
 
 							</div>
-						</div>
+						</div>--%>
 						<div class="form-group layui-row">
 							<div class="form-group-label"><h2>合同附件信息</h2></div>
 							<div class="layui-item nav-btns">
@@ -887,201 +817,30 @@
 						</div>
 						<div class="form-group layui-row page-end"></div>
 					</div>
-<%--					<div id="tab-22" class="tab-pane">--%>
-<%--						<div class="form-group layui-row first lw14">--%>
-<%--							<div class="form-group-label"><h2>评审基础信息</h2></div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label"><span class="require-item">*</span>时间要求：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:input id="timeRequirements" path="workContractReview.timeRequirements" htmlEscape="false" maxlength="64"    class="form-control required layui-input"/>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label"><span class="require-item">*</span>特殊要求：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:input id="specialRequirements" path="workContractReview.specialRequirements" htmlEscape="false" maxlength="64"     class="form-control required layui-input"/>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>客户要求是否合法：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isLegitimate" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>客户诚信度的初步判断：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.credibility" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="低"/>--%>
-<%--										<form:option value="2" label="中"/>--%>
-<%--										<form:option value="0" label="高"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label"><span class="require-item">*</span>风险初步评价：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.preliminaryRiskAssessmen" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="低"/>--%>
-<%--										<form:option value="0" label="高"/>--%>
-<%--										<form:option value="2" label="中"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>被服务对象所处行业环境：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.serviceObjectIndustry" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="正常"/>--%>
-<%--										<form:option value="0" label="不正常"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>与服务有关的客户资料能否恰当获取：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isProperAcquisition" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>人员是否能专业胜任：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isUserQualified" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>是否需要借助外部专家力量：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isExternalExpertPower" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="需要"/>--%>
-<%--										<form:option value="0" label="不需要"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>设备能否满足项目要求：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isEquipmentMeetRequirements" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>时间能否满足客户需求：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isTimeMeetRequirements" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>合同是否可以签定：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isContractSignature" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm12 with-textarea">--%>
-<%--								<label class="layui-form-label">备注信息：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:textarea path="workContractReview.remarks" htmlEscape="false" rows="4"   maxlength="500" class="form-control"/>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--						</div>--%>
-<%--						<div class="form-group layui-row">--%>
-<%--                        <div class="form-group-label"><h2>合同评审附件信息</h2></div>--%>
-<%--                        <div class="layui-item nav-btns">--%>
-<%--                            <a id="attachment_review_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-<%--                        </div>--%>
-<%--                        <div id="addFile_attachment_review" style="display: none" class="upload-progress">--%>
-<%--                            <span id="fileName_attachment_review" ></span>--%>
-<%--                            <b><span id="baifenbi_attachment_review" ></span></b>--%>
-<%--                            <div class="progress">--%>
-<%--                                <div id="jindutiao_attachment_review" class="progress-bar" style="width: 0%" aria-valuenow="0">--%>
-<%--                                </div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                        <input id="attachment_review_file" type="file" multiple="multiple" name="attachment_file" style="display: none;" onChange="if(this.value)insertTitleReview(this.value);"/>--%>
-<%--                        <span id="attachment_review_title"></span>--%>
-<%--                        <div class="layui-item layui-col-xs12" style="padding:0 16px;">--%>
-<%--                            <table id="listAttachmentReview" class="table table-bordered table-condensed details">--%>
-<%--                                <thead>--%>
-<%--                                <tr>--%>
-<%--                                        &lt;%&ndash; <th>序号</th>&ndash;%&gt;--%>
-<%--                                    <th>文件预览</th>--%>
-<%--                                    <th>上传人</th>--%>
-<%--                                    <th>上传时间</th>--%>
-<%--                                    <th width="180px">操作</th>--%>
-<%--                                </tr>--%>
-<%--                                </thead>--%>
-<%--                                <tbody id="file_attachment_review">--%>
-<%--                                <c:forEach items="${workContractInfo.workContractReview.workAttachments}" var = "workClientAttachment" varStatus="status">--%>
-<%--                                    <tr>--%>
-<%--                                            &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;--%>
-<%--                                        <c:choose>--%>
-<%--                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
-<%--                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
-<%--                                            </c:when>--%>
-<%--                                            <c:otherwise>--%>
-<%--                                                <c:choose>--%>
-<%--                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
-<%--                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--                                                    </c:when>--%>
-<%--                                                    <c:otherwise>--%>
-<%--                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--                                                    </c:otherwise>--%>
-<%--                                                </c:choose>--%>
-<%--                                            </c:otherwise>--%>
-<%--                                        </c:choose>--%>
-<%--                                        <td>${workClientAttachment.createBy.name}</td>--%>
-<%--                                        <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>--%>
-<%--                                        <td class="op-td">--%>
-<%--                                            <div class="op-btn-box" >--%>
-<%--                                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-<%--                                                <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-<%--                                                    <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment_review')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-<%--                                                </c:if>--%>
-<%--                                            </div>--%>
-<%--                                        </td>--%>
-<%--                                    </tr>--%>
-<%--                                </c:forEach>--%>
-<%--                                </tbody>--%>
-<%--                            </table>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--						<div class="form-group layui-row page-end"></div>--%>
-<%--					</div>--%>
 				</div>
 			</div>
 		</form:form>
 	</div>
+	<script>
+		layui.use('form', function () {
+			var form = layui.form;
+			form.render();
+
+			//复选框监听器
+			form.on('checkbox(chargeCriterionList)', function(data){
+				var ids = [];
+				$("input[name='chargeCriterionList']:checked").each(function(i){
+					ids.push($(this).val())
+				})
+				if(ids.indexOf("4")!=-1){
+					document.getElementById("otherDetails").readOnly=false
+				}else{
+					document.getElementById("otherDetails").readOnly=true
+					$("#otherDetails").val("");
+				}
+			});
+		});
+	</script>
 </div>
 </body>
 </html>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -649,7 +649,7 @@
                         var xml="";
 
 						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=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改合同</a>";
 						}
                         if(d.status != 5){
 							/*if(d.signature != undefined && d.signature =="1")
@@ -667,19 +667,19 @@
                         }*/
 							if(d.canedit != undefined && d.canedit =="1")
 							{
-								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改合同</a>";
 							}
 							if(d.canedits != undefined && d.canedits =="1")
 							{
-								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "','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}/workcontractinfo/workContractInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该合同信息吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 作废</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该合同信息吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 合同作废</a>";
 							}
 							if(d.cancancel != undefined && d.cancancel =="1")
 							{
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revoke?id="+ d.id +"&processInstanceId="+ d.processInstanceId +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revoke?id="+ d.id +"&processInstanceId="+ d.processInstanceId +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回合同</a>";
 							}
 
 							/*if(d.canalterCom != undefined && d.canalterCom =="1")
@@ -690,12 +690,12 @@
 							}*/
 							if(d.canalterComRevoke != undefined && d.canalterComRevoke =="1")
 							{
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回合同</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=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" 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.back != undefined && d.back =="1")
@@ -704,13 +704,13 @@
 							}
 
 							if(d.cancancelRecord != undefined && d.cancancelRecord == "1")
-								xml += "<a href=\"${ctx}/workcontractrecord/workContractRecord/cancelInvalidate?id=" + d.contrractRecordId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+								xml += "<a href=\"${ctx}/workcontractrecord/workContractRecord/cancelInvalidate?id=" + d.contrractRecordId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回归档</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=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</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=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</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=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请归档', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</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>";*/
 						}
@@ -722,7 +722,7 @@
 							}
 
 							if(d.cancancelBorrow != undefined && d.cancancelBorrow == "1")
-								xml += "<a href=\"${ctx}/workContractBorrow/workContractBorrow/cancelInvalidate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+								xml += "<a href=\"${ctx}/workContractBorrow/workContractBorrow/cancelInvalidate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回借用</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")
@@ -732,7 +732,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=\"btn btn-info btn-xs\"><i class=\"fa fa-edit\"></i> 归还</a>";
+								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认归还该合同信息吗？', this.href)\"   class=\"btn btn-info btn-xs\"><i class=\"fa fa-edit\"></i> 归还合同</a>";
 						}
                         return xml;
 

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -229,13 +229,13 @@
 						</c:if>--%>
 					</div>
 
-					<div class="form-group layui-row">
+					<%--<div class="form-group layui-row">
 						<div class="form-group-label"><h2>委托方列表</h2></div>
 						<div class="layui-item layui-col-xs12 form-table-container" >
 							<table id="contentTable4" class="table table-bordered table-condensed no-bottom-margin details">
 								<thead>
 								<tr>
-									<%--<th width="10%">序号</th>--%>
+									&lt;%&ndash;<th width="10%">序号</th>&ndash;%&gt;
 									<th width="30%">委托方名称</th>
 									<th width="20%">客户性质</th>
 									<th width="20%">所属行业</th>
@@ -247,32 +247,32 @@
 									<c:forEach items="${workContractInfo.workClientInfoList}" var="casePeopleNorm" varStatus="index">
 										<tr id="workClientInfoList${index.index}">
 											<td class="hide">
-													<%--<input id="workClientInfoList${index.index}_id" name="workClientInfoList[${index.index}].id" type="hidden" value="${casePeopleNorm.id}"/>--%>
+													&lt;%&ndash;<input id="workClientInfoList${index.index}_id" name="workClientInfoList[${index.index}].id" type="hidden" value="${casePeopleNorm.id}"/>&ndash;%&gt;
 											</td>
-											<%--<td>--%>
-													<%--${index.index + 1}--%>
-											<%--</td>--%>
-												<%--${fns:getDictLabel(workAccount.financialSubjectss, 'not_project_reimbursement', '')}--%>
+											&lt;%&ndash;<td>&ndash;%&gt;
+													&lt;%&ndash;${index.index + 1}&ndash;%&gt;
+											&lt;%&ndash;</td>&ndash;%&gt;
+												&lt;%&ndash;${fns:getDictLabel(workAccount.financialSubjectss, 'not_project_reimbursement', '')}&ndash;%&gt;
 											<td>
-													<%--<input id="workClientInfoList${index.index}_name" name="workClientInfoList[${index.index}].name" type="text" value="${casePeopleNorm.name}" readonly="true"   class="form-control "/>--%>
+													&lt;%&ndash;<input id="workClientInfoList${index.index}_name" name="workClientInfoList[${index.index}].name" type="text" value="${casePeopleNorm.name}" readonly="true"   class="form-control "/>&ndash;%&gt;
 													${casePeopleNorm.name}
 											</td>
 											<td>
-													<%--<form:select id="workClientInfoList${index.index}_companyType" path="workClientInfoList[${index.index}].companyType" disabled="true" readonly="true" class="form-control">
+													&lt;%&ndash;<form:select id="workClientInfoList${index.index}_companyType" path="workClientInfoList[${index.index}].companyType" disabled="true" readonly="true" class="form-control">
                                                         <form:option value="" label=""/>
                                                         <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                    </form:select>--%>
+                                                    </form:select>&ndash;%&gt;
 													${fns:getMainDictLabel(casePeopleNorm.companyType, 'company_type', '')}
 											</td>
 											<td>
-													<%--<form:select id="workClientInfoList${index.index}_companyIndustry" path="workClientInfoList[${index.index}].companyIndustry" disabled="true" readonly="true" class="form-control">
+													&lt;%&ndash;<form:select id="workClientInfoList${index.index}_companyIndustry" path="workClientInfoList[${index.index}].companyIndustry" disabled="true" readonly="true" class="form-control">
                                                         <form:option value="" label=""/>
                                                         <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                    </form:select>--%>
+                                                    </form:select>&ndash;%&gt;
 													${fns:getMainDictLabel(casePeopleNorm.companyIndustry, 'company_industry', '')}
 											</td>
 											<td>
-													<%--<input id="workClientInfoList${index.index}_area" name="workClientInfoList[${index.index}].area.name" type="text" value="${casePeopleNorm.area.name}"  readonly="true"  class="form-control "/>--%>
+													&lt;%&ndash;<input id="workClientInfoList${index.index}_area" name="workClientInfoList[${index.index}].area.name" type="text" value="${casePeopleNorm.area.name}"  readonly="true"  class="form-control "/>&ndash;%&gt;
 													${casePeopleNorm.area.name}
 											</td>
 										</tr>
@@ -281,7 +281,7 @@
 								</tbody>
 							</table>
 						</div>
-					</div>
+					</div>--%>
 					<%--<c:if test="${workContractInfo.contractState eq '5'}">
 						<div class="form-group layui-row">
 							<div class="form-group-label"><h2>收款明细</h2></div>