Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -212,7 +212,9 @@
 	  				<p class="list-content-text"  v-if="item.tenderee">
 	  					<span>招采单位：</span>
 							<span v-if="item.tendereeId">
-								 <span class="blue"   @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee">
+								 <span class="blue"   @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee"></span>
+							</span>
+							<span v-else  v-html="item.tenderee">
 							</span>
 							
 						</span>

dsk-operate-ui/src/views/radar/components/Establishment/index.vue

@@ -211,10 +211,11 @@
 					<div  class="list-content">
 						<p class="list-content-text" v-if="item.companyName">
 							<span>项目业主：</span>
-							<span class="blue"   @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
-								
+							<span v-if="item.companyId">
+								 <span class="blue"   @click="getUipIdByCid(item.companyId)" v-html="item.companyName"></span>
+							</span>
+							<span v-else  v-html="item.companyName">
 							</span>
-							
 						</p>
 						
 						<p class="list-content-text"v-if="item.money">

dsk-operate-ui/src/views/radar/components/Land/index.vue

@@ -239,8 +239,10 @@
 						<div  class="list-content"  v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage">
 							<p class="list-content-text"  v-if="item.companyName">
 								<span>受让人：</span>
-								<span class="blue"   @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
-									
+								<span v-if="item.companyId">
+									 <span class="blue"   @click="getUipIdByCid(item.companyId)" v-html="item.companyName"></span>
+								</span>
+								<span v-else  v-html="item.companyName">
 								</span>
 								
 							</p>

dsk-operate-ui/src/views/radar/components/Tender/index.vue

@@ -213,12 +213,18 @@
 					<div  class="list-content list-content1"  v-if="item.companyName||item.agency">
 						<p class="list-content-text" v-if="item.companyName">
 							<span>招采单位：</span>
-							<span class="blue"   @click="getUipIdByCid(item.jskEid)" v-html="item.companyName">
+							<span v-if="item.jskEid">
+								 <span class="blue"   @click="getUipIdByCid(item.jskEid)" v-html="item.companyName"></span>
+							</span>
+							<span v-else  v-html="item.companyName">
 							</span>
 						</p>
 						<p class="list-content-text" v-if="item.agency">
 							<span>代理单位：</span>
-							<span class="blue"   @click="getUipIdByCid(item.agencyId)" v-html="item.agency">
+							<span v-if="item.agencyId">
+								 <span class="blue"   @click="getUipIdByCid(item.agencyId)" v-html="item.agency"></span>
+							</span>
+							<span v-else  v-html="item.agency">
 							</span>
 						</p>
 						

dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue

@@ -448,8 +448,12 @@
 					 </el-table-column>
 					 <el-table-column prop="zj" label="招标人" width="280" >
 					 			<template slot-scope="scope">
-									<span class="list-titel-a"   @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee">
+									<span v-if="scope.row.tendereeId">
+										 <span class="list-titel-a"   @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee"></span>
 									</span>
+									<span v-else  v-html="scope.row.tenderee">
+									</span>
+									
 					 			
 					 			</template>
 					  </el-table-column>

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

@@ -135,7 +135,11 @@
 					<div  class="list-content">
 						<p class="list-content-text" v-if="item.projectEntity">
 							<span>项目主体：</span>
-							<span v-html="item.projectEntity" class="blue"  @click="getUipIdByCid(item.projectEntityId)"></span>
+							<span v-if="item.projectEntityId">
+								 <span class="list-titel-a"   @click="getUipIdByCid(item.projectEntityId)" v-html="scope.row.projectEntity"></span>
+							</span>
+							<span v-else  v-html="scope.row.projectEntity">
+							</span>
 						</p>
 						<p class="list-content-text" v-if="item.chargeDepartment">
 							<span>主管部门：</span>