user5 4 лет назад
Родитель
Сommit
c002f0b83b

+ 17 - 16
src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -3,10 +3,7 @@
  */
 package com.jeeplus.modules.workcontractrecord.service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.google.common.collect.Maps;
 import com.jeeplus.common.config.Global;
@@ -19,6 +16,7 @@ import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -94,19 +92,22 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 	@SuppressWarnings("unchecked")
 	public WorkContractRecord get(String id) {
 		WorkContractRecord workContractRecord = super.get(id);
+		if(null != workContractRecord && null != workContractRecord.getWorkContractInfo() && StringUtils.isNotBlank(workContractRecord.getWorkContractInfo().getId())){
+			WorkContractInfo workContractInfo = workContractInfoService.get(workContractRecord.getWorkContractInfo().getId());
+			if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+				workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
+			}
+			workContractRecord.setWorkContractInfo(workContractInfo);
+
+			workContractRecord.setWorkAttachments(workContractInfo.getWorkAttachments());
+		}
 		//附件
-		if(workContractRecord!=null){
+		/*if(workContractRecord!=null){
 			WorkClientAttachment workClientAttachment = new WorkClientAttachment();
 			workClientAttachment.setAttachmentId(id);
 			workClientAttachment.setAttachmentFlag("85");
 			workContractRecord.setWorkAttachments(workattachmentService.getAttachmentList(workClientAttachment));
-			if(workContractRecord!=null&&workContractRecord.getWorkContractInfo()!=null&& StringUtils.isNotBlank(workContractRecord.getWorkContractInfo().getId())){
-				WorkContractInfo w = workConttractInfoService.get(workContractRecord.getWorkContractInfo().getId());
-				if(w!=null){
-					workContractRecord.setWorkContractInfo(w);
-				}
-			}
-		}
+		}*/
 		//添加当前文件服务器类型
 		if(workContractRecord!=null){
 			workContractRecord.setUploadMode(uploadMode);
@@ -115,11 +116,11 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 		}
 		return workContractRecord;
 	}
-	
+
 	public List<WorkContractRecord> findList(WorkContractRecord workContractRecord) {
 		return super.findList(workContractRecord);
 	}
-	
+
 	public Page<WorkContractRecord> findPage(Page<WorkContractRecord> page, WorkContractRecord workContractRecord) {
 //		workContractRecord.getSqlMap().put("dsf", dataScopeFilter(workContractRecord.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACTRECORD.getValue()));
 		String companyId = UserUtils.getUser().getComId();
@@ -128,7 +129,7 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 		page.setList(findList(workContractRecord));
 		return page;
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void save(WorkContractRecord workContractRecord) {
 		super.save(workContractRecord);
@@ -741,4 +742,4 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 		}
 		return s;
 	}
-}
+}

+ 19 - 7
src/main/java/com/jeeplus/modules/workcontractrecord/web/WorkContractRecordController.java

@@ -5,10 +5,7 @@ package com.jeeplus.modules.workcontractrecord.web;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -23,6 +20,7 @@ import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
@@ -197,9 +195,14 @@ public class WorkContractRecordController extends BaseController {
 		//归档中状态
 		if(workContractRecord.getWorkContractInfo()!=null){
 			if(StringUtils.isNotBlank(workContractRecord.getWorkContractInfo().getId())){
-				WorkContractInfo workContractInfo = workContractInfoService.get(workContractRecord.getWorkContractInfo().getId());
-				workContractInfo.setRecordState("2");
-				workContractInfoService.save(workContractInfo);
+				WorkContractInfo t = workContractInfoService.get(workContractRecord.getWorkContractInfo().getId());
+				//将编辑表单中的非NULL值覆盖数据库记录中的值
+				MyBeanUtils.copyBeanNotNull2Bean(workContractRecord.getWorkContractInfo(), t);
+				t.setRecordState("2");
+				t.setWorkAttachments(workContractRecord.getWorkAttachments());
+				workContractRecord.setWorkAttachments(new ArrayList<WorkClientAttachment>());
+				workContractInfoService.save(t);
+				workContractInfoService.updateWorkContractInfo(workContractRecord.getWorkContractInfo());
 			}
 		}
 		User user = workContractRecord.getCreateBy();
@@ -253,6 +256,15 @@ public class WorkContractRecordController extends BaseController {
 			if ("yes".equals(flag) && (users==null || users.size()==0)){
 				addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员!");
 			}else {
+				WorkContractInfo t = workContractInfoService.get(workContractRecord.getWorkContractInfo().getId());
+				//将编辑表单中的非NULL值覆盖数据库记录中的值
+				MyBeanUtils.copyBeanNotNull2Bean(workContractRecord.getWorkContractInfo(), t);
+				t.setRecordState("2");
+				t.setWorkAttachments(workContractRecord.getWorkAttachments());
+				workContractRecord.setWorkAttachments(new ArrayList<WorkClientAttachment>());
+				workContractInfoService.save(t);
+				workContractInfoService.updateWorkContractInfo(workContractRecord.getWorkContractInfo());
+
 				String str = workContractRecordService.auditSave(workContractRecord,users);
 				addMessage(redirectAttributes, str);
 			}

+ 85 - 14
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -62,17 +62,28 @@
             $("#attachment_btn").click(function () {
                 $("#attachment_file").click();
             });
+			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
 		});
         function insertTitle(tValue){
             var list = "${workContractRecord.workAttachments}";
             var size = (list.split('url')).length-1;
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = "";
-            var attachmentFlag = "85";
+            var attachmentFlag = "44";
             console.log(file);
             var timestamp=new Date().getTime();
 
-				var storeAs = "workContractRd";
+				var storeAs = "workContractInfo";
             var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
             var divId = "_attachment";
             $("#addFile"+divId).show();
@@ -126,23 +137,83 @@
 						<input htmlEscape="false"   readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.name}"/>
 					</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 "><span class="require-item">*</span>签订日期:</label>
 					<div class="layui-input-block">
-						<div class="input-group">
-							<input  htmlEscape="false"   readonly="true" class="form-control layui-input" value="${workContractRecord.recordNum}"/>
-							<span class="input-group-btn">
-								<label class="form-status"><c:choose><c:when test="${ empty workContractRecord.status}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractRecord.status, 'audit_state','')}</c:otherwise>	</c:choose></label>
-							</span>
-						</div>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
 					</div>
-				</div>--%>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label ">合同生效日期:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractRecord.workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label ">合同终止日期:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label ">合同类型:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+					</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">
+						<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
+						<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label double-line">合同金额(元)预计金额:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractRecord.workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label ">对方合同编号:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.anotherContractNum}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">收费标准</label>
+					<div class="layui-input-block">
+						<form:checkboxes  path="workContractInfo.chargeCriterionList" id="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label "></label>
+					<div class="layui-input-block">
+						<form:input style="background-color: #f1f1f1" path="workContractInfo.otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label">合同特别条款:</label>
+					<div class="layui-input-block">
+						<textarea style="background-color: #f1f1f1" htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractRecord.workContractInfo.contractSpecial}</textarea>
+					</div>
+				</div>
+
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label">备注:</label>
+					<div class="layui-input-block">
+						<textarea style="background-color: #f1f1f1" htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractRecord.workContractInfo.remarks}</textarea>
+					</div>
+				</div>
+
+
+
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同编号:</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.contractNum}"/>
 					</div>
-				</div>
+				</div>--%>
 				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">工程分类:</label>
 					<div class="layui-input-block">
@@ -181,7 +252,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息</h2></div>
+				<div class="form-group-label"><h2>合同附件表</h2></div>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
@@ -342,4 +413,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

+ 209 - 36
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -4,10 +4,20 @@
 <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"/>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
             if(validateForm.form()){
+				$("#contractPrice").val($("#contractPrice").val().replace(/\,/g, ""));
+				//$("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
+				// 回调函数,在编辑和保存动作时,供openDialog调用提交表单。
+				if($("#contractTypeDoc").val() == ""){
+					parent.layer.msg("请选择合同类型!", {icon: 5});
+					return false;
+				}
               /*  if(obj == 2){
                     $("#inputForm").attr("action","${ctx}/workcontractrecord/workContractRecord/store");
                 }else{*/
@@ -46,17 +56,100 @@
             //     type : 'date'
 			//, trigger: 'click'
             // });
+			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+			/*var chargeCriterionH = $("#chargeCriterionH").val();
+			if(chargeCriterionH.indexOf("4")!=-1){
+			}else{
+				$("#otherDetails").val("");
+			}*/
+			/*if($("#createDate").val()==null || $("#createDate").val()==''){
+				$("#createDate").val(getNowFormatDate());
+			}*/
+			$("input[name='ext']").on('ifChecked', function(event){
+				var radioVal = $(this).val();
+				if(radioVal == 0){
+					$("#td1").removeClass("hide");
+					$("#td2").addClass("hide");
+					$("#tr1").show()
+					$("#tr2").show()
+				}else{
+					$("#td1").addClass("hide");
+					$("#td2").removeClass("hide");
+					$("#tr1").hide()
+					$("#tr2").hide()
+				}
+			});
+			if("${workContractInfo.ext}" == "1"){
+				$("#ext1").iCheck('check')
+			}else{
+				$("#ext").iCheck('check')
+			}
+			$("#contractFee").change(function(){
+				//状态为其他的时候  添加required样式
+				if($(this).val() == "4"){
+					$("#contractFeeDoc").attr("class","form-control judgment");
+				}else{
+					$("#contractFeeDoc").attr("class","form-control");
+				}
+			});
+			$("#contractType").attr("class","form-control judgment");
+			/* $("#contractType").change(function(){
+                 //状态为其他的时候  添加required样式
+                 if($(this).val() == "5"){
+                     $("#contractTypeDoc").attr("class","form-control judgment");
+                 }else{
+                     $("#contractTypeDoc").attr("class","form-control");
+                 }
+             })*/
+			$("#attachment_review_btn").click(function () {
+				$("#attachment_review_file").click();
+			});
+
+			laydate.render({
+				elem: '#contractDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#effectiveDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#closingDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#createDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
         });
         function insertTitle(tValue){
             var list = "${workContractRecord.workAttachments}";
             var size = (list.split('url')).length-1;
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = "";
-            var attachmentFlag = "85";
+            var attachmentFlag = "44";
             console.log(file);
             var timestamp=new Date().getTime();
 
-				var storeAs = "workContractRd";
+				var storeAs = "workContractInfo";
             var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
             var divId = "_attachment";
             $("#addFile"+divId).show();
@@ -84,69 +177,115 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/save" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="workContractInfo.id"/>
+			<input type="hidden" id="ext" name="ext" value="1">
+			<input type="hidden" id="chargeCriterionH" value="${workContractRecord.workContractInfo.chargeCriterion}">
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">客户名称:</label>
+					<label class="layui-form-label"><span class="require-item">*</span>客户名称:</label>
+					<div class="layui-input-block with-icon">
+						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
+											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
+
+					</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="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control judgment layui-input"/>
 					</div>
 				</div>
+
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同名称:</label>
+					<label class="layui-form-label"><span class="require-item">*</span>签订日期:</label>
 					<div class="layui-input-block">
-						<form:input id="workContractInfoName" path="workContractInfo.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon judgment" readonly="readonly" id="contractDate" name="workContractInfo.contractDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 					</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">合同生效日期:</label>
 					<div class="layui-input-block">
-						<div class="input-group">
-							<form:input id="recordNum" path="recordNum" htmlEscape="false"   readonly="true" class="form-control layui-input"/>
-							<span class="input-group-btn">
-								<label class="form-status"><c:choose><c:when test="${ empty workContractRecord.status}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractRecord.status, 'audit_state','')}</c:otherwise>	</c:choose></label>
-							</span>
-						</div>
+						<input placeholder="请选择合同生效日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="effectiveDate" name="workContractInfo.effectiveDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
 					</div>
-				</div>--%>
+				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同编号:</label>
+					<label class="layui-form-label">合同终止日期:</label>
 					<div class="layui-input-block">
-						<form:input id="contractNum" path="workContractInfo.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="workContractInfo.closingDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 					</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"><span class="require-item">*</span>合同类型:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type', '')}"/>
-						&lt;%&ndash;<form:select id="contractType" path="workContractInfo.contractType" disabled="true" class="form-control simple-select required">
+						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control judgment simple-select">
 							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>&ndash;%&gt;
+							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</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">
+						<input type="radio" title="金额合同" lay-filter="jine" name="workContractInfo.contractInformation" checked id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
+						<input type="radio" title="框架合同" lay-filter="jine" name="workContractInfo.contractInformation" id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
 					</div>
-				</div>--%>
+				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档人:</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额:</label>
 					<div class="layui-input-block">
-						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档申请日期:</label>
+					<label class="layui-form-label">对方合同编号:</label>
 					<div class="layui-input-block">
-						<input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
-						<%--<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy-MM-dd"/>">--%>
+						<form:input path="workContractInfo.anotherContractNum" placeholder="请输入对方合同编号" 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" id="chargeCriterionList" >
+					<label class="layui-form-label">收费标准:</label>
 					<div class="layui-input-block">
-						<form:input path="fileNum" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
+						<form:checkboxes path="workContractInfo.chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
 					</div>
-				</div>--%>
+				</div>
+
+
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label "><!--其他详情:--></label>
+					<div class="layui-input-block">
+						<form:input placeholder="请选择收费标准" path="workContractInfo.otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label ">合同特别条款:</label>
+					<div class="layui-input-block">
+						<form:textarea placeholder="请输入合同特别条款" path="workContractInfo.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="workContractInfo.remarks" placeholder="请输入备注" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+					</div>
+				</div>
+
+
+
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同编号:</label>
+					<div class="layui-input-block">
+						<form:input id="contractNum" path="workContractInfo.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">归档人:</label>
+					<div class="layui-input-block">
+						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明:</label>
 					<div class="layui-input-block">
@@ -155,7 +294,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息</h2></div>
+				<div class="form-group-label"><h2>合同附件表</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>
@@ -249,5 +388,39 @@
 		</form:form>
 	</div>
 </div>
+<script>
+	layui.use('form', function () {
+		var form = layui.form;
+		form.render();
+		var zhi=$("#otherDetails").val();
+		//复选框监听器
+		form.on('checkbox(chargeCriterionList)', function(data){
+			var ids = [];
+
+			$("input[name='chargeCriterionList']:checked").each(function(i){
+				ids.push($(this).val());
+			})
+			if ($(this).prop("checked")==true){
+				zhi+=$(this).val()+";"
+			}
+			$("#otherDetails").val(zhi);
+		});
+		layui.form.on('radio(jine)', function(data){
+			var span=data.value;
+			if(span==1){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+		})
+	});
+</script>
 </body>
-</html>
+</html>

+ 173 - 63
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -4,6 +4,9 @@
 <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"/>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
@@ -11,6 +14,13 @@
               if(obj == 2){
                   $("#flag").val("no");
               }else{
+				  $("#contractPrice").val($("#contractPrice").val().replace(/\,/g, ""));
+				  //$("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
+				  // 回调函数,在编辑和保存动作时,供openDialog调用提交表单。
+				  if($("#contractTypeDoc").val() == ""){
+					  parent.layer.msg("请选择合同类型!", {icon: 5});
+					  return false;
+				  }
                   $("#flag").val("yes");
               }
 			  $("#inputForm").submit();
@@ -36,55 +46,76 @@
 					}
 				}
 			});
-            $("#attachment_btn").click(function () {
-                $("#attachment_file").click();
-            });
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
+			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+			$("#contractFee").change(function(){
+				//状态为其他的时候  添加required样式
+				if($(this).val() == "4"){
+					$("#contractFeeDoc").attr("class","form-control judgment");
+				}else{
+					$("#contractFeeDoc").attr("class","form-control");
+				}
+			});
+			$("#contractType").attr("class","form-control judgment");
 
-            // laydate.render({
-            //     elem: '#createDate',
-            //     event: 'focus',
-            //     type : 'date'
-			//, trigger: 'click'
-            // });
+			laydate.render({
+				elem: '#contractDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#effectiveDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#closingDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#createDate',
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click'
+			});
 		});
         function insertTitle(tValue){
             var list = "${workContractRecord.workAttachments}";
             var size = (list.split('url')).length-1;
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = "";
-            var attachmentFlag = "85";
+            var attachmentFlag = "44";
             console.log(file);
             var timestamp=new Date().getTime();
 
-				var storeAs = "workContractRd";
+				var storeAs = "workContractInfo";
             var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
             var divId = "_attachment";
             $("#addFile"+divId).show();
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
         }
-
-        function setValue(obj){
-            $.ajax({
-                type:'post',
-                url:'${ctx}/workcontractrecord/workContractRecord/getPNumberr',
-                data:{
-                    "obj":obj
-                },
-                success:function(data){
-                    var d = JSON.parse(data);
-                    $("#recordNum").val(d.recordNum);
-                    $("#contractNum").val(d.contractNum);
-                    $("#cName").val(d.cName);
-                    $("#contractType").val(d.contractType);
-                }
-            })
-        }
 	</script>
 </head>
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/saveAudit" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="workContractInfo.id"/>
 			<form:hidden path="home"/>
@@ -94,75 +125,120 @@
 			<form:hidden path="act.procInsId"/>
 			<form:hidden path="act.procDefId"/>
 			<form:hidden id="flag" path="act.flag"/>
+			<input type="hidden" id="ext" name="ext" value="1">
+			<input type="hidden" id="chargeCriterionH" value="${workContractRecord.workContractInfo.chargeCriterion}">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">客户名称:</label>
+					<label class="layui-form-label"><span class="require-item">*</span>客户名称:</label>
+					<div class="layui-input-block with-icon">
+						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
+											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
+
+					</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="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control judgment layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同名称:</label>
+					<label class="layui-form-label"><span class="require-item">*</span>签订日期:</label>
 					<div class="layui-input-block">
-						<form:input id="workContractInfoName" path="workContractInfo.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon judgment" readonly="readonly" id="contractDate" name="workContractInfo.contractDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 					</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">合同生效日期:</label>
 					<div class="layui-input-block">
-						<div class="input-group">
-							<form:input id="recordNum" path="recordNum" htmlEscape="false"   readonly="true" class="form-control layui-input"/>
-							<span class="input-group-btn">
-								<label class="form-status"><c:choose><c:when test="${ empty workContractRecord.status}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractRecord.status, 'audit_state','')}</c:otherwise>	</c:choose></label>
-							</span>
-						</div>
+						<input placeholder="请选择合同生效日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="effectiveDate" name="workContractInfo.effectiveDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
 					</div>
-				</div>--%>
+				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同编号:</label>
+					<label class="layui-form-label">合同终止日期:</label>
 					<div class="layui-input-block">
-						<form:input id="contractNum" path="workContractInfo.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="workContractInfo.closingDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 					</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"><span class="require-item">*</span>合同类型:</label>
 					<div class="layui-input-block">
-						&lt;%&ndash;<form:select id="contractType" path="workContractInfo.contractType" disabled="true" class="form-control simple-select required">
+						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control judgment simple-select">
 							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>&ndash;%&gt;
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type', '')}"/>
+							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
 					</div>
-				</div>--%>
+				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档人:</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别:</label>
 					<div class="layui-input-block">
-						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<input type="radio" title="金额合同" lay-filter="jine" name="workContractInfo.contractInformation" checked id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
+						<input type="radio" title="框架合同" lay-filter="jine" name="workContractInfo.contractInformation" id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档日期:</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额:</label>
 					<div class="layui-input-block">
-						<input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
-						<%--<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy-MM-dd"/>">--%>
+						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
 					</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">对方合同编号:</label>
+					<div class="layui-input-block">
+						<form:input path="workContractInfo.anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12" id="chargeCriterionList" >
+					<label class="layui-form-label">收费标准:</label>
 					<div class="layui-input-block">
-						<form:input path="fileNum" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
+						<form:checkboxes path="workContractInfo.chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
 					</div>
-				</div>--%>
+				</div>
+
+
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label "><!--其他详情:--></label>
+					<div class="layui-input-block">
+						<form:input placeholder="请选择收费标准" path="workContractInfo.otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label ">合同特别条款:</label>
+					<div class="layui-input-block">
+						<form:textarea placeholder="请输入合同特别条款" path="workContractInfo.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="workContractInfo.remarks" placeholder="请输入备注" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+					</div>
+				</div>
+
+
+
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同编号:</label>
+					<div class="layui-input-block">
+						<form:input id="contractNum" path="workContractInfo.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">归档人:</label>
+					<div class="layui-input-block">
+						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明:</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入说明:" path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
 					</div>
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>附件信息</h2></div>
+				<div class="form-group-label"><h2>合同附件表</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>
@@ -284,5 +360,39 @@
 		</form:form>
 	</div>
 </div>
+<script>
+	layui.use('form', function () {
+		var form = layui.form;
+		form.render();
+		var zhi=$("#otherDetails").val();
+		//复选框监听器
+		form.on('checkbox(chargeCriterionList)', function(data){
+			var ids = [];
+
+			$("input[name='chargeCriterionList']:checked").each(function(i){
+				ids.push($(this).val());
+			})
+			if ($(this).prop("checked")==true){
+				zhi+=$(this).val()+";"
+			}
+			$("#otherDetails").val(zhi);
+		});
+		layui.form.on('radio(jine)', function(data){
+			var span=data.value;
+			if(span==1){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+		})
+	});
+</script>
 </body>
-</html>
+</html>

+ 131 - 23
src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -4,6 +4,9 @@
 <head>
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
+	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
@@ -36,7 +39,18 @@
 					}
 				}
 			});
-			
+
+			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
 		});
         function insertTitle(tValue){
             var list = "${workContractRecord.workAttachments}";
@@ -76,7 +90,7 @@
 <body>
 <div class="single-form view-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 
 			<div class="form-group layui-row first lw8">
@@ -84,48 +98,108 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称:</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称:</label>
 					<div class="layui-input-block with-icon">
-						<input htmlEscape="false"   style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.name}"/>
+						<input htmlEscape="false"   readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${workContractRecord.workContractInfo.name}"/>
+					</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 htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" 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 htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractRecord.workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label ">合同终止日期:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label ">合同类型:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+					</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">
+						<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
+						<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
 					</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">合同金额(元)预计金额:</label>
 					<div class="layui-input-block">
-						<div class="input-group">
-							<input  htmlEscape="false"   readonly="true" class="form-control layui-input" value="${workContractRecord.recordNum}"/>
-							<span class="input-group-btn">
-								<label class="form-status"><c:choose><c:when test="${ empty workContractRecord.status}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractRecord.status, 'audit_state','')}</c:otherwise>	</c:choose></label>
-							</span>
-						</div>
+						<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractRecord.workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
 					</div>
-				</div>--%>
+				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同编号:</label>
+					<label class="layui-form-label ">对方合同编号:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.anotherContractNum}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">收费标准</label>
+					<div class="layui-input-block">
+						<form:checkboxes  path="workContractInfo.chargeCriterionList" id="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label "></label>
+					<div class="layui-input-block">
+						<form:input style="background-color: #f1f1f1" path="workContractInfo.otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label">合同特别条款:</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.contractNum}"/>
+						<textarea style="background-color: #f1f1f1" htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractRecord.workContractInfo.contractSpecial}</textarea>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">工程分类:</label>
+
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label">备注:</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type','')}"/>
+						<textarea style="background-color: #f1f1f1" htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractRecord.workContractInfo.remarks}</textarea>
 					</div>
-				</div>--%>
+				</div>
+
+
+
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">合同编号:</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.contractNum}"/>
+                        </div>
+                    </div>--%>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">工程分类:</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type','')}"/>
+                        </div>
+                    </div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档人:</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.createBy.name}"/>
+						<input  htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control  layui-input" value="${workContractRecord.createBy.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档日期:</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+						<input  htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control  layui-input" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -143,7 +217,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明:</label>
 					<div class="layui-input-block">
-						<textarea  htmlEscape="false"  style="background-color: #f1f1f1" rows="4" readonly="true"    class="form-control ">${workContractRecord.instruction}</textarea>
+						<textarea placeholder="请输入说明" htmlEscape="false" rows="4" readonly="true"    class="form-control ">${workContractRecord.instruction}</textarea>
 					</div>
 				</div>
 			</div>
@@ -224,5 +298,39 @@
 		</form:form>
 	</div>
 </div>
+<script>
+	layui.use('form', function () {
+		var form = layui.form;
+		form.render();
+		var zhi=$("#otherDetails").val();
+		//复选框监听器
+		form.on('checkbox(chargeCriterionList)', function(data){
+			var ids = [];
+
+			$("input[name='chargeCriterionList']:checked").each(function(i){
+				ids.push($(this).val());
+			})
+			if ($(this).prop("checked")==true){
+				zhi+=$(this).val()+";"
+			}
+			$("#otherDetails").val(zhi);
+		});
+		layui.form.on('radio(jine)', function(data){
+			var span=data.value;
+			if(span==1){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+		})
+	});
+</script>
 </body>
-</html>
+</html>