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

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -336,7 +336,9 @@ export default {
           'path':'business'
           } ,
         })
-        this.$router.go(0)
+        this.$nextTick(()=>{
+          this.$tab.refreshPage();
+        })
       // 跳转地址
     },
     renHide(){

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

@@ -4,7 +4,7 @@
 	  	<div class="content_item">
 	  	   <div class="content_right item_ckquery_list">
 	  	       <el-input class="ename_input" placeholder="请输入企业名称关键字" v-model="keys" >
-	  	   		<div slot="append" class="btn-search" @click="search">搜索</div>
+	  	   		<div slot="append" class="btn-search" @click="search()">搜索</div>
 	  	   	</el-input>
 	  	      
 	  	   </div>
@@ -623,9 +623,10 @@ export default {
   methods: {
 	scrolling() {
 		let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
-      	let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
-		if (scrollTop>400){
-			let top = scrollTop-401
+		let el1 = document.getElementsByClassName("el-table")[0]
+      	let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
+		if (scrollTop>el1.offsetTop){
+			let top = scrollTop-el1.offsetTop-13
 			el.style.top = top+'px'
 		}else{
 			el.style.top = 0
@@ -832,11 +833,10 @@ export default {
 				 	creditCode:info.creditCode,
 				 }
 				 api.claim(params).then(res1=>{
-				 		  // console.log(res)
-				           if (res1.code==200) {
-				 		    this.dialogVisible=true;
-				 			this.customerId=res1.data.customerId;
-				           }
+				    if (res1.code==200) {
+				 		this.dialogVisible=true;
+				 		this.customerId=res1.data.customerId;
+				    }
 				 }).catch(error=>{
 				 	
 				 });
@@ -868,6 +868,8 @@ export default {
 				} ,
 			})
 			this.dialogVisible=false;
+						this.search();
+
 	},
 	search(pageNum, pageSize,exportFlag) {
 	  this.dialogVisible=false;

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

@@ -5,7 +5,7 @@
 			<div class="content_item content_item_padding0">
 			    <div class="content_right item_ckquery_list">
 			        <el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
-						<div slot="append" class="btn-search" @click="search">搜索</div>
+						<div slot="append" class="btn-search" @click="search()">搜索</div>
 					</el-input>
 			        <!-- <template v-if="ename">
 			            <span v-for=" (item,k)  in enameQueryTypeList" :key="k" style="margin-right: 24px;">
@@ -99,7 +99,7 @@
 						<template v-else>
 							<el-popover placement="top-start" width="200" trigger="hover">
 								<div class="select-popper-title">
-									请先选择<span class="colorhover">进省备案</span>后,在选择本省与进省企业!
+									请先选择<span class="colorhover">进省备案</span>后，再选择本省与进省企业！
 								</div>
 					
 								<div class="" slot="reference">
@@ -554,7 +554,6 @@
         					</template>
         				</p>
         				<p class="card-right-title" v-if="item.formerName!=null&&(item.formerName.indexOf('color')!=-1||item.name.indexOf('color')!=-1)" style="padding: 10px 0px 0px 0px;">
-        					<
         					<span class="right-title-grey">曾用名：</span>
         					<span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span>
         				</p>

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

@@ -7,6 +7,7 @@
 						<div style="position:relative" v-for="(itme,i)  in personnelList"
 							:class="itme.status==true?'active':'' " :key='i' @click="personnelListbtn(i)">
 							<p>{{itme.value}}</p>
+							<img v-if="i==1" style="position: absolute;top:-10px;" src="@/assets/images/owner/tip.png" alt="">
 						</div>
 					</div>
 					
@@ -39,12 +40,12 @@
 				personnelList: [{
 						key: 'Owner',
 						status: true,
-						value: '查业主单位',
+						value: '查城投平台',
 					},
 					{
 						key: 'SearchEnterprise',
 						status: false,
-						value: '查建筑企业',
+						value: '查企业',
 					},
 
 				],

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

@@ -98,7 +98,7 @@
 							{{textList.projectDuration}}天
 						</template>
 						<template v-else>
-							'--'
+							--
 						</template>
 					</span>
 					<label class="label">项目属地</label>
@@ -195,12 +195,12 @@
 				<p>
 					<label class="label">招标人联系方式</label>
 					<span>{{textList.tendereeTel||'--'}}</span>
-					<label class="label">招标人联系地址</label>
-					<span>{{textList.tendereeAddress||'--'}}</span>
-				</p>
-				<p>
 					<label class="label">代理机构联系方式</label>
 					<span>{{textList.agencyTel||'--'}}</span>
+				</p>
+				<p>
+					<label class="label">招标人联系地址</label>
+					<span>{{textList.tendereeAddress||'--'}}</span>
 					<label class="label">代理机构联系地址</label>
 					<span>{{textList.agencyAddress||'--'}}</span>
 				</p>