用户信息有无纹身调整

happy-job-base-system/src/main/webapp/webpage/modules/omcandidate/omCandidateForm.jsp

@@ -10,8 +10,9 @@
 			//编辑
 		    var id = "${omCandidate.id}";
 		    var mode = "${mode}";
-		    if(id && "${omCandidate.hasTattooing}"){
-		    	$("#tattooingDetail").removeAttr('readOnly')
+		    var hasTattooing = "${omCandidate.hasTattooing}";
+		    if(hasTattooing=="true"){
+		    	$("#tattooingDetailDiv").show();
 		    }
 		    if(id != null && id != '' &&  (mode == 'edit' || mode == 'view' || mode == 'rePublish')){
 		        $(".t_h_s i").html($(".tattooing_detail").val().length);
@@ -93,10 +94,9 @@
         //纹身选项为无则纹身描述无法填写
        function changeTattooingDetail(){
         	if($("#hasTattooing").val()=="false"){
-        		$("#tattooingDetail").attr('readOnly',true);
-        		$("#tattooingDetail").val(' ');
+        		$("#tattooingDetailDiv").hide();
         	}else{
-        		$("#tattooingDetail").removeAttr('readOnly')
+        		$("#tattooingDetailDiv").show();
         	}
         }
         
@@ -200,10 +200,10 @@
 				</form:select>
 			</div>
 		</div>		
-		<div class="form-group col-sm-6">
+		<div class="form-group col-sm-6" id="tattooingDetailDiv" style="display:none">
 			<label class="col-sm-3 control-label">纹身描述：</label>
 			<div class="col-sm-3">
-                  <form:textarea path="tattooingDetail" readOnly="true" id="tattooingDetail" htmlEscape="false" rows="4" class="form-control input-sm tattooing_detail" maxlength="100" placeholder="请对纹身情况进行描述"/>
+                  <form:textarea path="tattooingDetail" htmlEscape="false" rows="4" class="form-control input-sm tattooing_detail" maxlength="100" placeholder="请对纹身情况进行描述"/>
                   <span class="t_h_s" style="float: right"><i>0</i>/100</span>
 			</div>
 		</div>

happy-job-base-system/src/main/webapp/webpage/modules/omcandidate/omCandidateInfoList.jsp

@@ -241,8 +241,8 @@
 		<div class="panel-body">
 			<div class="form-group col-sm-12" style="margin-top:10px">
 				<div class="form-group col-sm-4">
-					<label class="col-sm-3 control-label" style="color:#000;font-size:18px">基本信息</label>
-					<div class="col-sm-7"></div>
+					<label class="col-sm-7 control-label" style="color:#000;font-size:18px">基本信息</label>
+					<div class="col-sm-3"></div>
 				</div>	
 				<div class="pull-right" style="margin-right:10px">
 					<a style="margin-left:10px" href='javascript:editInfo()'> 编辑 </a>
@@ -292,7 +292,7 @@
 				</div>
 				<div class="form-group col-sm-9">
 					<label class="col-sm-1 control-label">纹身描述</label>
-					<div class="col-sm-8" style="margin-left:2.5%">${not empty omCandidate.tattooingDetail?omCandidate.tattooingDetail:'-'}</div>
+					<div class="col-sm-8" style="margin-left:2.5%">${(not empty omCandidate.tattooingDetail && omCandidate.hasTattooing==true)?omCandidate.tattooingDetail:'-'}</div>
 				</div>	
 			</div>
 			<div class="form-group col-sm-12">