Преглед изворни кода

合同修改,修改为费率合同

[user3] пре 4 година
родитељ
комит
253ced0ac4

+ 1 - 1
src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -116,7 +116,7 @@
                                     <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="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-                                        <input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+                                        <input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">

+ 26 - 22
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -34,12 +34,12 @@
         }
         $(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(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());
@@ -132,12 +132,12 @@
 
 			if("${workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}
@@ -646,7 +646,7 @@
 								<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" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-									<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -678,13 +678,13 @@
 							<div class="layui-item layui-col-sm12" id="chargeCriterionList">
 								<label class="layui-form-label">收费标准</label>
 								<div class="layui-input-block">
-									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+										<form:checkboxes path="chargeCriterionList" 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>
+								<label class="layui-form-label "></label>
 								<div class="layui-input-block">
-									<form:input path="otherDetails" readonly="true" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+									<form:input path="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12 with-textarea">
@@ -888,31 +888,35 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
+				var zhi=$("#otherDetails").val();
 				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("");
+				if ($(this).prop("checked")==true){
+					zhi+=$(this).val()+";"
 				}
+				$("#otherDetails").val(zhi);
+				// if(ids.indexOf("4")!=-1){
+				// 	document.getElementById("otherDetails").readOnly=false
+				// }else{
+				// 	document.getElementById("otherDetails").readOnly=true
+				// 	$("#otherDetails").val("");
+				// }
 			});
 			layui.form.on('radio(jine)', function(data){
 				var span=data.value;
 				if(span==1){
 					$("#contractPrice").parent().parent().hide();
-					$("#contractPrice").removeClass("judgment")
+					$("#contractPrice").removeClass("required")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-					$("#otherDetails").attr("class","form-control layui-input judgment")
+					$("#otherDetails").attr("class","form-control layui-input required")
 
 				}else{
 					$("#contractPrice").parent().parent().show();
-					$("#contractPrice").attr("class","form-control judgment number layui-input")
+					$("#contractPrice").attr("class","form-control required number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
 					$("#otherDetails").attr("class","form-control layui-input")
 				}

+ 2 - 4
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -671,7 +671,7 @@
 								<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" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-									<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -903,11 +903,10 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-			var zhi=$("#otherDetails").val();
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
 				var ids = [];
-
+				var zhi=$("#otherDetails").val();
 				$("input[name='chargeCriterionList']:checked").each(function(i){
 					ids.push($(this).val());
 				})
@@ -929,7 +928,6 @@
 					$("#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")

+ 9 - 9
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -99,12 +99,12 @@
 			//判定合同金额类别
 			if("${workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}
@@ -614,7 +614,7 @@
 							<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" readonly id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-								<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" readonly id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" readonly id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -639,7 +639,7 @@
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label "><!--其他详情:--></label>
 							<div class="layui-input-block">
-								<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+								<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input required"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12 with-textarea">
@@ -1016,10 +1016,10 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-			var zhi=$("#otherDetails").val();
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
 				var ids = [];
+				var zhi=$("#otherDetails").val();
 				$("input[name='chargeCriterionList']:checked").each(function(i){
 					ids.push($(this).val())
 				})
@@ -1037,13 +1037,13 @@
 				var span=data.value;
 				if(span==1){
 					$("#contractPrice").parent().parent().hide();
-					$("#contractPrice").removeClass("judgment")
+					$("#contractPrice").removeClass("required")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-					$("#otherDetails").attr("class","form-control layui-input judgment")
+					$("#otherDetails").attr("class","form-control layui-input required")
 
 				}else{
 					$("#contractPrice").parent().parent().show();
-					$("#contractPrice").attr("class","form-control judgment number layui-input")
+					$("#contractPrice").attr("class","form-control required number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
 					$("#otherDetails").attr("class","form-control layui-input")
 				}

+ 1 - 1
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -175,7 +175,7 @@
 							<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="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-								<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

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

@@ -165,7 +165,7 @@
 					<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>>
+						<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">

+ 16 - 17
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -58,12 +58,12 @@
             // });
 			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}
@@ -97,16 +97,16 @@
 			$("#contractFee").change(function(){
 				//状态为其他的时候  添加required样式
 				if($(this).val() == "4"){
-					$("#contractFeeDoc").attr("class","form-control judgment");
+					$("#contractFeeDoc").attr("class","form-control required");
 				}else{
 					$("#contractFeeDoc").attr("class","form-control");
 				}
 			});
-			$("#contractType").attr("class","form-control judgment");
+			$("#contractType").attr("class","form-control required");
 			/* $("#contractType").change(function(){
                  //状态为其他的时候  添加required样式
                  if($(this).val() == "5"){
-                     $("#contractTypeDoc").attr("class","form-control judgment");
+                     $("#contractTypeDoc").attr("class","form-control required");
                  }else{
                      $("#contractTypeDoc").attr("class","form-control");
                  }
@@ -188,21 +188,21 @@
 					<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>
+											  cssStyle="background-color:#fff" labelValue="${workContractRecord.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">
 					<label class="layui-form-label"><span class="require-item">*</span>合同名称:</label>
 					<div class="layui-input-block">
-						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control judgment layui-input"/>
+						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   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">
-						<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"/>">
+						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon required" 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">
@@ -220,7 +220,7 @@
 				<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="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control judgment simple-select">
+						<form:select path="workContractInfo.contractTypeDoc" id="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>
@@ -230,13 +230,13 @@
 					<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>>
+						<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 double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额:</label>
 					<div class="layui-input-block">
-						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
+						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control required number  layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -392,11 +392,10 @@
 	layui.use('form', function () {
 		var form = layui.form;
 		form.render();
-		var zhi=$("#otherDetails").val();
 		//复选框监听器
 		form.on('checkbox(chargeCriterionList)', function(data){
+			var zhi=$("#otherDetails").val();
 			var ids = [];
-
 			$("input[name='chargeCriterionList']:checked").each(function(i){
 				ids.push($(this).val());
 			})
@@ -409,13 +408,13 @@
 			var span=data.value;
 			if(span==1){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}

+ 16 - 17
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -51,24 +51,24 @@
 			});
 			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required 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");
+					$("#contractFeeDoc").attr("class","form-control required");
 				}else{
 					$("#contractFeeDoc").attr("class","form-control");
 				}
 			});
-			$("#contractType").attr("class","form-control judgment");
+			$("#contractType").attr("class","form-control required");
 
 			laydate.render({
 				elem: '#contractDate',
@@ -133,20 +133,20 @@
 					<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>
+											  cssStyle="background-color:#fff" labelValue="${workContractRecord.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">
 					<label class="layui-form-label"><span class="require-item">*</span>合同名称:</label>
 					<div class="layui-input-block">
-						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control judgment layui-input"/>
+						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   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">
-						<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"/>">
+						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon required" 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">
@@ -156,7 +156,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同终止日期:</label>
+					<label class="layui-form-label double-line">合同终止日期:</label>
 					<div class="layui-input-block">
 						<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>
@@ -164,7 +164,7 @@
 				<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="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control judgment simple-select">
+						<form:select path="workContractInfo.contractTypeDoc" id="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>
@@ -174,13 +174,13 @@
 					<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>>
+						<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 double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额:</label>
 					<div class="layui-input-block">
-						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
+						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control required number  layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -364,11 +364,10 @@
 	layui.use('form', function () {
 		var form = layui.form;
 		form.render();
-		var zhi=$("#otherDetails").val();
 		//复选框监听器
 		form.on('checkbox(chargeCriterionList)', function(data){
 			var ids = [];
-
+			var zhi=$("#otherDetails").val();
 			$("input[name='chargeCriterionList']:checked").each(function(i){
 				ids.push($(this).val());
 			})
@@ -381,13 +380,13 @@
 			var span=data.value;
 			if(span==1){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准:")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准:")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}

+ 2 - 3
src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -135,7 +135,7 @@
 					<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>>
+						<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">
@@ -302,11 +302,10 @@
 	layui.use('form', function () {
 		var form = layui.form;
 		form.render();
-		var zhi=$("#otherDetails").val();
 		//复选框监听器
 		form.on('checkbox(chargeCriterionList)', function(data){
 			var ids = [];
-
+			var zhi=$("#otherDetails").val();
 			$("input[name='chargeCriterionList']:checked").each(function(i){
 				ids.push($(this).val());
 			})