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

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -345,6 +345,8 @@ export default {
       getCustomerList(this.searchParam).then(result=>{
         this.tableData = result
         this.tableData.rows.forEach(item=>{
+          item.registerCapital.replace('万','')
+          item.registerCapital.replace('元','')
           if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
             item.mainBusiness1 = item.mainBusiness.substring(0,81)
             item.sq1 = true

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

@@ -208,11 +208,13 @@
 
 <script>
 	import api from '@/api/radar/radar.js';
+	import {encodeStr} from "@/assets/js/common.js"
 	export default {
 
 		name: 'EstablishmentDetails',
 		data() {
 			return {
+				encodeStr,
 				id: '',
 				textList: {},
 				pageNum1:1,
@@ -624,6 +626,11 @@
 					.span-one {
 						width: 90%;
 					}
+					.blue {
+						color: #0081FF !important;
+						cursor: pointer;
+					
+					}
 
 				}
 

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

@@ -185,7 +185,7 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">招标人</label>
-					<router-link  :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
+					<router-link  :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
 					<label class="label">代理机构</label>
 					<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId)  + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
 					<span v-else class="color2">{{textList.agency||'--'}}</span>

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

@@ -136,14 +136,14 @@
 			<div class="main4-box">
 				<label class="label">项目主体</label>
 				<span>
-					<router-link v-if="textList.projectEntity"  :to="textList.projectEntityUipId?'/enterprise/' + encodeStr(textList.projectEntityUipId) :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
+					<router-link v-if="textList.projectEntity"  :to="textList.projectEntityUipId?'/enterprise/' + textList.projectEntityUipId :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
 				     <template v-else>--</template>
 				</span>
 				<label class="label">主管部门</label>
 				<span>{{textList.chargeDepartment||'--'}}</span>
 				<label class="label">实施单位</label>
 				<span>
-				<router-link v-if="textList.piu"  :to="textList.piuUipId?'/enterprise/' + encodeStr(textList.piuUipId) :'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
+				<router-link v-if="textList.piu"  :to="textList.piuUipId?'/enterprise/' + textList.piuUipId :'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
 				 <template v-else>--</template>
 				</span>
 			</div>