Explorar o código

修改下属候选人页面捡入时间选择无效+此页面查询跟进状态字典名称错误

LiFei %!s(int64=6) %!d(string=hai) anos
pai
achega
4b048f7a01

+ 7 - 2
happy-job-base-system/src/main/webapp/webpage/modules/cmcandidate/cmSubordinateCandidateList.jsp

@@ -197,7 +197,12 @@
 		 $('#endContactTime').datetimepicker({
 			 format: "YYYY-MM-DD"
 		 });
-		 	 	 
+        $('#beginBelongTime').datetimepicker({
+            format: "YYYY-MM-DD"
+        });
+        $('#endBelongTime').datetimepicker({
+            format: "YYYY-MM-DD"
+        });
 		});
 			
 	  function getIdSelections() {
@@ -318,7 +323,7 @@
 				<label class="label-item single-overflow pull-left" title="跟进状态">跟进状态:</label>
 				<form:select path="contactStatus"  class="form-control m-b input-sm">
 					<form:option value="" label="全部"/>
-					<form:options items="${fns:getDictList('contactStatus')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+					<form:options items="${fns:getDictList('cm_contact_status')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 				</form:select>
 			</div>
 			<div class="col-xs-12 col-sm-3 col-md-2">