wangchuanjin 9 years ago
parent
commit
fecc4e72c5

+ 41 - 0
core/src/web/staticres/js/entportrait.js

@@ -1,5 +1,6 @@
 var entType = "企业";
 var relationEntity = null;//关系网
+var alterInfoEntity = null;
 var copyrightEntity = null;//著作权
 var staffinfoEntity = null;//主要人员
 var dishonestyPaging = null;//失信
@@ -64,6 +65,14 @@ $(function(){
 		$("#ent-tab-dishonesty").addClass("disabled");
 	}
 	//显示变更数量
+	alterInfo = processAlterInfo(alterInfo);
+	if(alterInfo.length > 0){
+		$("#alterInfo-tab").find(".badge").html(alterInfo.length);
+	}else{
+		$("#alterInfo-tab").addClass("disabled");
+		$("#alterInfo-tab").find(".badge").addClass("disabled");
+	}
+	//主要人员
 	if(staffinfoFlag){
 		$("#ent-tab-staffinfo").text(staffinfo.length);
 	}else{
@@ -231,6 +240,9 @@ $(function(){
 		}else if($(this).index() == 3 && copyrightEntity == null){
 			//加载服务列表
 			copyrightEntity = new CopyrightEntity();
+		}else if($(this).index() == 4 && dishonestyPaging == null){
+			//加载变更
+			alterInfoEntity = new AlterInfoEntity();
 		}else if($(this).index() == 5 && dishonestyPaging == null){
 			//加载失信列表
 			dishonestyPaging = new DishonestyPaging();
@@ -556,6 +568,35 @@ function DishonestyPaging(){
 		});
 	}
 }
+//变更
+function AlterInfoEntity(){
+	var alterInfoHtml = "";
+	for(var i=0;i<alterInfo.length;i++){
+		var cpHtml = "<div>"
+						+"<div>"+alterInfo[i].AltDate+"</div>"
+						+"<div>"+alterInfo[i].AltItemName+"</div>"
+						+"<div>变更前:"+alterInfo[i].AltBe+"<br>变更后:"+alterInfo[i].AltAf+"</div>"
+						+"<a></a>"
+					+"</div>";
+		alterInfoHtml += "<li>"+cpHtml+cpHtml+"</li>";
+	}
+	alterInfoHtml += "<li>"
+						+"<div>"
+							+"<div></div>"
+							+"<div></div>"
+							+"<div></div>"
+							+"<a></a>"
+						+"</div>"
+						+"<div>"
+							+"<div></div>"
+							+"<div></div>"
+							+"<div></div>"
+							+"<a></a>"
+						+"</div>"
+					+"</li>"
+					+"<div class='clearfix'></div>";
+	$("#ent-alterInfo>.ent-layout-up .b-com-content").html("<ul>"+alterInfoHtml+"</ul>");
+}
 function showMap(){
 	if(baiduMap == null){
 		loadJS("http://api.map.baidu.com/getscript?v=2.0&ak="+BaiduMap.key,function(){

+ 49 - 0
core/src/web/staticres/js/qfw.js

@@ -728,4 +728,53 @@ var TipAssembly = {
 	triangleHide: function(){
 		$("#maskLayer,#tipTriangle").hide();
 	}
+}
+//企业变更数据处理
+function processAlterInfo(alterInfo){
+	var array = [];
+	if(alterInfo == null){
+		return array;
+	}
+	for(var i=0;i<alterInfo.length;i++){
+		var object = alterInfo[i];
+		var altDate = object.AltDate;
+		if(typeof(altDate) != "string"){
+			if(String(altDate).length == 10){
+				altDate = altDate * 1000;
+			}
+			try{
+				altDate = new Date(altDate).FormatEnhance("yyyy-mm-dd HH:MM:ss");
+			}catch(e){
+				altDate = null;
+			}
+		}else{
+			altDate = $.trim(altDate);
+			if(altDate == "" || altDate == "null" || altDate == "空"){
+				altDate = null;
+			}
+		}
+		object.AltDate = altDate;
+		//
+		var altItemName =  $.trim(object.AltItemName);
+		if(altItemName == "" || altItemName == "null" || altItemName == "空"){
+			altItemName = null;
+			object.AltItemName = null;
+		}
+		//
+		var altBe =  $.trim(object.AltBe);
+		if(altBe == "" || altBe == "null" || altBe == "空"){
+			altBe = null;
+			object.AltBe = null;
+		}
+		//
+		var altAf =  $.trim(object.AltAf);
+		if(altAf == "" || altAf == "null" || altAf == "空"){
+			altAf = null;
+			object.AltAf = null;
+		}
+		if(altDate != null && altItemName != null && altBe != null && altAf != null){
+			array.push(object);
+		}
+	}
+	return array;
 }

+ 6 - 42
core/src/web/templates/enterprise/detail.html

@@ -178,7 +178,7 @@
 		<li><div class="b-com-border-top"></div>关系网</li>
 		<li{{if not .T.res.staffinfo}} class="disabled"{{end}}><div class="b-com-border-top"></div>主要人员<front class="badge" id="ent-tab-staffinfo">0</front></li>
 		<li{{if and (not .T.copyright.WorkCopyRight) (not .T.copyright.SoftWareCopyRight) (not .T.copyright.Patent)}} class="disabled"{{end}}><div class="b-com-border-top"></div>著作权<front class="badge" id="ent-tab-copyright">0</front></li>
-		<li{{if not .T.res.alterInfo}} class="disabled"{{end}}><div class="b-com-border-top"></div>变更信息<front class="badge{{if .T.res.alterInfo}}{{if eq (len .T.res.alterInfo) 0}} disabled{{end}}{{else}} disabled{{end}}">{{if .T.res.alterInfo}}{{len .T.res.alterInfo}}{{else}}0{{end}}</front></li>
+		<li id="alterInfo-tab"><div class="b-com-border-top"></div>变更信息<front class="badge">0</front></li>
 		<li{{if not .T.dishonesty.count}} class="disabled"{{end}}><div class="b-com-border-top"></div>失信信息<front class="badge" id="ent-tab-dishonesty">0</front></li>
 	</ul>
 	<div class="ent-tab-content b-left{{if and (not .T.relevantNews) (not .T.relevantEnts)}} b-right-none{{end}}">
@@ -267,7 +267,7 @@
 					  	<div class="entinfo-lerep">
 							<div>
 								<span{{if not .T.res.LeRep}} class="entinfo-disabled"{{end}}>{{if .T.res.EntTypeLabel}}{{.T.res.EntTypeLabel}}{{else}}无{{end}}</span>
-								<span>{{if .T.res.LeRep}}{{.T.res.LeRep}}{{end}}</span>
+								<span{{if .T.res.LeRep}} title="{{.T.res.LeRep}}"{{end}}>{{if .T.res.LeRep}}{{.T.res.LeRep}}{{end}}</span>
 							</div>
 							<img src="{{Msg "seo" "cdn"}}/images/entcommunity/ren.png">
 						</div>
@@ -425,54 +425,17 @@
 			</div>
 		</div>
 		<!--变更信息-->
-		<div class="ent-alterinfo hide">
-		{{if gt (len .T.res.alterInfo) 0}}
+		<div class="ent-alterinfo hide" id="ent-alterinfo">
 			<div class="ent-layout-up">
 				<div class="b-com-title">
 					<span class="glyphicon jianzhu"></span>变更信息
 				</div>
-				<div class="b-com-content">
-					<ul>
-					{{range $k,$v := .T.res.alterInfo}}
-						<li>
-							<div>
-								<div><script>document.write(new Date({{$v.AltDate}}).FormatEnhance("yyyy-mm-dd HH:MM:ss"));</script></div>
-								<div>{{$v.AltItemName}}</div>
-								<div>变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}</div>
-								<a></a>
-							</div>
-							<div>
-								<div><script>document.write(new Date({{$v.AltDate}}).FormatEnhance("yyyy-mm-dd HH:MM:ss"));</script></div>
-								<div>{{$v.AltItemName}}</div>
-								<div>变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}</div>
-								<a></a>
-							</div>
-						</li>
-					{{end}}
-						<li>
-							<div>
-								<div></div>
-								<div></div>
-								<div></div>
-								<a></a>
-							</div>
-							<div>
-								<div></div>
-								<div></div>
-								<div></div>
-								<a></a>
-							</div>
-						</li>
-						<div class="clearfix"></div>
-					</ul>
-				</div>
+				<div class="b-com-content"></div>
 			</div>
-		{{else}}
-			<div class="ent-findnull">
+			<div class="ent-findnull hide">
 				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
 				<h4>抱歉,未找到相关数据!</h4>
 			</div>
-		{{end}}
 		</div>
 		<div class="hide ent-dishonesty">
 			<div class="ent-layout-up">
@@ -580,5 +543,6 @@ var $address=false;
 {{else if .T.res.Dom}}
 	address = {{.T.res.Dom}};
 {{end}}
+var alterInfo = {{.T.res.alterInfo}};
 </script>
 </html>

+ 2 - 52
core/src/web/templates/member/incmobile/alter.html

@@ -2,59 +2,9 @@
 	<center><span class="glyphicon biangengxinxi"></span>&nbsp;&nbsp;变更信息</center>
 	<span class="header" data="c_alter" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
-<div class="ent-alterinfo">
+<div class="ent-alterinfo" id="ent-alterInfo">
 	<div class="ent-layout-up">
-		<div class="b-com-content">
-			<ul>
-			{{range $k,$v := .T.res.alterInfo}}
-				<li>
-					<div>
-						<div class="date">{{$v.AltDate}}</div>
-						<div>{{$v.AltItemName}}</div>
-						<div>
-							<span onclick="viewcontent(this);">查看详情</span>
-							<div class="hides content">
-							变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}
-							</div>
-						</div>
-						<a></a>
-					</div>
-					<div>
-						<div class="date">{{$v.AltDate}}</div>
-						<div>{{$v.AltItemName}}</div>
-						<div>
-							<span onclick="viewcontent(this);">查看详情</span>
-							<div class="hides content">
-							变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}
-							</div>
-						</div>
-						
-						<a></a>
-					</div>
-				</li>
-			{{end}}
-				<li class="end">
-					<div>
-						<div></div>
-						<div></div>
-						<div></div>
-						<a></a>
-					</div>
-					<div>
-						<div></div>
-						<div></div>
-						<div></div>
-						<a></a>
-					</div>
-				</li>
-				<script>
-					if($(".end").prev().length==0){
-						$(".end").remove();
-					}
-				</script>
-				<div class="clearfix"></div>
-			</ul>
-	</div>
+		<div class="b-com-content"></div>
 	</div>
 </div>
 <div style="position: fixed;width:100%;z-index:4410;background:#FFF;bottom: 0;display:none;font-size:12px;overflow:auto;min-height:160px;" class="creditrules">

+ 38 - 13
core/src/web/templates/member/incmobile/detailindex.html

@@ -298,13 +298,6 @@
 		}else{
 			$("div[data-id='c_member'] .count").text(memberlength);
 		}
-		//变更信息
-		var alterlength=$(".ent-alterinfo li").length-1;
-		if(alterlength<=0){
-			$("div[data-id='c_alter']").addClass("disabled");
-		}else{
-			$("div[data-id='c_alter'] .count").text(alterlength);
-		}
 		//企业名片
 		var cardlength=$(".yellowpage li").length;
 		if(cardlength==0){
@@ -342,12 +335,6 @@
 			$("svg").attr("height",$(window).height()+"");
 	}
 	$(function(){
-		$(".date").each(function(i,n){
-				var i=parseFloat($(n).text());
-				var d=new Date(i).FormatEnhance("yyyy-mm-dd");
-				$(n).text	("");
-				$(n).append("<span>"+d+"</span>");
-		});
 		$(".newsInfo li").click(function(n){
 			var node=$(b.target);
 			window.location.href=node.find("a").attr("href");
@@ -373,5 +360,43 @@
 	var relation = {{.T.relation}};
 	var copyright = {{.T.copyright}};
 	var relflag={{.T.relflag}};
+	var alterInfo = {{.T.res.alterInfo}};
+$(function(){
+	alterInfo = processAlterInfo(alterInfo);
+	if(alterInfo.length > 0){
+		$("div[data-id='c_alter'] .count").text(alterInfo.length);
+		var alterInfoHtml = "";
+		for(var i=0;i<alterInfo.length;i++){
+			var cpHtml = "<div>"
+							+"<div>"+alterInfo[i].AltDate+"</div>"
+							+"<div>"+alterInfo[i].AltItemName+"</div>"
+							+"<div>"
+								+"<span onclick='viewcontent(this);'>查看详情</span>"
+								+"<div class='hides content'>变更前:"+alterInfo[i].AltBe+"<br>变更后:"+alterInfo[i].AltAf+"</div>"
+							+"</div>"
+							+"<a></a>"
+						+"</div>";
+			alterInfoHtml += "<li>"+cpHtml+cpHtml+"</li>";
+		}
+		alterInfoHtml += "<li>"
+							+"<div>"
+								+"<div></div>"
+								+"<div></div>"
+								+"<div></div>"
+								+"<a></a>"
+							+"</div>"
+							+"<div>"
+								+"<div></div>"
+								+"<div></div>"
+								+"<div></div>"
+								+"<a></a>"
+							+"</div>"
+						+"</li>"
+						+"<div class='clearfix'></div>";
+		$("#ent-alterInfo>.ent-layout-up .b-com-content").html("<ul>"+alterInfoHtml+"</ul>");
+	}else{
+		$("div[data-id='c_alter']").addClass("disabled");
+	}
+});
 </script>
 </html>