合同添加描述内容，选择费率合同类型则必须选择收费标准，也必须填写描述

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -147,6 +147,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String recordNotifyId; //归档代办判定条件
 	private Integer borrowNotifyFlag; //借用代办判定条件
 	private String borrowNotifyId; //借用代办判定条件
+	private String describeContent; //描述内容
 
 	private String contractInformation; //合同金额类别
 
@@ -385,7 +386,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setContractDate(Date contractDate) {
 		this.contractDate = contractDate;
 	}
-	
+
 	public Date getEffectiveDate() {
 		return effectiveDate;
 	}
@@ -440,7 +441,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setContractFee(String contractFee) {
 		this.contractFee = contractFee;
 	}
-	
+
 	public String getContractSpecial() {
 		return contractSpecial;
 	}
@@ -448,7 +449,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setContractSpecial(String contractSpecial) {
 		this.contractSpecial = contractSpecial;
 	}
-	
+
 	@ExcelField(title="合同状态", dictType="audit_state", align=2, sort=9)
 	public String getContractState() {
 		return contractState;
@@ -457,7 +458,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setContractState(String contractState) {
 		this.contractState = contractState;
 	}
-	
+
 	public Date getBeginContractDate() {
 		return beginContractDate;
 	}
@@ -465,7 +466,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setBeginContractDate(Date beginContractDate) {
 		this.beginContractDate = beginContractDate;
 	}
-	
+
 	public Date getEndContractDate() {
 		return endContractDate;
 	}
@@ -1072,4 +1073,12 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setEndContractPrice(String endContractPrice) {
 		this.endContractPrice = endContractPrice;
 	}
-}
+
+	public String getDescribeContent() {
+		return describeContent;
+	}
+
+	public void setDescribeContent(String describeContent) {
+		this.describeContent = describeContent;
+	}
+}

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -62,7 +62,8 @@
 		a.signature_status as "signatureStatus",
 		a.office_id AS "officeId",
 		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
-		a.contract_information AS "contractInformation"
+		a.contract_information AS "contractInformation",
+		a.describe_content AS "describeContent"
 	</sql>
 
 	<sql id="workContractInfoJoins">
@@ -137,7 +138,8 @@
 		a.other_details as "otherDetails",
 		a.contract_information as "contractInformation",
 		wcr.file_num as "fileNum",
-		wcr.file_num_tow as "fileNumTow"
+		wcr.file_num_tow as "fileNumTow",
+		a.describe_content AS "describeContent"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
@@ -260,7 +262,8 @@
 		a.other_details as "otherDetails",
 		ifnull(wcr.status,0) as "contrractRecordStatus",
 		ifnull(wcr.file_num,"") as "recordNum",
-		wcr.id as "contrractRecordId"
+		wcr.id as "contrractRecordId",
+		a.describe_content AS "describeContent"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		left join work_contract_record wcr on wcr.contract_info_id = a.id
@@ -914,7 +917,8 @@
 			contract_num_path,
 			charge_criterion,
 			other_details,
-			contract_information
+			contract_information,
+			describe_content
 		) VALUES (
 			#{id},
 			#{project.id},
@@ -972,7 +976,8 @@
 			#{contractNumPath},
 			#{chargeCriterion},
 			#{otherDetails},
-			#{contractInformation}
+			#{contractInformation},
+			#{describeContent}
 		)
 	</insert>
 
@@ -1029,7 +1034,8 @@
 			contract_num_path=#{contractNumPath},
 			charge_criterion=#{chargeCriterion},
 			other_details=#{otherDetails},
-			contract_information=#{contractInformation}
+			contract_information=#{contractInformation},
+			describe_content=#{describeContent}
 		WHERE id = #{id}
 	</update>
 

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

@@ -44,12 +44,16 @@
                 $("#contractPrice").parent().parent().hide();
                 $("#contractPrice").removeClass("judgment")
                 $("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+                $("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
                 $("#otherDetails").attr("class","form-control layui-input judgment")
+                $("#describeContent").attr("class","form-control judgment")
             }else{
                 $("#contractPrice").parent().parent().show();
                 $("#contractPrice").attr("class","form-control judgment number layui-input")
                 $("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+                $("#describeContentDiv").find("label").eq(0).html("描述内容：")
                 $("#otherDetails").attr("class","form-control layui-input")
+                $("#describeContent").attr("class","form-control")
             }
         });
 	</script>
@@ -148,6 +152,12 @@
                                         <form:input path="otherDetails" id="otherDetails"  readonly="true" htmlEscape="false" class="form-control layui-input"/>
                                     </div>
                                 </div>
+                                <div class="layui-item layui-col-sm12 with-textarea" id="describeContentDiv">
+                                    <label class="layui-form-label ">描述内容：</label>
+                                    <div class="layui-input-block">
+                                        <form:textarea placeholder="请输入描述内容" path="describeContent" readonly="true" htmlEscape="false" rows="4" maxlength="500"   class="form-control "/>
+                                    </div>
+                                </div>
                                 <%--<div class="layui-item layui-col-sm6">
                                     <label class="layui-form-label ">创建时间：</label>
                                     <div class="layui-input-block">

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

@@ -106,12 +106,16 @@
 				$("#contractPrice").parent().parent().hide();
 				$("#contractPrice").removeClass("judgment")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+				$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
 				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#describeContent").attr("class","form-control judgment")
 			}else{
 				$("#contractPrice").parent().parent().show();
 				$("#contractPrice").attr("class","form-control judgment number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+				$("#describeContentDiv").find("label").eq(0).html("描述内容：")
 				$("#otherDetails").attr("class","form-control layui-input")
+				$("#describeContent").attr("class","form-control")
 			}
 
 
@@ -716,6 +720,12 @@
 									<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
+							<div class="layui-item layui-col-sm12 with-textarea" id="describeContentDiv">
+								<label class="layui-form-label ">描述内容：</label>
+								<div class="layui-input-block">
+									<form:textarea placeholder="请输入描述内容" path="describeContent" htmlEscape="false" rows="4" maxlength="500"   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">
@@ -1038,12 +1048,16 @@
 					$("#contractPrice").parent().parent().hide();
 					$("#contractPrice").removeClass("judgment")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+					$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
 					$("#otherDetails").attr("class","form-control layui-input judgment")
+					$("#describeContent").attr("class","form-control judgment")
 				}else{
 					$("#contractPrice").parent().parent().show();
 					$("#contractPrice").attr("class","form-control judgment number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+					$("#describeContentDiv").find("label").eq(0).html("描述内容：")
 					$("#otherDetails").attr("class","form-control layui-input")
+					$("#describeContent").attr("class","form-control")
 				}
 			})
 		});

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

@@ -33,13 +33,13 @@
             return false;
         }
 		$(document).ready(function() {
-			var chargeCriterionH = $("#chargeCriterionH").val();
+			/*var chargeCriterionH = $("#chargeCriterionH").val();
 			if(chargeCriterionH.indexOf("4")!=-1){
 				// document.getElementById("otherDetails").readOnly=false
 			}else{
 				// document.getElementById("otherDetails").readOnly=true
 				$("#otherDetails").val("");
-			}
+			}*/
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -101,12 +101,16 @@
 				$("#contractPrice").parent().parent().hide();
 				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+				$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
 				$("#otherDetails").attr("class","form-control layui-input required")
+				$("#describeContent").attr("class","form-control required")
 			}else{
 				$("#contractPrice").parent().parent().show();
 				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+				$("#describeContentDiv").find("label").eq(0).html("描述内容：")
 				$("#otherDetails").attr("class","form-control layui-input")
+				$("#describeContent").attr("class","form-control")
 			}
 
 
@@ -656,6 +660,12 @@
 								<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" id="describeContentDiv">
+							<label class="layui-form-label ">描述内容：</label>
+							<div class="layui-input-block">
+								<form:textarea placeholder="请输入描述内容" path="describeContent" htmlEscape="false" rows="4" maxlength="500"   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">
@@ -1149,13 +1159,19 @@
 					$("#contractPrice").parent().parent().hide();
 					$("#contractPrice").removeClass("required")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-					$("#otherDetails").attr("class","form-control layui-input required")
+					$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
+					$("#otherDetails").attr("class","form-control layui-input re" +
+							"" +
+							"quired")
+					$("#describeContent").attr("class","form-control required")
 
 				}else{
 					$("#contractPrice").parent().parent().show();
 					$("#contractPrice").attr("class","form-control required number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+					$("#describeContentDiv").find("label").eq(0).html("描述内容：")
 					$("#otherDetails").attr("class","form-control layui-input")
+					$("#describeContent").attr("class","form-control")
 				}
 			})
 		});

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

@@ -208,6 +208,12 @@
 							</div>
 						</div>
 
+						<div class="layui-item layui-col-sm12 with-textarea" id="describeContentDiv">
+							<label class="layui-form-label ">描述内容：</label>
+							<div class="layui-input-block">
+								<form:textarea placeholder="请输入描述内容" path="describeContent" readonly="true" htmlEscape="false" rows="4" maxlength="500"   class="form-control "/>
+							</div>
+						</div>
 
 
 						<%--<div class="layui-item layui-col-sm6">