wangchuanjin 9 rokov pred
rodič
commit
72acbaf4af

+ 2 - 2
core/src/qfw/search/searchService.go

@@ -324,7 +324,7 @@ func searhWebContentent(querymap map[string]string, n *Search, reqType string) (
 						      }
 						    }
 						  }
-						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","OpStateName","s_servicenames","s_action","OpLocDistrict"]
+						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict"]
 						,"from":0,
 						"size":` + fmt.Sprintf("%v", perPage) + `,
 						  "sort": [{"_score": "desc"},{"OpSint":"desc"},{"RegCap":"desc"}]
@@ -469,7 +469,7 @@ func searhWebContentent(querymap map[string]string, n *Search, reqType string) (
 			"s_synopsis":{"force_source": true},
 			"stock":{"force_source": true}
         }
-    },"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","OpStateName","s_servicenames","s_action","OpLocDistrict","s_submitid"]
+    },"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","s_submitid"]
 	,"from":` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 	"size":` + fmt.Sprintf("%v", perPage) +
 			`,"sort":[` + sort + `] }`

+ 16 - 5
core/src/web/templates/search/enterpriseList.html

@@ -60,12 +60,23 @@
 											{{index $v "EntName"}}
 										{{end}}
 									</b></a>
-									{{if index $v "OpStateName"}}
-									<span class="{{if eq (index $v "OpStateName") "注销" "吊销"}}ent-status-r{{else}}ent-status-g{{end}}">
+									{{if index $v "OpState"}}
+									<span class="{{if eq (index $v "OpState") "07" "08" "11"}}ent-status-r{{else}}ent-status-g{{end}}">
 									<script>
+										var OpState = {{index $v "OpState"}};
 										var OpStateName = {{index $v "OpStateName"}};
-										if(OpStateName.length > 2){
-											OpStateName = OpStateName.substring(0,2);
+										if(OpState == "07"){
+											OpStateName = "注销";
+										}else if(OpState == "08"){
+											OpStateName = "撤销";
+										}else if(OpState == "11"){
+											OpStateName = "吊销";
+										}else if(OpState == "06"){
+											OpStateName = "存续";
+										}else{
+											if(OpStateName.length > 2){
+												OpStateName = OpStateName.substring(0,2);
+											}
 										}
 										document.write(OpStateName);
 									</script>
@@ -73,7 +84,7 @@
 									{{end}}
 									{{ if index $v "s_action"}}
 										{{ if eq (index $v "s_action") "01"}}
-											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small> 已认证企业 </small></span>
+											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>&nbsp;已认证企业&nbsp;</small></span>
 											{{ if $v.i_comauthenttype }}
 													{{ if eq $v.i_comauthenttype 2}}
 														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>