招中标关联

dsk-operate-ui/src/views/detail/biddetail/index.vue

@@ -54,17 +54,24 @@
 					<label class="label">建设性质</label>
 					<span>{{info.projectNature||"--"}}</span>
 				</p>
+				<p>
+					<label class="label">招标公告</label>
+					<span class="span2">
+						<router-link :to="`/radar/Notice/details/${info.bId}`" tag="a" class="a-link" v-if="info.bId" >查看招标公告</router-link>
+						<span v-else>--</span>
+					</span>
+				</p>
 			</div>
       <div class="biddetail-title">招标信息</div>
 			<div class="main31-box">
 				<p>
 					<label class="label">招标单位</label>
-          <span class="span1">
-            <router-link v-if="info.projectUnit"  :to="info.uipId?'/enterprise/' + encodeStr(info.projectUnitId) :'/company/' + encodeStr(info.projectUnitId) " tag="a" class="list-titel-a blue" v-html="info.projectUnit"></router-link>
-            <span v-else>--</span>
-          </span>
+					<span class="span1">
+						<router-link v-if="info.projectUnit"  :to="info.uipId?'/enterprise/' + encodeStr(info.projectUnitId) :'/company/' + encodeStr(info.projectUnitId) " tag="a" class="list-titel-a blue" v-html="info.projectUnit"></router-link>
+						<span v-else>--</span>
+					</span>
 					<label class="label label1">招标代理机构</label>
-          <span class="span1">{{info.agency||"--"}}</span>
+					<span class="span1">{{info.agency||"--"}}</span>
 				</p>
 				
 			</div>
@@ -409,9 +416,12 @@ export default {
 						font-size: 12px;
 						background: #fff;
 					}
-          .span1{
-            width: 40%;
-          }
+					.span1{
+						width: 40%;
+					}
+					.span2{
+						width: 88.9%;
+					}
 					.span-one {
 						width: 90%;
 					}

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -52,7 +52,7 @@
                                 <div class="count1" >{{item.type}}<span> {{ item.total }}</span></div>
                                 <div :key="index">
                                     <div  class="infinite-list-item" v-for="(item1,index1) in item.list" @click="selCompany(item1)" :key="index1+'i'">
-                                        <img v-if="item.logoUrl" :src="item.logoUrl" alt="" >
+                                        <img v-if="item1.logoUrl" :src="item1.logoUrl" alt="" >
                                         <div v-else class="logo" :style="{background:colors[index1%5]}">{{ item1.combineMemberName.slice(0,4) }}</div>
                                         <div style="float: left;">
                                             <span class="name"  v-html="item1.combineName" ></span>
@@ -95,7 +95,7 @@
                                 <div class="count1" >{{item.address}}<span> {{ item.total }}</span></div>
                                 <div :key="index">
                                     <div  class="infinite-list-item" v-for="(item1,index1) in item.result" @click="selCompany(item1)" :key="index1+'i'">
-                                        <img v-if="item.logoUrl" :src="item.logoUrl" alt="" >
+                                        <img v-if="item1.logoUrl" :src="item1.logoUrl" alt="" >
                                         <div v-else class="logo" :style="{background:colors[index1%5]}">{{ item1.combineMemberName.slice(0,4) }}</div>
                                         <div style="float: left;">
                                             <span class="name"  v-html="item1.combineName" ></span>
@@ -116,7 +116,7 @@
                                 <div class="count1" >{{item.type}}<span> {{ item.total }}</span></div>
                                 <div :key="index">
                                     <div  class="infinite-list-item" v-for="(item1,index1) in item.list" @click="selCompany(item1)" :key="index1+'i'">
-                                        <img v-if="item.logoUrl" :src="item.logoUrl" alt="" >
+                                        <img v-if="item1.logoUrl" :src="item1.logoUrl" alt="" >
                                         <div v-else class="logo" :style="{background:colors[index1%5]}">{{ item1.combineMemberName.slice(0,4) }}</div>
                                         <div style="float: left;">
                                             <span class="name"  v-html="item1.combineName" ></span>

dsk-operate-ui/src/views/radar/Tender/details.vue

@@ -46,7 +46,7 @@
 					</div>
 					<div  class="list-content"  v-if="textList.projectAmount||textList.contact">
 						<p class="list-content-text"  v-if="textList.projectAmount">
-							<span>预算金款：</span>
+							<span>预算金额：</span>
 							<span v-if="textList.projectAmount">{{textList.projectAmount}}万元</span>
 							<span v-else>--</span>
 						</p>
@@ -65,6 +65,10 @@
 							<span>报名截止日期：</span>
 							<span >{{textList.overTime||'--'}}</span>
 						</p>
+						<p class="list-content-text" v-if="textList.projectId">
+							<span>中标公告：</span>
+							<router-link :to="`/biddetail/${textList.projectId}`" tag="a" class="a-link"  >查看中标公告</router-link>
+						</p>
 						<p class="list-content-text" v-if="textList.dataSource">
 							<span>来源网站：</span>
 							<span >{{textList.dataSource||'--'}}</span>

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

@@ -238,7 +238,7 @@
 					</div>
 					<div  class="list-content" v-if="item.bidMoney||item.contactTel || item.agencyContactTel">
 						<p class="list-content-text" v-if="item.bidMoney">
-							<span>预算金款：</span>
+							<span>预算金额：</span>
 							<span>{{item.bidMoney||'--'}}万元</span>
 						</p>
 						<p class="list-content-text" v-if="item.contactTel || item.agencyContactTel">